Changeset 797 for trunk

Timestamp:

Jul 27, 2023 10:08:43 PM (9 months ago)

Author:

anonymous

Message:

Cleaner admin list output

File:

• trunk/services/templates/admin_list.ihtml (modified) (1 diff)

trunk/services/templates/admin_list.ihtml

@@ -60 +60 @@
             <td class="sc-nowrap"><a href="<?php echo $app->oHREF($_SERVER['PHP_SELF'] . '?op=edit&admin_id=' . $list[$i]['admin_id']); ?>"><?php echo oTxt($list[$i]['username'], true); ?></a></td>
             <td class="sc-nowrap"><?php echo oTxt($list[$i]['first_name'], true); ?> <?php echo oTxt($list[$i]['last_name'], true); ?></td>
-            <td class="sc-nowrap"><?php echo round($list[$i]['seconds_online'] / 60); ?></td>
+            <td class="sc-nowrap"><?php echo humanTime($list[$i]['seconds_online'], null, '%01.0f'); ?></td>
             <td class="sc-nowrap"><?php
-                if ($auth->isLoggedIn($list[$i]['admin_id'])) {
-                    ?><strong><?php echo date($app->getParam('date_format'), strtotime($list[$i]['last_login_datetime'])) ?></strong><?php
-                } else {
-                    echo Validator::validateStrDate($list[$i]['last_login_datetime']) ? date($app->getParam('date_format'), strtotime($list[$i]['last_login_datetime'])) : '';
-                }
+                $last_login_datetime_formatted = strtotime($list[$i]['last_login_datetime']) > 0 ? date($app->getParam('date_format'), strtotime($list[$i]['last_login_datetime'])) : '';
+                echo $auth->isLoggedIn($list[$i]['admin_id']) ? sprintf('<strong>%s</strong>', $last_login_datetime_formatted) : $last_login_datetime_formatted;
             ?></td>
-            <td class="sc-nowrap"><?php echo ipInRange($list[$i]['last_login_ip'], ['10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']) ? "(Private IP)" : sprintf('<a href="https://ip.me/ip/%1$s">%1$s</a>', $list[$i]['last_login_ip']); ?></td>
-            <td class="sc-nowrap"><?php echo Validator::validateStrDate($list[$i]['added_datetime']) ? date($app->getParam('date_format'), strtotime($list[$i]['added_datetime'])) : ''; ?></td>
+            <td class="sc-nowrap"><?php echo ipInRange($list[$i]['last_login_ip'], ['0.0.0.0/8', '10.0.0.0/8', '172.16.0.0/12', '192.168.0.0/16']) ? '' : sprintf('<a href="https://ip.me/ip/%1$s">%1$s</a>', $list[$i]['last_login_ip']); ?></td>
+            <td class="sc-nowrap"><?php echo strtotime($list[$i]['added_datetime']) > 0 ? date($app->getParam('date_format'), strtotime($list[$i]['added_datetime'])) : ''; ?></td>
             <td class="sc-nowrap"><?php echo oTxt($list[$i]['added_admin_username'], true); ?></td>
-            <td class="sc-nowrap"><?php echo Validator::validateStrDate($list[$i]['modified_datetime']) ? date($app->getParam('date_format'), strtotime($list[$i]['modified_datetime'])) : ''; ?></td>
+            <td class="sc-nowrap"><?php echo strtotime($list[$i]['modified_datetime']) > 0 ? date($app->getParam('date_format'), strtotime($list[$i]['modified_datetime'])) : ''; ?></td>
             <td class="sc-nowrap"><?php echo oTxt($list[$i]['modified_admin_username'], true); ?></td>
         </tr>