#1123 Fix loading nav twice and defining current page twice

GetLuna · Apr 1, 2015 · daf38ce · daf38ce
1 parent 55a30ba
commit daf38ce
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/backstage/users.php b/backstage/users.php
@@ -83,10 +83,7 @@
 <?php
 
 	require 'footer.php';
-}
-
-
-if (isset($_GET['show_users'])) {
+} elseif (isset($_GET['show_users'])) {
 	$ip = luna_trim($_GET['show_users']);
 
 	if (!@preg_match('%^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$%', $ip) && !@preg_match('%^((([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}:[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){5}:([0-9A-Fa-f]{1,4}:)?[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){4}:([0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){3}:([0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){2}:([0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){6}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(([0-9A-Fa-f]{1,4}:){0,5}:((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|(::([0-9A-Fa-f]{1,4}:){0,5}((\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b)\.){3}(\b((25[0-5])|(1\d{2})|(2[0-4]\d)|(\d{1,2}))\b))|([0-9A-Fa-f]{1,4}::([0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})|(::([0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})|(([0-9A-Fa-f]{1,4}:){1,7}:))$%', $ip))
@@ -440,7 +437,6 @@
 	require 'footer.php';
 }
 
-
 // Ban multiple users
 elseif (isset($_POST['ban_users']) || isset($_POST['ban_users_comply'])) {
 	if ($luna_user['g_id'] != FORUM_ADMIN && ($luna_user['g_moderator'] != '1' || $luna_user['g_mod_ban_users'] == '0'))
@@ -794,10 +790,10 @@
 	require 'header.php';
 	load_admin_nav('users', 'users');
 
-if (isset($_GET['saved']))
-	echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>';
-if (isset($_GET['deleted']))
-	echo '<div class="alert alert-danger"><h4>'.$lang['User deleted'].'</h4></div>';
+	if (isset($_GET['saved']))
+		echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>';
+	if (isset($_GET['deleted']))
+		echo '<div class="alert alert-danger"><h4>'.$lang['User deleted'].'</h4></div>';
 ?>
 <form id="find_user" method="get" action="users.php">
 	<div class="panel panel-default">