Main pages markup

5 files changed, 326 insertions, 279 deletions

diff --git a/html/assets/style.css b/html/assets/style.css
index 47433a9..d709e24 100755
--- a/html/assets/style.css
+++ b/html/assets/style.css
@@ -140,7 +140,6 @@ li {
   width: 95%;

   height: 50px;

   padding-top: 10px;

-  background: url("./images/dark_grey.jpg");

 }

 .darksearch input[type="text"] {

   font-family: GothamLight, sans-serif;

@@ -160,7 +159,7 @@ input[type="text"] {
 .search {

   padding: 6px 15px 6px 30px;

   margin: 3px;

-  background: url("./images/search.png") no-repeat 8px 6px;

+  background: url("../images/search.png") no-repeat 8px 6px;

   font-family: GothamLight, sans-serif;

   height: 28px;

 }

@@ -168,7 +167,7 @@ input[type="text"] {
 .owshare {

   padding: 6px 15px 6px 30px;

   margin: 3px;

-  background: url("./images/owshare.png") no-repeat 8px 6px;

+  background: url("../images/owshare.png") no-repeat 8px 6px;

   font-family: GothamLight, sans-serif;

   height: 28px;

 }

@@ -180,15 +179,6 @@ input[type="submit"] {
   font-family: GothamLight, sans-serif;

   border: 1px solid #1e1e1e;

   background-color: #2069a1;

-  /** 

-	background: #fdd932; 

-	background: -moz-linear-gradient(top, #fdd932 0%, #ffd305 100%); 

-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#515151), color-stop(100%,#2d3035)); 

-	background: -webkit-linear-gradient(top, #515151 0%,#383838 100%); 

-	background: -o-linear-gradient(top, #e4f1f9 0%,#ffd305 100%); 

-	background: -ms-linear-gradient(top, #e4f1f9 0%,#ffd305 100%); 

-	background: linear-gradient(top, #e4f1f9 0%,#ffd305 100%); 

-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e4f1f9', endColorstr='#ffd305',GradientType=0 ); /* IE6-9 */

   color: #fff;

   cursor: pointer;

   -webkit-transition: background-color 1s;

@@ -1097,10 +1087,8 @@ a.pages:hover {
   /* For Safari 5.1 to 6.0 */

   background: -o-linear-gradient(#2069a1, #194c74);

   /* For Opera 11.1 to 12.0 */

-  background: -moz-linear-gradient(

-    #2069a1,

-    #194c74

-  ); /* For Firefox 3.6 to 15 */

+  background: -moz-linear-gradient(#2069a1, #194c74);

+  /* For Firefox 3.6 to 15 */

   background: linear-gradient(#2069a1, #194c74); /* Standard syntax */

 }

 .redteam,

diff --git a/html/pages/players.php b/html/pages/players.php
index 1d9788a..d888855 100755
--- a/html/pages/players.php
+++ b/html/pages/players.php
@@ -1,29 +1,27 @@
 <?php

 function InvertSort($curr_field, $filter, $sort) {

-	if ($curr_field != $filter) return(($curr_field == "name") ? "ASC" : "DESC");

-	if ($sort == 'ASC') return('DESC');

-	return('ASC');

+  if ($curr_field != $filter) return(($curr_field == "name") ? "ASC" : "DESC");

+  if ($sort == 'ASC') return('DESC');

+  return('ASC');

 }

 

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

-	if ($curr_field != $filter) return;

-	$fname = '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)">');

+  if ($curr_field != $filter) return;

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

+  if (!file_exists($fname)) return;

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

 }

 

-

 // Get filter and set sorting

 $filter = my_addslashes($_GET[filter]);

 $sort = my_addslashes($_GET[sort]);

 

-IF (empty($filter) or (!in_array(strtolower($filter), array("name", "games", "gamescore", "frags", "kills", "deaths", "suicides", "eff", "accuracy", "ttl", "gametime")))) {

-	$filter = "name";

+if (empty($filter) or (!in_array(strtolower($filter), array("name", "games", "gamescore", "frags", "kills", "deaths", "suicides", "eff", "accuracy", "ttl", "gametime")))) {

+  $filter = "name";

 }

 

 if (empty($sort) or ($sort != 'ASC' and $sort != 'DESC')) $sort = ($filter == "name") ? "ASC" : "DESC";

 

-

 // Work out Prev, Next, First, Last Stuff

 

 $r_pcount = small_query("SELECT COUNT(*) AS pcount FROM uts_pinfo");

@@ -32,16 +30,16 @@ $pcount = $r_pcount['pcount'];
 $ecount = $pcount/50;

 $ecount2 = number_format($ecount, 0, '.', '');

 

-IF($ecount > $ecount2) {

-	$ecount2 = $ecount2+1;

+if ($ecount > $ecount2) {

+  $ecount2 = $ecount2+1;

 }

 

 $fpage = 0;

-IF($ecount < 1) { $lpage = 0; }

+if ($ecount < 1) { $lpage = 0; }

 else { $lpage = $ecount2-1; }

 

 $cpage = preg_replace('/\D/', '', $_GET["page"]);

-IF ($cpage == "") { $cpage = "0"; }

+if ($cpage == "") { $cpage = "0"; }

 $qpage = $cpage*50;

 

 $tfpage = $cpage+1;

@@ -49,76 +47,89 @@ $tlpage = $lpage+1;
 

 $ppage = $cpage-1;

 $ppageurl = "<a class=\"pages\" href=\"./?p=players&amp;filter=$filter&amp;sort=$sort&amp;page=$ppage\">[Previous]</a>";

-IF ($ppage < "0") { $ppageurl = "[Previous]"; }

+

+if ($ppage < "0") { $ppageurl = "[Previous]"; }

 

 $npage = $cpage+1;

 $npageurl = "<a class=\"pages\" href=\"./?p=players&amp;filter=$filter&amp;sort=$sort&amp;page=$npage\">[Next]</a>";

-IF ($npage >= "$ecount") { $npageurl = "[Next]"; }

+if ($npage >= "$ecount") { $npageurl = "[Next]"; }

 

 $fpageurl = "<a class=\"pages\" href=\"./?p=players&amp;filter=$filter&amp;sort=$sort&amp;page=$fpage\">[First]</a>";

-IF ($cpage == "0") { $fpageurl = "[First]"; }

+if ($cpage == "0") { $fpageurl = "[First]"; }

 

 $lpageurl = "<a class=\"pages\" href=\"./?p=players&amp;filter=$filter&amp;sort=$sort&amp;page=$lpage\">[Last]</a>";

-IF ($cpage == "$lpage") { $lpageurl = "[Last]"; }

+if ($cpage == "$lpage") { $lpageurl = "[Last]"; }

 

 // Show information

 echo'

-<form NAME="playersearch" METHOD="post" ACTION="./?p=psearch">

-<div class="pages"><b>Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</b></div>

-<div class="opnote">* Click headings to change Sorting *</div>

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

-  <tbody><tr>

-    <td class="heading" colspan="12" align="center">Unreal Tournament Player List</td>

-  </tr>

-  <tr>

-    <td class = "smheading" colspan = "12" ALIGN="center">Name Search:

-      <input TYPE="text" NAME="name" MAXLENGTH="35" SIZE="20" CLASS="searchform">

-      <input TYPE="submit" NAME="Default" VALUE="Search" CLASS="searchformb"></td>

-  </tr>

-  <tr>

-    <td class="smheading" align="center" width="150"><a class="smheading" href="./?p=players&amp;filter=name&amp;sort='.InvertSort('name', $filter, $sort).'">Player Name</a>'.SortPic('name', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=games&amp;sort='.InvertSort('games', $filter, $sort).'">Matches</a>'.SortPic('games', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=gamescore&amp;sort='.InvertSort('gamescore', $filter, $sort).'">Score</a>'.SortPic('gamescore', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=frags&amp;sort='.InvertSort('frags', $filter, $sort).'">Frags</a>'.SortPic('frags', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=kills&amp;sort='.InvertSort('kills', $filter, $sort).'">Kills</a>'.SortPic('kills', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=deaths&amp;sort='.InvertSort('deaths', $filter, $sort).'">Deaths</a>'.SortPic('deaths', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=suicides&amp;sort='.InvertSort('suicides', $filter, $sort).'">Suicides</a>'.SortPic('suicides', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=eff&amp;sort='.InvertSort('eff', $filter, $sort).'">Eff.</a>'.SortPic('eff', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=accuracy&amp;sort='.InvertSort('accuracy', $filter, $sort).'">Acc.</a>'.SortPic('accuracy', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=ttl&amp;sort='.InvertSort('ttl', $filter, $sort).'">TTL</a>'.SortPic('ttl', $filter, $sort).'</td>

-    <td class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=gametime&amp;sort='.InvertSort('gametime', $filter, $sort).'">Hours</a>'.SortPic('gametime', $filter, $sort).'</td>

-  </tr>';

+<form name="playersearch" method="post" action="./?p=psearch">

+  <div class="pages">Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</div>

+

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

+	<thead>

+	  <tr>

+	    <th class="heading" colspan="12" align="center">Unreal Tournament Player List</th>

+	  </tr>

+	  <tr>

+	    <th class="smheading" colspan="12" align="center">

+		    <div class="darksearch">

+		      <span>

+		        <input type="text" class="search square" placeholder="Search player..." name="name" value="'.htmlentities($playername).'">

+		        <input class="searchbutton" type="submit" value="Search">

+		      </span>

+				</div>

+	    </th>

+	  </tr>

+	  <tr>

+	    <th class="smheading" align="center" width="150"><a class="smheading" href="./?p=players&amp;filter=name&amp;sort='.InvertSort('name', $filter, $sort).'">Player Name</a>'.SortPic('name', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=games&amp;sort='.InvertSort('games', $filter, $sort).'">Matches</a>'.SortPic('games', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=gamescore&amp;sort='.InvertSort('gamescore', $filter, $sort).'">Score</a>'.SortPic('gamescore', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=frags&amp;sort='.InvertSort('frags', $filter, $sort).'">Frags</a>'.SortPic('frags', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=kills&amp;sort='.InvertSort('kills', $filter, $sort).'">Kills</a>'.SortPic('kills', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=deaths&amp;sort='.InvertSort('deaths', $filter, $sort).'">Deaths</a>'.SortPic('deaths', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="50"><a class="smheading" href="./?p=players&amp;filter=suicides&amp;sort='.InvertSort('suicides', $filter, $sort).'">Suicides</a>'.SortPic('suicides', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=eff&amp;sort='.InvertSort('eff', $filter, $sort).'">Eff.</a>'.SortPic('eff', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=accuracy&amp;sort='.InvertSort('accuracy', $filter, $sort).'">Acc.</a>'.SortPic('accuracy', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=ttl&amp;sort='.InvertSort('ttl', $filter, $sort).'">TTL</a>'.SortPic('ttl', $filter, $sort).'</th>

+	    <th class="smheading" align="center" width="45"><a class="smheading" href="./?p=players&amp;filter=gametime&amp;sort='.InvertSort('gametime', $filter, $sort).'">Hours</a>'.SortPic('gametime', $filter, $sort).'</th>

+	  </tr>

+	</thead>

+	<tbody>

+	';

 

 $sql_plist = "SELECT pi.name AS name, pi.country AS country, p.pid, COUNT(p.id) AS games, SUM(p.gamescore) as gamescore, SUM(p.frags) AS frags, SUM(p.kills) AS kills,

 SUM(p.deaths) AS deaths, SUM(p.suicides) as suicides, AVG(p.eff) AS eff, AVG(p.accuracy) AS accuracy, AVG(p.ttl) AS ttl, SUM(gametime) as gametime

 FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' GROUP BY p.pid ORDER BY $filter $sort LIMIT $qpage,50";

 $q_plist = mysql_query($sql_plist) or die(mysql_error());

-while ($r_plist = mysql_fetch_array($q_plist)) {

 

-	  $gametime = sec2hour($r_plist[gametime]);

-	  $eff = get_dp($r_plist[eff]);

-	  $acc = get_dp($r_plist[accuracy]);

-	  $ttl = GetMinutes($r_plist[ttl]);

-	  $r_pname = $r_plist[name];

-	  $myurl = urlencode($r_pname);

-

-	  echo'

-	  <tr>

-		<td nowrap class="dark" align="left"><a class="darkhuman" href="./?p=pinfo&amp;pid='.$r_plist['pid'].'">'.FormatPlayerName($r_plist[country], $r_plist['pid'], $r_pname).'</a></td>

-		<td class="grey" align="center">'.$r_plist[games].'</td>

-		<td class="grey" align="center">'.$r_plist[gamescore].'</td>

-		<td class="grey" align="center">'.$r_plist[frags].'</td>

-		<td class="grey" align="center">'.$r_plist[kills].'</td>

-		<td class="grey" align="center">'.$r_plist[deaths].'</td>

-		<td class="grey" align="center">'.$r_plist[suicides].'</td>

-		<td class="grey" align="center">'.$eff.'</td>

-		<td class="grey" align="center">'.$acc.'</td>

-		<td class="grey" align="center">'.$ttl.'</td>

-		<td class="grey" align="center">'.$gametime.'</td>

-	  </tr>';

+while ($r_plist = mysql_fetch_array($q_plist)) {

+  $gametime = sec2hour($r_plist[gametime]);

+  $eff = get_dp($r_plist[eff]);

+  $acc = get_dp($r_plist[accuracy]);

+  $ttl = GetMinutes($r_plist[ttl]);

+  $r_pname = $r_plist[name];

+  $myurl = urlencode($r_pname);

+

+  echo'

+  <tr class="zebra clickableRow" href="./?p=pinfo&amp;pid='.$r_plist['pid'].'">

+    <td nowrap align="left">

+      <a href="./?p=pinfo&amp;pid='.$r_plist['pid'].'">'.FormatPlayerName($r_plist[country], $r_plist['pid'], $r_pname).'</a>

+    </td>

+    <td align="center">'.$r_plist[games].'</td>

+    <td align="center">'.$r_plist[gamescore].'</td>

+    <td align="center">'.$r_plist[frags].'</td>

+    <td align="center">'.$r_plist[kills].'</td>

+    <td align="center">'.$r_plist[deaths].'</td>

+    <td align="center">'.$r_plist[suicides].'</td>

+    <td align="center">'.$eff.'</td>

+    <td align="center">'.$acc.'</td>

+    <td align="center">'.$ttl.'</td>

+    <td align="center">'.$gametime.'</td>

+  </tr>';

 }

+

 echo'

 </tbody></table>

-<div class="pages"><b>Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</b></div>

+<div class="pages">Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</div>

 </form>';

 ?>

diff --git a/html/pages/rank.php b/html/pages/rank.php
index 6eacca0..4be751e 100755
--- a/html/pages/rank.php
+++ b/html/pages/rank.php
@@ -1,56 +1,63 @@
 <?php

 $sql_rgame = "SELECT DISTINCT(p.gid), g.name FROM uts_player AS p, uts_games AS g WHERE p.gid = g.id ORDER BY g.name ASC";

 $q_rgame = mysql_query($sql_rgame) or die(mysql_error());

+

 while ($r_rgame = mysql_fetch_array($q_rgame)) {

 

-	  echo'

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

-	  <tbody>

-	  <tr>

-		<td class="heading" colspan="4" align="center">Top 10 '.$r_rgame['name'].' Players</td>

-	  </tr>

-	  <tr>

-		<td class="smheading" align="center" width="75">N&deg;</td>

-		<td class="smheading" align="center" width="150">Player Name</td>

-		<td class="smheading" align="center" width="75">Rank</td>

-		<td class="smheadingx" align="center" width="75">Matches</td>

-	  </tr>

-	  ';

+    echo'

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

+	    <tbody>

+	    <tr>

+		    <th class="heading" colspan="4" align="center">Top 10 '.$r_rgame['name'].' Players</th>

+	    </tr>

+	    <tr>

+		    <th align="center" width="50">N&deg;</th>

+		    <th align="center" width="150">Player Name</th>

+		    <th align="center" width="75">Rank</th>

+		    <th align="center" width="75">Matches</th>

+	    </tr>

+    ';

 

-	$ranking = 0;

+  $ranking = 0;

 

-	$sql_rplayer = "SELECT pi.id AS pid, pi.name, pi.country, r.rank, r.prevrank, r.matches FROM uts_rank AS r, uts_pinfo AS pi WHERE r.pid = pi.id AND r.gid =  '$r_rgame[gid]' AND pi.banned <> 'Y' ORDER BY r.rank DESC LIMIT 0,10";

-	$q_rplayer = mysql_query($sql_rplayer) or die(mysql_error());

-	if (mysql_num_rows($q_rplayer) == 0) {

-		echo '

-		  <tr>

-			<td class="grey" align="center" colspan = "4">No players entered the rankings yet.</td>

-		  </tr>

-		  <tr>

-			<td class="smheading" align="center" colspan="4">&nbsp;</td>

-		  </tr>

-		  </tbody></table><br>';

+  $sql_rplayer = "SELECT pi.id AS pid, pi.name, pi.country, r.rank, r.prevrank, r.matches FROM uts_rank AS r, uts_pinfo AS pi WHERE r.pid = pi.id AND r.gid =  '$r_rgame[gid]' AND pi.banned <> 'Y' ORDER BY r.rank DESC LIMIT 0,10";

+  $q_rplayer = mysql_query($sql_rplayer) or die(mysql_error());

 

-	}

-	else {

-		while ($r_rplayer = mysql_fetch_array($q_rplayer)) {

+  if (mysql_num_rows($q_rplayer) == 0) {

+    echo '

+    <tr>

+	    <th align="center" colspan = "4">No players entered the rankings yet.</th>

+    </tr>

+    <tr>

+	    <th align="center" colspan="4">&nbsp;</th>

+    </tr>

+    </tbody></table>

+		<br>';

+  }

+  else {

+    while ($r_rplayer = mysql_fetch_array($q_rplayer)) {

 

-			$ranking++;

-			$myurl = urlencode($r_rplayer[name]);

+      $ranking++;

+      $myurl = urlencode($r_rplayer[name]);

 

-		  echo'

-		  <tr>

-			<td class="grey" align="center">'.$ranking.'</td>

-			<td nowrap class="dark" align="left"><a class="darkhuman" href="./?p=pinfo&amp;pid='.$r_rplayer[pid].'">'.FlagImage($r_rplayer[country]).' '.htmlspecialchars($r_rplayer[name], ENT_QUOTES) .' '. RankMovement($r_rplayer['rank'] - $r_rplayer['prevrank']).'</a></td>

-			<td class="dark" align="center">'.get_dp($r_rplayer[rank]).'</td>

-			<td class="grey" align="center">'.$r_rplayer[matches].'</td>

-		  </tr>';

-		}

-		echo'

-		  <tr>

-			<td class="smheading" align="center" colspan="4"><a href="./?p=ext_rank&amp;gid='.$r_rgame[gid].'">Click Here To See All The Rankings</a></td>

-		  </tr>

-		  </tbody></table><br>';

-	}

+      echo'

+      <tr class="clickableRow" href="./?p=pinfo&amp;pid='.$r_rplayer[pid].'">

+	      <td align="center">'.$ranking.'</td>

+	      <td nowrap align="left">

+					<a href="./?p=pinfo&amp;pid='.$r_rplayer[pid].'">'.FlagImage($r_rplayer[country]).' '.htmlspecialchars($r_rplayer[name], ENT_QUOTES) .' '. RankMovement($r_rplayer['rank'] - $r_rplayer['prevrank']).'</a>

+				</td>

+	      <td align="center">'.get_dp($r_rplayer[rank]).'</td>

+	      <td align="center">'.$r_rplayer[matches].'</td>

+      </tr>';

+    }

+    echo'

+    <tr>

+	    <td class="totals" align="center" colspan="4">

+				<a href="./?p=ext_rank&amp;gid='.$r_rgame[gid].'">Click here to see all the rankings</a>

+			</td>

+    </tr>

+    </tbody></table>

+		<br>';

+  }

 }

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

diff --git a/html/pages/recent.php b/html/pages/recent.php
index 92fafb7..e95b195 100755
--- a/html/pages/recent.php
+++ b/html/pages/recent.php
@@ -1,4 +1,5 @@
 <?php

+

 // Firstly we need to work out First Last Next Prev pages

 $where = ' ';

 $year = !empty($_REQUEST['year']) ? my_addslashes(sprintf("%04d", $_REQUEST['year'])) : 0;

@@ -16,16 +17,16 @@ $mcount = $r_mcount['result'];
 $ecount = $mcount/25;

 $ecount2 = number_format($ecount, 0, '.', '');

 

-IF($ecount > $ecount2) {

-	$ecount2 = $ecount2+1;

+if ($ecount > $ecount2) {

+  $ecount2 = $ecount2+1;

 }

 

 $fpage = 0;

-IF($ecount < 1) { $lpage = 0; }

+if ($ecount < 1) { $lpage = 0; }

 else { $lpage = $ecount2-1; }

 

-$cpage = preg_replace('/\D/', '', $_REQUEST["page"]);

-IF ($cpage == "") { $cpage = "0"; }

+$cpage = mysql_real_escape_string(preg_replace('/\D/', '', $_REQUEST["page"]));

+if ($cpage == "") { $cpage = "0"; }

 $qpage = $cpage*25;

 

 $tfpage = $cpage+1;

@@ -33,105 +34,132 @@ $tlpage = $lpage+1;
 

 $ppage = $cpage-1;

 $ppageurl = "<a class=\"pages\" href=\"./?p=recent&amp;year=$year&amp;month=$month&amp;day=$day&amp;gid=$gid&amp;page=$ppage\">[Previous]</a>";

-IF ($ppage < "0") { $ppageurl = "[Previous]"; }

+if ($ppage < "0") { $ppageurl = "[Previous]"; }

 

 $npage = $cpage+1;

 $npageurl = "<a class=\"pages\" href=\"./?p=recent&amp;year=$year&amp;month=$month&amp;day=$day&amp;gid=$gid&amp;page=$npage\">[Next]</a>";

-IF ($npage >= "$ecount") { $npageurl = "[Next]"; }

+if ($npage >= "$ecount") { $npageurl = "[Next]"; }

 

 $fpageurl = "<a class=\"pages\" href=\"./?p=recent&amp;year=$year&amp;month=$month&amp;day=$day&amp;gid=$gid&amp;page=$fpage\">[First]</a>";

-IF ($cpage == "0") { $fpageurl = "[First]"; }

+if ($cpage == "0") { $fpageurl = "[First]"; }

 

 $lpageurl = "<a class=\"pages\" href=\"./?p=recent&amp;year=$year&amp;month=$month&amp;day=$day&amp;gid=$gid&amp;page=$lpage\">[Last]</a>";

-IF ($cpage == "$lpage") { $lpageurl = "[Last]"; }

+if ($cpage == "$lpage") { $lpageurl = "[Last]"; }

 

 echo '

 <form action="'.$_SERVER['PHP_SELF'].'" method="GET">

-<div class="pages"><b>Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</b></div>

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

-  <tbody><tr>

-    <td class="heading" colspan="7" align="center">Unreal Tournament Match List</td>

-  </tr>';

+<div class="pages spacer">Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</div>

 

-echo '

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

+  <tbody><tr>

+    <th class="heading" colspan="7" align="center">Unreal Tournament Match List</th>

+  </tr>

   <tr>

-    <td class = "smheading" colspan = "7" align = "center">';

-echo '<input type="hidden" name="p" value="'.$_REQUEST['p'].'">';

-echo '<table width="700" class="searchform" border="0" cellpadding="1" cellspacing="1">';

-echo '<tr><td><strong>Filter:</strong></td>';

+    <th colspan="7" align="center">';

+echo '<input type="hidden" name="p" value="'.htmlentities($_REQUEST['p']).'">';

+echo '<table width="900" class="smheading" border="0" cellpadding="0" cellspacing="0">';

+echo '<tr><th class="noborders">Filter:</th>';

 //echo '<td>Date:</td>';

-echo '<td><select class="searchform" name="year">';

+echo '<th class="noborders"><select class="searchform" name="year">';

 echo '<option value="0">*</option>';

-for($i = date('Y');$i >= date("Y") - 5; $i--) {

-	$selected = ($year == $i) ? 'selected' : '';

-	echo '<option '.$selected.' value="'.$i.'">'.$i.'</option>';

+

+for ($i = date('Y');$i >= date("Y") - 5; $i--) {

+  $selected = ($year == $i) ? 'selected' : '';

+  echo '<option '.$selected.' value="'.$i.'">'.$i.'</option>';

 }

+

 echo '</select>';

 echo '&nbsp;';

 echo '<select class="searchform" name="month">';

 echo '<option value="0">*</option>';

+

 $monthname = array('', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December');

-for($i = 1;$i <= 12; $i++) {

-	$selected = ($month == $i) ? 'selected' : '';

-	echo '<option '.$selected.' value="'.$i.'">'.$monthname[$i].'</option>';

+for ($i = 1;$i <= 12; $i++) {

+  $selected = ($month == $i) ? 'selected' : '';

+  echo '<option '.$selected.' value="'.$i.'">'.$monthname[$i].'</option>';

 }

+

 echo '</select>';

 echo '&nbsp;';

 echo '<select class="searchform" name="day">';

 echo '<option value="0">*</option>';

-for($i = 1;$i <= 31; $i++) {

-	$selected = ($day == $i) ? 'selected' : '';

-	echo '<option '.$selected.' value="'.$i.'">'.$i.'</option>';

+

+for ($i = 1;$i <= 31; $i++) {

+  $selected = ($day == $i) ? 'selected' : '';

+  echo '<option '.$selected.' value="'.$i.'">'.$i.'</option>';

 }

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

 

-echo '<td>Gametype:</td>';

-echo '<td><select class="searchform" name="gid">';

+echo '</select></th>';

+echo '<th class="noborders">Gametype:</th>';

+echo '<th class="noborders"><select class="searchform" name="gid">';

 echo '<option value="0">*</option>';

+

 $sql_game = "SELECT DISTINCT(p.gid), g.name FROM uts_player AS p, uts_games AS g WHERE p.gid = g.id ORDER BY g.name ASC";

 $q_game = mysql_query($sql_game) or die(mysql_error());

+

 while ($r_game = mysql_fetch_array($q_game)) {

-	$selected = ($r_game['gid'] == $gid) ? 'selected' : '';

-	echo '<option '.$selected.' value="'.$r_game['gid'].'">'. $r_game['name'] .'</option>';

+  $selected = ($r_game['gid'] == $gid) ? 'selected' : '';

+  echo '<option '.$selected.' value="'.$r_game['gid'].'">'. $r_game['name'] .'</option>';

 }

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

-echo '<td><input class="searchform" type="Submit" name="filter" value="Apply"></td>';

+

+echo '</select></th>';

+echo '<th class="noborders"><input class="searchform" type="Submit" name="filter" value="Apply"></th>';

 echo '</tr></table>';

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

-

 echo '

   <tr>

-    <td class="smheading" align="center" width="80">Match ID</td>

-    <td class="smheading" align="center" width="220">Date/Time</td>

-    <td class="smheading" align="center" width="140">Match Type</td>

-    <td class="smheading" align="center">Map</td>

-    <td class="smheading" align="center" width="60">Time</td>

-    <td class="smheading" align="center" width="60">Players</td>

+    <th class="smheading" align="center" width="40">ID</th>

+    <th class="smheading" align="center" width="220">Date/Time</th>

+    <th class="smheading" align="center" width="140">Match Type</th>

+    <th class="smheading" align="center">Map</th>

+	  <th class="smheading" align="center" width="200">Scores</th>

   </tr>';

 

-$sql_recent = "SELECT m.id, m.time, g.name AS gamename, m.mapfile, m.gametime, (SELECT count(p.id) FROM uts_player AS p WHERE m.id = p.matchid) as players FROM uts_match AS m, uts_games AS g WHERE g.id = m.gid $where ORDER BY m.time DESC LIMIT $qpage,25";

+$sql_recent = "SELECT m.id, m.time, g.name AS gamename, m.mapfile, m.gametime, t0score, t1score, t2score, t3score, (SELECT count(p.id) FROM uts_player AS p WHERE m.id = p.matchid) as players FROM uts_match AS m, uts_games AS g WHERE g.id = m.gid $where ORDER BY m.time DESC LIMIT ".mysql_real_escape_string($qpage).",50";

 $q_recent = mysql_query($sql_recent) or die(mysql_error());

-while ($r_recent = mysql_fetch_array($q_recent)) {

 

-	  $r_time = mdate($r_recent[time]);

-	  $r_mapfile = un_ut($r_recent[mapfile]);

-	  $r_gametime = GetMinutes($r_recent[gametime]);

-

-	  echo'

-	  <tr>

-		<td class="dark" align="center"><a class="darkid" href="./?p=match&amp;mid='.$r_recent[id].'">'.$r_recent[id].'</a></td>

-		<td nowrap class="dark" align="center"><a class="darkhuman" href="./?p=match&amp;mid='.$r_recent[id].'">'.$r_time.'</a></td>

-		<td nowrap class="grey" align="center">'.$r_recent[gamename].'</td>

-		<td class="grey" align="center">'.$r_mapfile.'</td>

-		<td class="grey" align="center">'.$r_gametime.'</td>

-		<td class="grey" align="center">'.$r_recent[players].'</td>

-	  </tr>';

+while ($r_recent = mysql_fetch_array($q_recent)) {

+  $r_time = mdate($r_recent[time]);

+  $r_mapfile = un_ut($r_recent[mapfile]);

+  $r_gametime = GetMinutes($r_recent[gametime]);

+  $winner = max($r_recent[t0score], $r_recent[t1score], $r_recent[t2score], $r_recent[t3score]);

+  $moreThan2Teams = ($r_recent[t2score]!=0);

+

+  if ($winner == $r_recent[t0score]) {

+    $winnercolor = "red";

+    $winmsg = "Red is the winner!";

+  }

+  elseif ($winner == $r_recent[t1score]) {

+    $winnercolor = "blue";

+    $winmsg = "Blue is the winner!";

+  }

+  elseif ($winner == $r_recent[t2score]) {

+    $winnercolor = "green";

+    $winmsg = "Green is the winner!";

+  }

+  else {

+    $winnercolor = "gold";

+    $winmsg = "Gold is the winner!";

+  };

+

+  echo '

+  <tr class="clickableRow" href="./?p=match&amp;mid='.$r_recent[id].'">

+    <td align="center">'.$r_recent[id].'</td>

+    <td nowrap align="center"><a href="./?p=match&amp;mid='.$r_recent[id].'">'.$r_time.'</a></td>

+    <td nowrap align="center">'.$r_recent[gamename].'</td>

+    <td align="center">'.$r_mapfile.'</td>

+    <td class="tooltip" title="'.$winmsg.'" align="center"><span class="redbox">'.$r_recent[t0score].'</span><span class="bluebox">'.$r_recent[t1score].'</span>';

+

+		if  ($moreThan2Teams) {

+			echo '<span class="greenbox">'.$r_recent[t2score].' </span><span class="goldbox">  '.$r_recent[t3score].' </span>';

+		}

+

+    '</td>

+  </tr>';

 }

 

-

-

 echo '

 </tbody></table>

-<div class="pages"><b>Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</b></div>

+<div class="pages">Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</div>

 </form>';

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

diff --git a/html/pages/watchlist.php b/html/pages/watchlist.php
index bfc8512..4f4cf1b 100755
--- a/html/pages/watchlist.php
+++ b/html/pages/watchlist.php
@@ -1,106 +1,119 @@
 <?php

 global $s_lastvisit;

+

 echo'

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

-  <tbody><tr>

-    <td class="heading" align="center">Your Watchlist</td>

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

+  <tbody>

+  <tr>

+    <th class="heading" align="center" colspan="12">Your Watchlist</th>

   </tr>

-</tbody></table>';

-echo '<br><br><br>';

-

+  <tr>

+    <th class="smheading" colspan="12">

+      <form name="playersearch" method="post" action="./?p=psearch">

+        <div class="darksearch">

+          <span>

+            <input type="text" class="search square" placeholder="Search player..." name="name" value="'.htmlentities($playername).'">

+            <input class="searchbutton" type="submit" value="Search">

+          </span>

+        </div>';

 

 $watchlist = GetCurrentWatchlist();

+

 if (count($watchlist) > 25) $watchlist = array_slice($watchlist, 0, 25);

+

 if (count($watchlist) == 0) {

-	echo "<p class='pages'>Your watchlist is empty!<br><br>You can add players to your watchlist by clicking the appropriate icon on the header of their career summary page.</p>";

-	return;

+  echo '

+  <tr>

+    <td>

+      <p class="pages">

+        Your watchlist is empty!

+        <br><br>

+        You can add players to your watchlist by clicking the appropriate icon on the header of their career summary page.

+      </p>

+    </td>

+  </tr>

+  </tbody></table>';

+  return;

 }

 

 echo '

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

-  <tbody>

-  <tr>

-	<td class="smheading" align="center" width="150">Player Name</td>

-	<td class="smheading" align="center">Last Match</td>

-	<td class="smheading" align="center">Matches</td>

-	<td class="smheading" align="center">Score</td>

-	<td class="smheading" align="center">Frags</td>

-	<td class="smheading" align="center">Kills</td>

-	<td class="smheading" align="center">Deaths</td>

-	<td class="smheading" align="center">Suicides</td>

-	<td class="smheading" align="center">Eff</td>

-	<td class="smheading" align="center">Acc</td>

-	<td class="smheading" align="center">TTL</td>

-	<td class="smheading" align="center">Hours</td>

-  </tr>';

+<tr>

+  <th align="center" width="150">Player Name</th>

+  <th align="center">Last Match</th>

+  <th align="center">Matches</th>

+  <th align="center">Score</th>

+  <th align="center">Frags</th>

+  <th align="center">Kills</th>

+  <th align="center">Deaths</th>

+  <th align="center">Suicides</th>

+  <th align="center">Eff</th>

+  <th align="center">Acc</th>

+  <th align="center">TTL</th>

+  <th align="center">Hours</th>

+</tr>';

 

+$i = 0;

 

-$i = 0;  

-foreach($watchlist as $pid) {

-	$sql_players = "SELECT 	pi.id AS pid,

-									pi.name, 

-									pi.country,

-									m.time,

-									m.id AS mid

-						FROM		uts_pinfo pi,

-									uts_match m,

-									uts_player p

-						WHERE		pi.id = '$pid'

-							AND	p.matchid = m.id

-							AND	p.pid = pi.id

-						ORDER BY	m.time DESC

-						LIMIT		0,1

-						";

-						

-	$sql_pinfo = "	SELECT	COUNT(*) AS games, 

-									SUM(p.gamescore) as gamescore, 

-									SUM(p.frags) AS frags, 

-									SUM(p.kills) AS kills,

-									SUM(p.deaths) AS deaths, 

-									SUM(p.suicides) as suicides, 

-									AVG(p.eff) AS eff, 

-									AVG(p.accuracy) AS accuracy, 

-									AVG(p.ttl) AS ttl, 

-									SUM(gametime) as gametime

-						FROM 		uts_player AS p

-						WHERE 	p.pid = '$pid'

-						GROUP BY p.pid";

-	$r_pinfo = small_query($sql_pinfo);

-						

-	$q_players = mysql_query($sql_players) or die(mysql_error());

-	

-	

-	while ($r_players = mysql_fetch_array($q_players)) {

-		$i++;

-		$new = (mtimestamp($r_players['time']) > $s_lastvisit) ? true : false;

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

-		echo '<tr>';

-		echo '<td class="dark"><a class="darkhuman" href="?p=pinfo&amp;pid='. $r_players['pid'] .'">';

-		echo FormatPlayerName($r_players['country'], $r_players['pid'], $r_players['name']);

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

-		echo '<td class="'.$class.'" align="center"><a class="'.$class.'" href="?p=match&amp;mid='. $r_players['mid'] .'">';;

-		if  ($new) echo "<strong>";

-		echo date("Y-m-d H:i", mtimestamp($r_players['time']));

-		if ($new) echo "</strong>";

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

-		

-		echo '

-		<td class="'.$class.'" align="center">'.$r_pinfo['games'].'</td>

-		<td class="'.$class.'" align="center">'.$r_pinfo['gamescore'].'</td>

-		<td class="'.$class.'" align="center">'.$r_pinfo['frags'].'</td>

-		<td class="'.$class.'" align="center">'.$r_pinfo['kills'].'</td>

-		<td class="'.$class.'" align="center">'.$r_pinfo['deaths'].'</td>

-		<td class="'.$class.'" align="center">'.$r_pinfo['suicides'].'</td>

-		<td class="'.$class.'" align="center">'.get_dp($r_pinfo['eff']).'</td>

-		<td class="'.$class.'" align="center">'.get_dp($r_pinfo['accuracy']).'</td>

-		<td class="'.$class.'" align="center">'.GetMinutes($r_pinfo['ttl']).'</td>

-		<td class="'.$class.'" align="center">'.sec2hour($r_pinfo['gametime']).'</td>';

-		

-		echo '</tr>';

-	}

-}

+foreach ($watchlist as $pid) {

+  $sql_players = "SELECT pi.id AS pid,

+                  pi.name,

+                  pi.country,

+                  m.time,

+                  m.id AS mid

+            FROM  uts_pinfo pi,

+                  uts_match m,

+                  uts_player p

+            WHERE pi.id = '$pid'

+              AND p.matchid = m.id

+              AND p.pid = pi.id

+            ORDER BY m.time DESC

+            LIMIT 0,1";

 

-echo '</tbody></table>';

+  $sql_pinfo = "  SELECT COUNT(*) AS games,

+                  SUM(p.gamescore) as gamescore,

+                  SUM(p.frags) AS frags,

+                  SUM(p.kills) AS kills,

+                  SUM(p.deaths) AS deaths,

+                  SUM(p.suicides) as suicides,

+                  AVG(p.eff) AS eff,

+                  AVG(p.accuracy) AS accuracy,

+                  AVG(p.ttl) AS ttl,

+                  SUM(gametime) as gametime

+            FROM  uts_player AS p

+            WHERE p.pid = '$pid'

+            GROUP BY p.pid";

 

+  $r_pinfo = small_query($sql_pinfo);

 

+  $q_players = mysql_query($sql_players) or die(mysql_error());

+

+  while ($r_players = mysql_fetch_array($q_players)) {

+    $i++;

+    $new = (mtimestamp($r_players['time']) > $s_lastvisit) ? true : false;

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

+    echo '<tr class="clickableRow" href="?p=pinfo&amp;pid='. $r_players['pid'] .'">';

+    echo '<td align="left"><a href="?p=pinfo&amp;pid='. $r_players['pid'] .'">';

+    echo FormatPlayerName($r_players['country'], $r_players['pid'], $r_players['name']);

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

+    echo '<td align="center"><a href="?p=match&amp;mid='. $r_players['mid'] .'">';;

+    if  ($new) echo "<strong>";

+    echo date("Y-m-d H:i", mtimestamp($r_players['time']));

+    if ($new) echo "</strong>";

+    echo '</a>

+    </td>

+    <td align="center">'.$r_pinfo['games'].'</td>

+    <td align="center">'.$r_pinfo['gamescore'].'</td>

+    <td align="center">'.$r_pinfo['frags'].'</td>

+    <td align="center">'.$r_pinfo['kills'].'</td>

+    <td align="center">'.$r_pinfo['deaths'].'</td>

+    <td align="center">'.$r_pinfo['suicides'].'</td>

+    <td align="center">'.get_dp($r_pinfo['eff']).'</td>

+    <td align="center">'.get_dp($r_pinfo['accuracy']).'</td>

+    <td align="center">'.GetMinutes($r_pinfo['ttl']).'</td>

+    <td align="center">'.sec2hour($r_pinfo['gametime']).'</td>

+    </tr>';

+  }

+}

+

+echo '</tbody></table>';

 ?>