Fixed Logut Page.

Fixed Ranks on BattleHall
jkroepke · Oct 26, 2015 · b2ed478 · b2ed478
1 parent 2759d1a
commit b2ed478
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 32 deletions.
diff --git a/includes/pages/adm/ShowLoginPage.php b/includes/pages/adm/ShowLoginPage.php
@@ -33,7 +33,7 @@
 
 function ShowLoginPage()
 {
-	global $USER, $LNG;
+	global $USER;
 
 	$session	= Session::create();
 	if($session->adminAccess == 1)

diff --git a/includes/pages/adm/ShowLogoutPage.php b/includes/pages/adm/ShowLogoutPage.php
@@ -26,9 +26,14 @@
  * @link http://2moons.cc/
  */
 
-
+if ($USER['authlevel'] == AUTH_USR)
+{
+    throw new PagePermissionException("Permission error!");
+}
+
 function ShowLogoutPage()
 {
-	unset($_SESSION['admin_login']);
+	$session	= Session::create();
+	$session->adminAccess	= 0;
 }
 
diff --git a/includes/pages/game/ShowBattleHallPage.class.php b/includes/pages/game/ShowBattleHallPage.class.php
@@ -40,7 +40,22 @@ function show()
 		global $USER, $LNG;
 		$order  = HTTP::_GP('order', 'units');
 		$sort   = HTTP::_GP('sort', 'desc');
-		$sort   = strtoupper($sort);
+		$sort   = strtoupper($sort) === "DESC" ? "DESC" : "ASC";
+
+
+		switch($order)
+		{
+			case 'date':
+				$key = '%%TOPKB%%.time '.$sort;
+				break;
+			case 'owner':
+				$key = '%%TOPKB%%.attacker '.$sort.',%%TOPKB%%.defender '.$sort;
+				break;
+			case 'units':
+			default:
+				$key = '%%TOPKB%%.units '.$sort;
+				break;
+		}
 
 		$db = Database::get();
 		$sql = "SELECT *, (
@@ -56,8 +71,7 @@ function show()
 			FROM %%TOPKB_USERS%% INNER JOIN %%USERS%% ON uid = id
 			WHERE %%TOPKB_USERS%%.rid = %%TOPKB%%.`rid` AND `role` = 2
 		) as defender
-		,@rank:=@rank+1 as rank
-		FROM %%TOPKB%% WHERE universe = :universe ORDER BY units DESC LIMIT 100;";
+		FROM %%TOPKB%% WHERE universe = :universe ORDER BY ".$key." LIMIT 100;";
 
 		$top = $db->select($sql, array(
 			':universe' => Universe::current()
@@ -66,21 +80,7 @@ function show()
 		$TopKBList	= array();
 		foreach($top as $data)
 		{
-			switch($order)
-			{
-				case 'date':
-					$key = $data['time'];
-					break;
-				case 'owner':
-					$key = $data['attacker'].$data['defender'];
-					break;
-				case 'units':
-				default:
-					$key = $data['units'];
-					break;
-			}
-
-			$TopKBList[$key][]	= array(
+			$TopKBList[]	= array(
 				'result'	=> $data['result'],
 				'date'		=> _date($LNG['php_tdformat'], $data['time'], $USER['timezone']),
 				'time'		=> TIMESTAMP - $data['time'],
@@ -91,17 +91,6 @@ function show()
 			);
 		}
 
-		ksort($TopKBList);
-
-		if($sort === "DESC")
-		{
-			$TopKBList	= array_reverse($TopKBList);
-		}
-		else
-		{
-			$sort = "ASC";
-		}
-
 		$this->assign(array(
 			'TopKBList'		=> $TopKBList,
 			'sort'			=> $sort,