Merge pull request #533 from Groruk/fix

Misc Fixes
sbpp · Nov 5, 2018 · 398fab6 · 398fab6
2 parents 3840845 + 0dd10d3
commit 398fab6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/web/includes/sb-callback.php b/web/includes/sb-callback.php
@@ -1698,6 +1698,10 @@ function AddBan($nickname, $type, $steam, $ip, $length, $dfile, $dname, $reason,
         $error++;
         $objResponse->addAssign("ip.msg", "innerHTML", "You must type a valid IP");
         $objResponse->addScript("$('ip.msg').setStyle('display', 'block');");
+    } elseif ($length < 0) {
+        $error++;
+        $objResponse->addAssign("length.msg", "innerHTML", "Length must be positive or 0");
+        $objResponse->addScript("$('length.msg').setStyle('display', 'block');");
     } else {
         $objResponse->addAssign("steam.msg", "innerHTML", "");
         $objResponse->addScript("$('steam.msg').setStyle('display', 'none');");
@@ -3005,6 +3009,10 @@ function AddBlock($nickname, $type, $steam, $length, $reason)
         $error++;
         $objResponse->addAssign("steam.msg", "innerHTML", "Please enter a valid Steam ID or Community ID");
         $objResponse->addScript("$('steam.msg').setStyle('display', 'block');");
+    } elseif ($length < 0) {
+        $error++;
+        $objResponse->addAssign("length.msg", "innerHTML", "Length must be positive or 0");
+        $objResponse->addScript("$('length.msg').setStyle('display', 'block');");
     } else {
         $objResponse->addAssign("steam.msg", "innerHTML", "");
         $objResponse->addScript("$('steam.msg').setStyle('display', 'none');");

diff --git a/web/includes/system-functions.php b/web/includes/system-functions.php
@@ -124,6 +124,9 @@ function CheckAdminAccess($mask)
 
 function SecondsToString($sec, $textual=true)
 {
+    if ($sec < 0) {
+        return 'Session';
+    }
     if ($textual) {
         $div = array( 2592000, 604800, 86400, 3600, 60, 1 );
         $desc = array('mo','wk','d','hr','min','sec');

diff --git a/web/pages/core/navbar.php b/web/pages/core/navbar.php
@@ -86,27 +86,27 @@
 
 $active = filter_input(INPUT_GET, 'p', FILTER_SANITIZE_STRING);
 foreach ($navbar as $key => $tab) {
+    $navbar[$key]['state'] = ($active === $tab['endpoint']) ? 'active' : 'nonactive';
+
     if (!$tab['permission']) {
         unset($navbar[$key]);
     }
-
-    $navbar[$key]['state'] = ($active === $tab['endpoint']) ? 'active' : 'nonactive';
 }
 
 if ($userbank->is_admin()) {
     $cat = filter_input(INPUT_GET, 'c', FILTER_SANITIZE_STRING);
     foreach ($admin as $key => $tab) {
+        $admin[$key]['state'] = ($cat === $tab['endpoint']) ? 'active' : '';
+
         if (!$userbank->HasAccess($tab['permission'])) {
             unset($admin[$key]);
         }
-
-        $admin[$key]['state'] = ($cat === $tab['endpoint']) ? 'active' : '';
     }
 }
 
 Template::render('core/navbar', [
-    'navbar' => $navbar,
-    'adminbar' => $admin,
+    'navbar' => array_values($navbar),
+    'adminbar' => array_values($admin),
     'isAdmin' => $userbank->is_admin(),
     'login' => $userbank->is_logged_in(),
     'username' => $userbank->GetProperty("user")

diff --git a/web/themes/default/page_admin_bans_add.tpl b/web/themes/default/page_admin_bans_add.tpl
@@ -160,7 +160,7 @@
             </optgroup>
           </select>
           </div>
-          <div id="length.msg" ></div>
+          <div id="length.msg" class="badentry"></div>
         </td>
       </tr>
 

diff --git a/web/themes/default/page_admin_comms_add.tpl b/web/themes/default/page_admin_comms_add.tpl
@@ -131,7 +131,7 @@
             </optgroup>
           </select>
           </div>
-          <div id="length.msg" ></div>
+          <div id="length.msg" class="badentry"></div>
         </td>
       </tr>
   		<tr>