Merge pull request #7 from sn3p/new-design4.4.0

New design

56 files changed, 3529 insertions, 3145 deletions

diff --git a/html/pages/admin/acelog.php b/html/pages/admin/acelog.php
index 365174a..31f98e8 100755..100644
--- a/html/pages/admin/acelog.php
+++ b/html/pages/admin/acelog.php
@@ -12,7 +12,7 @@ function InvertSort($curr_field, $order, $sort) {
 

 function SortPic($curr_field, $order, $sort) {

 	if ($curr_field != $order) return;

-	$fname = 'images/s_'. strtolower($sort) .'.png';

+	$fname = 'assets/images/s_'. strtolower($sort) .'.png';

 	if (!file_exists($fname)) return;

 	return('&nbsp;<img src="'. $fname .'" border="0" width="11" height="9" alt="" title="('.strtolower($sort).'ending)">');

 }

@@ -90,7 +90,7 @@ if (empty($filename)) {
 	}

 	</script>

 	<form name = "filter">

-	<table class = "box" border="0" cellpadding="1" cellspacing="2" width="720">

+	<table class = "box" border="0" cellpadding="0" cellspacing="0" width="720">

 	<tr>

 		<td class="heading" align="center" width="100%" colspan="5">Available ACE Logs:</td>

 	</tr>

@@ -147,7 +147,7 @@ if (empty($filename)) {
 

 			$fp = my_fopen('logs/ace/'.$filename, 'rb', $compression = NULL);

 			if (!$fp) die("Error opening file");

-			

+

 			while (($line = my_fgets($fp, 5000, $compression)) !== FALSE) {

 				$info = preg_split('/\s/', $line, 3);

 				$info[2] = preg_replace('/[\r\n]+/', '', $info[2]);

@@ -242,7 +242,7 @@ if (empty($filename)) {
 			$d_size = file_size_info(filesize('logs/ace/'. $log));

 			echo $d_size['size'] .' '. $d_size['type'];

 			echo '</td><td class="'.$class.'" align="center">';

-			echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($log).'&amp;del=1"><img src="images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';

+			echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($log).'&amp;del=1"><img src="assets/images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';

 			echo '</td></tr>';

 		}

 	}

@@ -252,11 +252,11 @@ if (empty($filename)) {
 

 if (!empty($filename)) {

 	if (!file_exists('logs/ace/'. $filename) or !is_file('logs/ace/'. $filename)) die('File not found (2)');

-	echo'<br><table class = "box" border="0" cellpadding="1" cellspacing="2" width="720">

+	echo'<br><table class = "box" border="0" cellpadding="0" cellspacing="0" width="720">

 	<tr>

 		<td class="smheading" align="center" width="95%" colspan="4">'.$filename.'</td>

 		<td class="smheading" align="center" width="5%" align="right">';

-		echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($filename).'&amp;del=1"><img src="images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';

+		echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($filename).'&amp;del=1"><img src="assets/images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';

 		echo '</td>

 	</tr>';

 	if (substr($filename, strlen($filename) - strlen($import_ace_screenshot_extension)) == $import_ace_screenshot_extension

@@ -269,10 +269,10 @@ if (!empty($filename)) {
 	else {

 		$fp = my_fopen('logs/ace/'.$filename, 'rb', $compression = NULL);

 		if (!$fp) die("Error opening file");

-		

+

 		$i = 0;

 		echo '<tr><td class="grey" colspan="5"><span style="font-family: monospace;">';

-		

+

 		while (($line = my_fgets($fp, 5000, $compression)) !== FALSE) {

 			/*

 			$i++;

@@ -299,7 +299,7 @@ if (!empty($filename)) {
 			echo 	'<tr>

 				  <td class="smheading" align="center" width="95%" colspan="4">'.$Screenshot.'</td>

 				  <td class="smheading" align="center" width="5%" align="right">';

-			echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.preg_replace('/\+/', '%20', urlencode($Screenshot)).'&amp;del=1"><img src="images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';

+			echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.preg_replace('/\+/', '%20', urlencode($Screenshot)).'&amp;del=1"><img src="assets/images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';

 			echo '</td>

 			  </tr>';

 

diff --git a/html/pages/admin/aclog.php b/html/pages/admin/aclog.php
index ada35c8..d057c9f 100755..100644
--- a/html/pages/admin/aclog.php
+++ b/html/pages/admin/aclog.php
@@ -1,108 +1,120 @@
-<?php


-if (empty($import_adminkey) or isset($_REQUEST['import_adminkey']) or $import_adminkey != $adminkey) die('bla');


-


-$filename = (!empty($_REQUEST['filename'])) ? my_stripslashes($_REQUEST['filename']) : '';


-$filename = str_replace(array('..', '/', '\\', '<', ':'), array(), $filename);


-


-


-if (!empty($filename)) {


-	if (!file_exists('logs/ac/'. $filename) or !is_file('logs/ac/'. $filename)) die('bla');


-	if (isset($_REQUEST['del'])) {


-		unlink('logs/ac/'. $filename);


-		$filename = '';


-	}


-}


-


-


-


-


-if (empty($filename)) {


-	echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">


-	<tr>


-		<td class="smheading" align="center" width="100%" colspan="4">Available AnthChecker Logs:</td>


-	</tr>';


-	$logdir = opendir('logs/ac');


-	$logs = array();


-	$sort = array();


-	$i = 0;


-	while (false !== ($filename = readdir($logdir))) {


-		if (!is_file('logs/ac/'. $filename)) continue;


-		if ($filename == '.htaccess' or $filename == 'index.htm') continue;


-		$i++;


-		$logs[$i] = $filename;


-		$extra = 0;


-		if (substr($filename, -4) == '.bz2') $extra = 4;


-		if (substr($filename, -3) == '.gz') $extra = 3;


-


-		$sort[$i] = substr($filename, strlen($filename) - (23 + $extra), 19);


-	}


-	closedir($logdir);


-	if (count($logs) == 0) {


-		echo '<tr><td class="grey" colspan="4">No logs available!</td></tr>';


-	} else {


-		arsort($sort);


-		$i = 0;


-		foreach($sort as $id => $date) {


-			$log = $logs[$id];


-			$extra = 0;


-			if (substr($log, -4) == '.bz2') $extra = 4;


-			if (substr($log, -3) == '.gz') $extra = 3;


-


-			$i++;


-			$class = ($i%2) ? 'grey' : 'grey2';


-			echo '<tr><td class="'.$class.'">';


-			$tmp = substr($log, strlen($log) - (23 + $extra), 19);


-			$tmp = str_replace('.', '', $tmp);


-			$ts = mtimestamp($tmp);


-			echo '  <a class="'.$class.'" href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($log).'">'.date('Y-m-d H:i', $ts).'</a>';


-			echo '</td><td class="'.$class.'">';


-			echo '<a class="'.$class.'" href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($log).'">'.substr($log, 6, strlen($log) - 30 - $extra).'</a>';


-			echo '</td><td class="'.$class.'" align="right">';


-			$d_size = file_size_info(filesize('logs/ac/'. $log));


-			echo $d_size['size'] .' '. $d_size['type'];


-			echo '</td><td class="'.$class.'" align="center">';


-			echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($log).'&amp;del=1"><img src="images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';


-			echo '</td></tr>';


-		}	


-	}


-}


-


-


-if (!empty($filename)) {


-	if (!file_exists('logs/ac/'. $filename) or !is_file('logs/ac/'. $filename)) die('bla');


-	echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">


-	<tr>


-		<td class="smheading" align="center" width="95%" colspan="3">'.$filename.'</td>


-		<td class="smheading" align="center" width="5%" align="right">';


-		echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($filename).'&amp;del=1"><img src="images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';


-		echo '</td>


-	</tr>';


-	


-	$fp = my_fopen('logs/ac/'.$filename, 'rb', $compression = NULL);


-	if (!$fp) die("Error opening file");


-	


-	$i = 0;


-	echo '<tr><td class="grey" colspan="4"><span style="font-family: monospace;">';


-	


-	while (($line = my_fgets($fp, 5000, $compression)) !== FALSE) {


-		/*


-		$i++;


-		$class = ($i%2) ? 'grey' : 'grey2';


-		echo '<tr><td class="'.$class.'" colspan="4">';


-		echo '<span style="font-family: monospace;">';


-		echo htmlentities($line);


-		echo '</span>';


-		echo '</td></tr>';


-		*/


-		echo wordwrap(htmlentities($line), 80, '<br />', 1) ."<br />";


-	}


-	echo '</span></td></tr>';


-	my_fclose($fp, $compression);


-}


-


-echo '</tr>';


-if (!empty($filename)) echo'<tr><td class="smheading" align="center" colspan="4"><a class="grey" href="./admin.php?key='.$_REQUEST[key].'&amp;action='.$action.'">Go Back To Logfile Overview</a></td></tr>';


-echo'<tr><td class="smheading" align="center" colspan="4"><a class="grey" href="./admin.php?key='.$_REQUEST[key].'">Go Back To Admin Page</a></td></tr>';


-echo '</table>';


-


-?>


+<?php

+

+if (empty($import_adminkey) or isset($_REQUEST['import_adminkey']) or $import_adminkey != $adminkey) die('bla');

+

+$filename = (!empty($_REQUEST['filename'])) ? my_stripslashes($_REQUEST['filename']) : '';

+$filename = str_replace(array('..', '/', '\\', '<', ':'), array(), $filename);

+

+if (!empty($filename)) {

+	if (!file_exists('logs/ac/'. $filename) or !is_file('logs/ac/'. $filename)) die('bla');

+

+	if (isset($_REQUEST['del'])) {

+		unlink('logs/ac/'. $filename);

+		$filename = '';

+	}

+}

+

+if (empty($filename)) {

+	echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">

+	<tr>

+		<td class="smheading" align="center" width="100%" colspan="4">Available AnthChecker Logs:</td>

+	</tr>';

+

+	$logdir = opendir('logs/ac');

+	$logs = array();

+	$sort = array();

+	$i = 0;

+

+	while (false !== ($filename = readdir($logdir))) {

+		if (!is_file('logs/ac/'. $filename)) continue;

+		if ($filename == '.htaccess' or $filename == 'index.htm') continue;

+

+		$i++;

+		$logs[$i] = $filename;

+		$extra = 0;

+

+		if (substr($filename, -4) == '.bz2') $extra = 4;

+		if (substr($filename, -3) == '.gz') $extra = 3;

+

+		$sort[$i] = substr($filename, strlen($filename) - (23 + $extra), 19);

+	}

+

+	closedir($logdir);

+

+	if (count($logs) == 0) {

+		echo '<tr><td class="grey" colspan="4">No logs available!</td></tr>';

+	} else {

+		arsort($sort);

+		$i = 0;

+

+		foreach($sort as $id => $date) {

+			$log = $logs[$id];

+			$extra = 0;

+

+			if (substr($log, -4) == '.bz2') $extra = 4;

+			if (substr($log, -3) == '.gz') $extra = 3;

+

+			$i++;

+			$class = ($i%2) ? 'grey' : 'grey2';

+			echo '<tr><td class="'.$class.'">';

+			$tmp = substr($log, strlen($log) - (23 + $extra), 19);

+			$tmp = str_replace('.', '', $tmp);

+			$ts = mtimestamp($tmp);

+

+			echo '<a class="'.$class.'" href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($log).'">'.date('Y-m-d H:i', $ts).'</a>';

+			echo '</td><td class="'.$class.'">';

+			echo '<a class="'.$class.'" href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($log).'">'.substr($log, 6, strlen($log) - 30 - $extra).'</a>';

+			echo '</td><td class="'.$class.'" align="right">';

+

+			$d_size = file_size_info(filesize('logs/ac/'. $log));

+

+			echo $d_size['size'] .' '. $d_size['type'];

+			echo '</td><td class="'.$class.'" align="center">';

+			echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($log).'&amp;del=1"><img src="assets/images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';

+			echo '</td></tr>';

+		}

+	}

+}

+

+if (!empty($filename)) {

+	if (!file_exists('logs/ac/'. $filename) or !is_file('logs/ac/'. $filename)) die('bla');

+

+	echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">

+	<tr>

+		<td class="smheading" align="center" width="95%" colspan="3">'.$filename.'</td>

+		<td class="smheading" align="center" width="5%" align="right">';

+		echo '<a href="admin.php?key='.$adminkey.'&amp;action='.$action.'&amp;filename='.urlencode($filename).'&amp;del=1"><img src="assets/images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" /></a>';

+		echo '</td>

+	</tr>';

+

+	$fp = my_fopen('logs/ac/'.$filename, 'rb', $compression = NULL);

+	if (!$fp) die("Error opening file");

+	$i = 0;

+	echo '<tr><td class="grey" colspan="4"><span style="font-family: monospace;">';

+

+	while (($line = my_fgets($fp, 5000, $compression)) !== FALSE) {

+		/*

+		$i++;

+		$class = ($i%2) ? 'grey' : 'grey2';

+		echo '<tr><td class="'.$class.'" colspan="4">';

+		echo '<span style="font-family: monospace;">';

+		echo htmlentities($line);

+		echo '</span>';

+		echo '</td></tr>';

+		*/

+

+		echo wordwrap(htmlentities($line), 80, '<br />', 1) ."<br />";

+	}

+

+	echo '</span></td></tr>';

+	my_fclose($fp, $compression);

+}

+

+echo '</tr>';

+

+if (!empty($filename)) echo'<tr><td class="smheading" align="center" colspan="4"><a class="grey" href="./admin.php?key='.$_REQUEST[key].'&amp;action='.$action.'">Go Back To Logfile Overview</a></td></tr>';

+

+echo'<tr><td class="smheading" align="center" colspan="4"><a class="grey" href="./admin.php?key='.$_REQUEST[key].'">Go Back To Admin Page</a></td></tr>';

+echo '</table>';

+

+?>

diff --git a/html/pages/admin/dmatch.php b/html/pages/admin/dmatch.php
index 9fed97d..3c7ebc5 100755..100644
--- a/html/pages/admin/dmatch.php
+++ b/html/pages/admin/dmatch.php
@@ -20,7 +20,7 @@ $results = adminselect($options);
 

 $matchid = $results['mid'];

 

-echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">

+echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">

 <tr>

 	<td class="smheading" align="center" colspan="2">Deleting Match ID '.$matchid.'</td>

 </tr>

@@ -47,7 +47,7 @@ while ($r_radjust = mysql_fetch_array($q_radjust)) {
 	mysql_query("UPDATE uts_rank SET rank = $newrank, prevrank = $oldrank, matches = $matchcount WHERE id = $rid") or die(mysql_error());

 	mysql_query("DELETE FROM uts_rank WHERE matches = 0") or die(mysql_error());

 }

-	echo'<td class="grey" align="left" width="400">Done</td>

+	echo'<td class="grey" align="left" width="700">Done</td>

 </tr>

 <tr>

 	<td class="smheading" align="left" width="200">Removing Match Record:</td>';

diff --git a/html/pages/admin/dplayer.php b/html/pages/admin/dplayer.php
index 0239e5d..ca3e747 100755..100644
--- a/html/pages/admin/dplayer.php
+++ b/html/pages/admin/dplayer.php
@@ -15,7 +15,7 @@ $results = adminselect($options);
 $pid = $results['pid'];

 $playerid = $pid;

 

-echo'<table border="0" cellpadding="1" cellspacing="2" width="600">

+echo'<table border="0" cellpadding="0" cellspacing="0" width="600">

 <tr>

 	<td class="smheading" align="center" colspan="2">Deleting Player</td>

 </tr>

diff --git a/html/pages/admin/dpmatch.php b/html/pages/admin/dpmatch.php
index b021054..ff4258e 100755..100644
--- a/html/pages/admin/dpmatch.php
+++ b/html/pages/admin/dpmatch.php
@@ -21,7 +21,7 @@ $results = adminselect($options);
 $matchid = $results['mid'];

 $pid = $results['pid'];

 

-echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">

+echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">

 <tr>

 	<td class="smheading" align="center" colspan="2">Delete Player From Match ID '.$matchid.'</td>

 </tr>';

diff --git a/html/pages/admin/editgames.php b/html/pages/admin/editgames.php
index 3f7a542..d2981b8 100755..100644
--- a/html/pages/admin/editgames.php
+++ b/html/pages/admin/editgames.php
@@ -16,7 +16,7 @@ if (isset($_REQUEST['submit'])) {
 	}

 }

 

-echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">

+echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">

 <tr>

 	<td class="medheading" align="center" colspan="2">Edit games</td>

 </tr>

diff --git a/html/pages/admin/editgamestype.php b/html/pages/admin/editgamestype.php
index d9e4ff1..0b8ac30 100755..100644
--- a/html/pages/admin/editgamestype.php
+++ b/html/pages/admin/editgamestype.php
@@ -1,6 +1,6 @@
 <?php

 if (empty($import_adminkey) or isset($_REQUEST['import_adminkey']) or $import_adminkey != $adminkey) die('bla');

-	

+

 $sql_server = "SELECT id, servername, serverip FROM uts_match GROUP BY servername, serverip ORDER BY servername ASC";

 $q_server = mysql_query($sql_server) or die(mysql_error());

 $servernames  = array('0' => '');

@@ -27,15 +27,15 @@ if (isset($_REQUEST['submit'])) {
 									mutator = '". my_addslashes($_REQUEST['mutator']) ."',

 									gid = '". my_addslashes($_REQUEST['gid']) ."'

 					") or die(mysql_error());

-	

+

 	if (isset($_REQUEST['update'])) {

-		echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">

+		echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">

 				<tr>

 					<td class="smheading" align="center" colspan="2">Updating...</td>

 				</tr>

-				

-				

-				

+

+

+

 				<tr>

 					<td class="smheading" align="left" width="200">Updating Player Records</td>';

 		$where = 'WHERE 1';

@@ -49,27 +49,27 @@ if (isset($_REQUEST['submit'])) {
 		if ($_REQUEST['mutator'] != '*') {

 			$where .= " AND m.mutators LIKE '%".my_addslashes($_REQUEST['mutator'])."%'";

 		}

-		

+

 		mysql_query("UPDATE uts_player p, uts_match m SET p.gid = '". my_addslashes($_REQUEST['gid']) ."' $where AND m.id = p.matchid;") or die(mysql_error());

 		echo'<td class="grey" align="left" width="400">Done (updated '.mysql_affected_rows().' records)</td>

 				</tr>

-				

-				

-				

-				

+

+

+

+

 				<tr>

 					<td class="smheading" align="left" width="200">Updating Matches</td>';

 		mysql_query("UPDATE uts_match m SET m.gid = '". my_addslashes($_REQUEST['gid']) ."' $where;") or die(mysql_error());

 		echo'<td class="grey" align="left" width="400">Done (updated '.mysql_affected_rows().' matches)</td>

 				</tr>

-				

-				

-				

-				

-				

+

+

+

+

+

 				<tr>

 					<td class="smheading" align="left" width="200">Re-Calcuating Rankings</td>';

-		

+

 		if ($_REQUEST['gamename'] != '*') {

 			$gids[] = $_REQUEST['gid'];

 			$where = "WHERE gid IN (".implode(',', $gids).")";

@@ -77,7 +77,7 @@ if (isset($_REQUEST['submit'])) {
 			$where = 'WHERE 1';

 		}

 		mysql_query("DELETE FROM uts_rank $where;") or die(mysql_error());

-		

+

 		$sql_nrank = "SELECT SUM(p.gametime) AS time, p.pid, p.gid, SUM(p.rank) AS rank, COUNT(p.matchid) AS matches FROM uts_player p, uts_pinfo pi $where AND pi.id = p.pid AND pi.banned <> 'Y' GROUP BY p.gid, p.pid";

 		$q_nrank = mysql_query($sql_nrank) or die(mysql_error());

 		$num_ranks = 0;

@@ -102,7 +102,7 @@ if (isset($_REQUEST['del'])) {
 

 

 

-echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">

+echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">

 <tr>

 	<td class="medheading" align="center" colspan="8">Current Mappings</td>

 </tr>

@@ -138,7 +138,7 @@ while ($r_gamestype = mysql_fetch_array($q_gamestype)) {
 	echo '<td class="'.$class.'">&nbsp;'.htmlentities($gamedisplaynames[$r_gamestype['gid']]).'</td>';

 	echo '<td class="'.$class.'" align="center">';

 		echo '<a href="'.$_SERVER['PHP_SELF'].'?action='.$action.'&amp;key='.$adminkey.'&amp;del='.$r_gamestype['id'].'">';

-		echo '<img src="images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" />';

+		echo '<img src="assets/images/del.png" border="0" width="16" height="16" title="Delete" alt="Delete" />';

 		echo '</a>';

 	echo '</td>';

 	echo '</tr>';

@@ -153,7 +153,7 @@ echo '</tr></table>';