Make the Services overview card live too

[irc/unrealircd/unrealircd-webpanel.git] / header.php

diff --git a/header.php b/header.php
index 54f9b82941705c503e710e72cd6d3aad9248d60d..0e0a0be8b24e74649006d06ffc1fc413bdc81929 100644 (file)
--- a/header.php
+++ b/header.php
@@ -45,6 +45,7 @@
 
 $active_page = NULL;
 
+
 foreach ($pages as $name => $page)
 {
        $script = $_SERVER['SCRIPT_FILENAME'];
@@ -91,17 +92,16 @@ foreach($pages as $name=>$page)
         <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <?php echo $name; ?>
         </a>
-        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                       <?php foreach($page as $k => $p)
-                       {
-                               ?>
-                                       <a class="dropdown-item" href="<?php echo BASE_URL.$p;?>"><?php echo $k; ?></a>
-                               <?php
-                       } ?>
-        </div>
-      </li>
-         <?php
-               
+                       <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                               <?php foreach($page as $k => $p)
+                               {
+                                       ?>
+                                               <a class="dropdown-item" href="<?php echo BASE_URL.$p;?>"><?php echo $k; ?></a>
+                                       <?php
+                               } ?>
+                       </div>
+               </li>
+               <?php
        }
 
 }
@@ -109,7 +109,7 @@ $ToD = time_of_day();
 $user = unreal_get_current_user();
 if ($user)
 {
-       $name = (strlen($user->first_name)) ? $user->first_name : $user->username; // address them by first name, else username
+       $name = ($user->first_name && strlen($user->first_name)) ? $user->first_name : $user->username; // address them by first name, else username
 }
 ?>