fix some undefined references/indices, tabulation

1 files changed, 48 insertions, 44 deletions

diff --git a/pages/memberlist.php b/pages/memberlist.php
index d4f2c60..191bfa5 100644
--- a/pages/memberlist.php
+++ b/pages/memberlist.php
@@ -12,48 +12,52 @@ include_once ('./includes/db.inc.php');
 

 //Order by prep

 $c = 'totalMovesThisWeek';

-switch ($_GET['c']) {

-   case "totalMoves":

-	$c = 'totalMoves';

-	break;

-   case "totalMovesThisWeek":

-	$c = 'totalMovesThisWeek';

-	break;

-   case "totalMazes":

-	$c = 'totalMazes';

-	break;

-   case "totalWins":

-	$c = 'totalWins';

-	break;

-   case "totalTies":

-	$c = 'totalTies';

-	break;

-   case "dateJoined":

-	$c = 'dateJoined';

-	break; 

+if (isset($_GET['c'])) {

+	switch ($_GET['c']) {

+	case "totalMoves":

+		$c = 'totalMoves';

+		break;

+	case "totalMovesThisWeek":

+		$c = 'totalMovesThisWeek';

+		break;

+	case "totalMazes":

+		$c = 'totalMazes';

+		break;

+	case "totalWins":

+		$c = 'totalWins';

+		break;

+	case "totalTies":

+		$c = 'totalTies';

+		break;

+	case "dateJoined":

+		$c = 'dateJoined';

+		break;

 	case "dateLogin":

-	$c = 'dateLogin';

-	break;

+		$c = 'dateLogin';

+		break;

+	}

 }

 $o = 'DESC';

-switch ($_GET['o']) {

+if (isset($_GET['o'])) {

+	switch ($_GET['o']) {

 	case "desc":

-	$o = 'DESC';

-	break;

+		$o = 'DESC';

+		break;

 	case "asc":

-	$o = 'ASC';

-	break;

+		$o = 'ASC';

+		break;

+	}

 }

 //Order by:

 	$order = "ORDER BY $c $o";

 

-$sql = "SELECT 

+$sql = "SELECT

   users.ID,

-  users.displayName, 

+  users.displayName,

   userData.displayColor,

   (SELECT SUM(moves) FROM solutions WHERE solutions.userID = users.ID) AS totalMoves,

   (SELECT SUM(moves) FROM solutions

-		WHERE solutions.userID = users.ID AND 

+		WHERE solutions.userID = users.ID AND

 		YEARweek(solutions.dateModified) = YEARweek(CURRENT_DATE)) AS totalMovesThisWeek,

   (SELECT COUNT(*) FROM solutions WHERE solutions.userID = users.ID) AS totalMazes,

   SUM(CASE WHEN statistics.type IN (32, 33, 34, 35) THEN statistics.value ELSE 0 END) as totalWins,

@@ -61,11 +65,11 @@ $sql = "SELECT
   IfNull(userData.wallColor, '#666666') as wallColor,

   IfNull(userData.displayColor, '#cccccc'),

   userData.wallEmblem,

-  users.datejoined as dateJoined, 

+  users.datejoined as dateJoined,

   users.dateLogin as dateLogin

-FROM `users` 

+FROM `users`

 LEFT JOIN `userData` ON users.ID = userData.userID

-LEFT JOIN `statistics` ON users.ID = statistics.userID 

+LEFT JOIN `statistics` ON users.ID = statistics.userID

 GROUP BY users.ID

 $order

 ";

@@ -108,7 +112,7 @@ echo "
 //Echo Table Headers

 foreach ($cat as $name => $item) {

 	$co = 'desc';

-	if ($item['c']) {

+	if (isset($item['c'])) {

 		if ($item['c'] == $c) {

 			$name = "<i>$name</i>";

 			if ($o == 'DESC') {

@@ -124,7 +128,7 @@ foreach ($cat as $name => $item) {
 //Echo Table Data

 $i = 0;

 while (list($userID, $display, $displayColor, $moveCount, $moveCountWeek, $mazeCount, $winCount, $tieCount, $wallColor, $nameColor, $wallEmblem, $joined, $lastLogon) = mysql_fetch_row($result)) {

-	

+

 	//Prepare data

 	$i++;

 	$joined = Date("Y-m-d", strtotime($joined));

@@ -135,8 +139,8 @@ while (list($userID, $display, $displayColor, $moveCount, $moveCountWeek, $mazeC
 	if (!$moveCountWeek)

 		$moveCountWeek = 0;

 

-   if ($lastLogon == 0)

-      $lastLogon = "Never";

+	if ($lastLogon == 0)

+		$lastLogon = "Never";

 

 	//Prepare background for this line

 	$background = '#262631';

@@ -144,8 +148,8 @@ while (list($userID, $display, $displayColor, $moveCount, $moveCountWeek, $mazeC
 		$background = '#20202a';

 	if ($_SESSION['userID'] == $userID)

 		$background = '#343c57';

-	

-   echo "

+

+	echo "

 <tr style='background-color: $background; color:$displayColor;' >

 	<td>$i</td>

 	<td>

@@ -167,11 +171,11 @@ while (list($userID, $display, $displayColor, $moveCount, $moveCountWeek, $mazeC
 </tr>";

 }

 echo "

-         </table>

-      <br />

-      <br />

-      </td>

-   </tr>

+			</table>

+			<br />

+			<br />

+		</td>

+	</tr>

 </table>

 </div>

 

@@ -181,4 +185,4 @@ echo "
 ";

 

 htmlFooter();

-?>
\ No newline at end of file
+?>