Update to mysqli

45 files changed, 428 insertions, 436 deletions

diff --git a/html/pages/admin/check.php b/html/pages/admin/check.php
index 125a282..80dee0e 100755
--- a/html/pages/admin/check.php
+++ b/html/pages/admin/check.php
@@ -10,44 +10,37 @@ echo '
 
 // Check access rights
 echo '
-	<table class="box" border="0" cellpadding="1" cellspacing="2">
+<table class="box" border="0" cellpadding="1" cellspacing="2">
 	<tr>
 		<td class="smheading" align="center" height="25" width="550" colspan="2">Checking access rights</td>
 	</tr>';
 
 // directories
-foreach (array("logs", "logs/ac", "logs/backup", "logs/utdc", "logs/ace") as $dir)
-{
+foreach (array("logs", "logs/ac", "logs/backup", "logs/utdc", "logs/ace") as $dir) {
 	echo '
 	<tr>
 		<td class="smheading" align="left" width="350">', $dir, '</td>';
 	if (!file_exists($dir)) {
 		if (mkdir($dir, 0777)) {
-		      echo '
-			    <td class="warn" align="left" width="200">Created</td></tr>';
+      echo '<td class="warn" align="left" width="200">Created</td></tr>';
 		}
 		else {
-		      echo '
-			    <td class="warn" align="left" width="200">Not found!</td></tr>';
+      echo '<td class="warn" align="left" width="200">Not found!</td></tr>';
 		}
 	}
 	else if (!is_dir($dir)) {
-		echo '
-		      <td class="warn" align="left" width="200">Not a directory!</td></tr>';
+		echo '<td class="warn" align="left" width="200">Not a directory!</td></tr>';
 	}
 	else if (!is_writable($dir)) {
 		if (@chmod($dir, 0777)) {
-			echo '
-			      <td class="grey" align="left" width="200">SET</td></tr>';
+			echo '<td class="grey" align="left" width="200">SET</td></tr>';
 		}
 		else {
-			echo '
-			      <td class="warn" align="left" width="200">Incorrect access rights: ' , substr(sprintf('%o', fileperms($dir)), -4) , '</td></tr>';
+			echo '<td class="warn" align="left" width="200">Incorrect access rights: ' , substr(sprintf('%o', fileperms($dir)), -4) , '</td></tr>';
 		}
 	}
 	else {
-		echo '
-		      <td class="grey" align="left" width="200">OK</td></tr>';
+		echo '<td class="grey" align="left" width="200">OK</td></tr>';
 	}
 }
 
@@ -58,39 +51,33 @@ foreach (array("includes/ftptimestamp.php") as $file)
 	<tr>
 		<td class="smheading" align="left" width="350">', $file, '</td>';
 	if (!file_exists($file)) {
-		echo '
-		      <td class="warn" align="left" width="200">Not found!</td></tr>';
+		echo '<td class="warn" align="left" width="200">Not found!</td></tr>';
 	}
 	else if (!is_file($file)) {
-		echo '
-		      <td class="warn" align="left" width="200">Not a file!</td></tr>';
+		echo '<td class="warn" align="left" width="200">Not a file!</td></tr>';
 	}
 	else if (!is_writable($file)) {
 		if (@chmod($file, 0777)) {
-			echo '
-			      <td class="grey" align="left" width="200">SET</td></tr>';
+			echo '<td class="grey" align="left" width="200">SET</td></tr>';
 		}
 		else {
-			echo '
-			      <td class="warn" align="left" width="200">Incorrect access rights: ' , substr(sprintf('%o', fileperms($file)), -4) , '</td></tr>';
+			echo '<td class="warn" align="left" width="200">Incorrect access rights: ' , substr(sprintf('%o', fileperms($file)), -4) , '</td></tr>';
 		}
 	}
 	else {
-		echo '
-		      <td class="grey" align="left" width="200">OK</td></tr>';
+		echo '<td class="grey" align="left" width="200">OK</td></tr>';
 	}
 }
 
-echo '
-	</tbody></table>
+echo '</tbody></table>
 <div class="opnote">* Might not work correctly on Windows systems *</div><br>';
 
 
 // connect to the database and check structure
 echo '
-	<table class="box" border="0" cellpadding="1" cellspacing="2">
+<table class="box" border="0" cellpadding="1" cellspacing="2">
 	<tr>
-		<td class="smheading" align="center" height="25" width="550" colspan="2">Checking mysql tables</td>
+		<td class="smheading" align="center" height="25" width="550" colspan="2">Checking MySQL tables</td>
 	</tr>';
 
 // database creation array
@@ -337,7 +324,7 @@ foreach ($create_table as $table => $query) {
 		      <td class="grey" align="left" width="200">OK</td></tr>';
 	}
 	else {
-		if (mysql_query($query)) {
+		if (mysqli_query($GLOBALS["___mysqli_link"], $query)) {
 			echo '
 		      <td class="grey" align="left" width="200">Created</td></tr>';
 		}
@@ -349,7 +336,7 @@ foreach ($create_table as $table => $query) {
 }
 echo '
 	</tbody></table><br>';
-	
+
 // check graph types - have to use id since no other unique key except composite ones.
 $create_charttype['90'] = "INSERT INTO `uts_charttypes` VALUES (90, 'Frags Team', 'teamScore', 'team', 'title: {\ntext: ''Battle for #1''\n},\ncredits: {\nenabled: false\n},			\nlegend: {\nenabled: false\n},			\nxAxis: {\ntitle: '''',\nmin: 0\n},		   \nyAxis: {\ntitle: '''',\nmin: 0\n},\nplotOptions : {\n	line : {\n		stickyTracking : false\n	}\n}', 'line', 1);";
 $create_charttype['20'] = "INSERT INTO `uts_charttypes` VALUES (20, 'Domination', 'teamScore', 'team', 'title: {\ntext: ''Score''\n},\ncredits: {\nenabled: false\n},			\nlegend: {\nenabled: false\n},			\nxAxis: {\ntitle: '''',\nmin: 0\n},		   \nyAxis: {\ntitle: '''',\nmin: 0\n},\nplotOptions : {\n	line : {\n		stickyTracking : false\n	}\n}', 'line', 1);";
@@ -389,7 +376,7 @@ else {
 			      <td class="grey" align="left" width="200">OK</td></tr>';
 		}
 		else {
-			if (mysql_query($query)) {
+			if (mysqli_query($GLOBALS["___mysqli_link"], $query)) {
 				echo '
 			      <td class="grey" align="left" width="200">Added</td></tr>';
 			}
@@ -442,7 +429,7 @@ else {
 			      <td class="grey" align="left" width="200">OK</td></tr>';
 		}
 		else {
-			if (mysql_query($query)) {
+			if (mysqli_query($GLOBALS["___mysqli_link"], $query)) {
 				echo '
 			      <td class="grey" align="left" width="200">Added</td></tr>';
 			}
@@ -466,8 +453,8 @@ echo '
 	<tr>
 		<td class="smheading" align="left" width="350">Fix BT cap times</td>';
 
-	$q = mysql_query("UPDATE uts_events SET col3 = ROUND(CEILING((col3-1)*100/1.1) / 100, 2), col1 = 'btcap' WHERE col1 = 'cap'");
-	$affected = mysql_affected_rows();
+	$q = mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_events SET col3 = ROUND(CEILING((col3-1)*100/1.1) / 100, 2), col1 = 'btcap' WHERE col1 = 'cap'");
+	$affected = mysqli_affected_rows($GLOBALS["___mysqli_link"]);
 
 	if ($affected == -1) {
 	echo '
@@ -486,4 +473,4 @@ echo '
 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 '</tbody></table>';
 
-?>
\ No newline at end of file
+?>
diff --git a/html/pages/admin/dmatch.php b/html/pages/admin/dmatch.php
index 3c7ebc5..4ad3bc1 100644
--- a/html/pages/admin/dmatch.php
+++ b/html/pages/admin/dmatch.php
@@ -27,9 +27,9 @@ echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">
 <tr>

 	<td class="smheading" align="left" width="200">Adjusting Rankings</td>';

 $sql_radjust = "SELECT pid, gid, rank FROM uts_player WHERE matchid = $matchid";

-$q_radjust = mysql_query($sql_radjust) or die(mysql_error());

+$q_radjust = mysqli_query($GLOBALS["___mysqli_link"], $sql_radjust) or die(mysqli_error($GLOBALS["___mysqli_link"]));

 $pids = array();

-while ($r_radjust = mysql_fetch_array($q_radjust)) {

+while ($r_radjust = mysqli_fetch_array($q_radjust)) {

 

 	$pid = $r_radjust[pid];

 	$pids[] = $pid;

@@ -44,57 +44,57 @@ while ($r_radjust = mysql_fetch_array($q_radjust)) {
 	$oldrank = $sql_crank[rank];

 	$matchcount = $sql_crank[matches]-1;

 

-	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());

+	mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_rank SET rank = $newrank, prevrank = $oldrank, matches = $matchcount WHERE id = $rid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+	mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank WHERE matches = 0") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 }

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

 </tr>

 <tr>

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

-mysql_query("DELETE FROM uts_match WHERE id = $matchid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_match WHERE id = $matchid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

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

-mysql_query("DELETE FROM uts_player WHERE matchid = $matchid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_player WHERE matchid = $matchid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

 	<td class="smheading" align="left" width="200">Removing Kill Matrix Entries:</td>';

-mysql_query("DELETE FROM uts_killsmatrix WHERE matchid = $matchid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_killsmatrix WHERE matchid = $matchid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

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

-mysql_query("DELETE FROM uts_weaponstats WHERE matchid = $matchid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid = $matchid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

 	<td class="smheading" align="left" width="200">Amending Player Weapon Stats:</td>';

 foreach($pids as $pid) {

-	mysql_query("DELETE FROM uts_weaponstats WHERE matchid IN ('$matchid','0') AND pid = '$pid'") or die(mysql_error());

+	mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid IN ('$matchid','0') AND pid = '$pid'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 

-	$q_weaponstats = mysql_query("SELECT weapon, SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE pid = '$pid'  GROUP BY weapon") or die(mysql_error());

-	while ($r_weaponstats = mysql_fetch_array($q_weaponstats)) {

-		mysql_query("INSERT INTO uts_weaponstats SET matchid='0', pid='$pid', weapon='${r_weaponstats['weapon']}', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysql_error());

+	$q_weaponstats = mysqli_query($GLOBALS["___mysqli_link"], "SELECT weapon, SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE pid = '$pid'  GROUP BY weapon") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+	while ($r_weaponstats = mysqli_fetch_array($q_weaponstats)) {

+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_weaponstats SET matchid='0', pid='$pid', weapon='${r_weaponstats['weapon']}', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 	}

 }

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

 </tr>

 <tr>

 	<td class="smheading" align="left" width="200">Amending Global Weapon Stats:</td>';

-	mysql_query("DELETE FROM uts_weaponstats WHERE matchid='0' AND pid='0'") or die(mysql_error());

+	mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid='0' AND pid='0'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 

-	$q_weaponstats = mysql_query("SELECT weapon, SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE matchid = '0'  GROUP BY weapon") or die(mysql_error());

-	while ($r_weaponstats = mysql_fetch_array($q_weaponstats)) {

-		mysql_query("INSERT INTO uts_weaponstats SET matchid='0', pid='0', weapon='${r_weaponstats['weapon']}', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysql_error());

+	$q_weaponstats = mysqli_query($GLOBALS["___mysqli_link"], "SELECT weapon, SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE matchid = '0'  GROUP BY weapon") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+	while ($r_weaponstats = mysqli_fetch_array($q_weaponstats)) {

+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_weaponstats SET matchid='0', pid='0', weapon='${r_weaponstats['weapon']}', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 	}

 

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

 </tr>

 <tr>

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

-mysql_query("DELETE FROM uts_events WHERE matchid = $matchid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_events WHERE matchid = $matchid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

diff --git a/html/pages/admin/dplayer.php b/html/pages/admin/dplayer.php
index ca3e747..c641480 100644
--- a/html/pages/admin/dplayer.php
+++ b/html/pages/admin/dplayer.php
@@ -21,9 +21,9 @@ echo'<table border="0" cellpadding="0" cellspacing="0" width="600">
 </tr>

 <tr>

 	<td class="smheading" align="left">Removing Kill Matrix Entries:</td>';

-	$q_match = mysql_query("SELECT matchid, playerid FROM uts_player WHERE pid = '$pid'") or die(mysql_error());

-	while ($r_match = mysql_fetch_array($q_match)) {

-		mysql_query("DELETE FROM uts_killsmatrix WHERE matchid = '${r_match['matchid']}' AND (killer = '${r_match['playerid']}' OR victim = '${r_match['playerid']}')") or die(mysql_error());

+	$q_match = mysqli_query($GLOBALS["___mysqli_link"], "SELECT matchid, playerid FROM uts_player WHERE pid = '$pid'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+	while ($r_match = mysqli_fetch_array($q_match)) {

+		mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_killsmatrix WHERE matchid = '${r_match['matchid']}' AND (killer = '${r_match['playerid']}' OR victim = '${r_match['playerid']}')") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 	}

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

 </tr>

@@ -32,7 +32,7 @@ echo'<table border="0" cellpadding="0" cellspacing="0" width="600">
 	<td class="smheading" align="left" width="300">Removing Player Info:</td>';

 $r_pinfo = small_query("SELECT banned FROM uts_pinfo WHERE id = $playerid");

 if ($r_pinfo['banned'] != 'Y') { 

-	mysql_query("DELETE FROM uts_pinfo WHERE id = $playerid") or die(mysql_error());

+	mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_pinfo WHERE id = $playerid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 	echo'<td class="grey" align="left" width="300">Done</td>';

 } else {

 	echo'<td class="grey" align="left" width="300">No (player banned)</td>';

@@ -41,31 +41,31 @@ echo '
 </tr>

 <tr>

 	<td class="smheading" align="left">Removing Player Match Events:</td>';

-mysql_query("DELETE e.* FROM uts_player as p, uts_events as e WHERE p.pid = $playerid AND p.playerid = e.playerid AND p.matchid = e.matchid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE e.* FROM uts_player as p, uts_events as e WHERE p.pid = $playerid AND p.playerid = e.playerid AND p.matchid = e.matchid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

 	<td class="smheading" align="left">Removing Player Match Records:</td>';

-mysql_query("DELETE FROM uts_player WHERE pid = $playerid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_player WHERE pid = $playerid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

 	<td class="smheading" align="left">Removing Player Rank:</td>';

-mysql_query("DELETE FROM uts_rank WHERE pid = $playerid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank WHERE pid = $playerid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

 	<td class="smheading" align="left">Removing Player Weapon Stats:</td>';

-mysql_query("DELETE FROM uts_weaponstats WHERE pid = $playerid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE pid = $playerid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

 	<td class="smheading" align="left" width="200">Amending Global Weapon Stats:</td>';

-	mysql_query("DELETE FROM uts_weaponstats WHERE matchid='0' AND pid='0'") or die(mysql_error());

+	mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid='0' AND pid='0'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 

-	$q_weaponstats = mysql_query("SELECT weapon, SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE matchid = '0'  GROUP BY weapon") or die(mysql_error());

-	while ($r_weaponstats = mysql_fetch_array($q_weaponstats)) {

-		mysql_query("INSERT INTO uts_weaponstats SET matchid='0', pid='0', weapon='${r_weaponstats['weapon']}', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysql_error());

+	$q_weaponstats = mysqli_query($GLOBALS["___mysqli_link"], "SELECT weapon, SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE matchid = '0'  GROUP BY weapon") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+	while ($r_weaponstats = mysqli_fetch_array($q_weaponstats)) {

+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_weaponstats SET matchid='0', pid='0', weapon='${r_weaponstats['weapon']}', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 	}

 

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

diff --git a/html/pages/admin/dpmatch.php b/html/pages/admin/dpmatch.php
index ff4258e..35e8a7e 100644
--- a/html/pages/admin/dpmatch.php
+++ b/html/pages/admin/dpmatch.php
@@ -47,17 +47,17 @@ if (!$sql_crank) {
 	$oldrank = $sql_crank[rank];

 	$matchcount = $sql_crank[matches]-1;

 	

-	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());

+	mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_rank SET rank = $newrank, prevrank = $oldrank, matches = $matchcount WHERE id = $rid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+	mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank WHERE matches = 0") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 	

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

 }

 echo'</tr>

 <tr>

 	<td class="smheading" align="left">Removing Kill Matrix Entries:</td>';

-	$q_match = mysql_query("SELECT matchid, playerid FROM uts_player WHERE pid = '$pid' and matchid = '$matchid'") or die(mysql_error());

-	while ($r_match = mysql_fetch_array($q_match)) {

-		mysql_query("DELETE FROM uts_killsmatrix WHERE matchid = '${r_match['matchid']}' AND (killer = '${r_match['playerid']}' OR victim = '${r_match['playerid']}')") or die(mysql_error());

+	$q_match = mysqli_query($GLOBALS["___mysqli_link"], "SELECT matchid, playerid FROM uts_player WHERE pid = '$pid' and matchid = '$matchid'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+	while ($r_match = mysqli_fetch_array($q_match)) {

+		mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_killsmatrix WHERE matchid = '${r_match['matchid']}' AND (killer = '${r_match['playerid']}' OR victim = '${r_match['playerid']}')") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 	}

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

 </tr>

@@ -65,36 +65,36 @@ echo'</tr>
 

 <tr>

 	<td class="smheading" align="left" width="200">Removing Player Weapon Stats:</td>';

-mysql_query("DELETE FROM uts_weaponstats WHERE matchid = $matchid AND pid = $pid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid = $matchid AND pid = $pid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

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

-mysql_query("DELETE e.* FROM uts_events as e, uts_player as p WHERE p.pid = '$pid' AND e.matchid = $matchid AND p.playerid = e.playerid AND p.matchid = e.matchid") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE e.* FROM uts_events as e, uts_player as p WHERE p.pid = '$pid' AND e.matchid = $matchid AND p.playerid = e.playerid AND p.matchid = e.matchid") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

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

-mysql_query("DELETE FROM uts_player WHERE matchid IN ('$matchid','0') AND pid = '$pid'") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_player WHERE matchid IN ('$matchid','0') AND pid = '$pid'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 </tr>

 <tr>

 	<td class="smheading" align="left" width="200">Amending Player Weapon Stats:</td>';

-mysql_query("DELETE FROM uts_weaponstats WHERE matchid IN ('$matchid','0') AND pid = '$pid'") or die(mysql_error());

+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid IN ('$matchid','0') AND pid = '$pid'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 

-$q_weaponstats = mysql_query("SELECT SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE pid = '$pid'  GROUP BY weapon") or die(mysql_error());

-while ($r_weaponstats = mysql_fetch_array($q_weaponstats)) {

-	mysql_query("INSERT INTO uts_weaponstats SET matchid='0', pid='$pid', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysql_error());

+$q_weaponstats = mysqli_query($GLOBALS["___mysqli_link"], "SELECT SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE pid = '$pid'  GROUP BY weapon") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+while ($r_weaponstats = mysqli_fetch_array($q_weaponstats)) {

+	mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_weaponstats SET matchid='0', pid='$pid', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 }

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

 </tr>

 <tr>

 	<td class="smheading" align="left" width="200">Amending Global Weapon Stats:</td>';

-	mysql_query("DELETE FROM uts_weaponstats WHERE matchid='0' AND pid='0'") or die(mysql_error());

+	mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid='0' AND pid='0'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 

-	$q_weaponstats = mysql_query("SELECT weapon, SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE matchid = '0'  GROUP BY weapon") or die(mysql_error());

-	while ($r_weaponstats = mysql_fetch_array($q_weaponstats)) {

-		mysql_query("INSERT INTO uts_weaponstats SET matchid='0', pid='0', weapon='${r_weaponstats['weapon']}', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysql_error());

+	$q_weaponstats = mysqli_query($GLOBALS["___mysqli_link"], "SELECT weapon, SUM(kills) AS kills, SUM(shots) AS shots, SUM(hits) as hits, SUM(damage) as damage, AVG(acc) AS acc FROM uts_weaponstats WHERE matchid = '0'  GROUP BY weapon") or die(mysqli_error($GLOBALS["___mysqli_link"]));

+	while ($r_weaponstats = mysqli_fetch_array($q_weaponstats)) {

+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_weaponstats SET matchid='0', pid='0', weapon='${r_weaponstats['weapon']}', kills='${r_weaponstats['kills']}', shots='${r_weaponstats['shots']}', hits='${r_weaponstats['hits']}', damage='${r_weaponstats['damage']}', acc='${r_weaponstats['acc']}'") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 	}

 

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

diff --git a/html/pages/admin/editgames.php b/html/pages/admin/editgames.php
index d2981b8..36f19e3 100644
--- a/html/pages/admin/editgames.php
+++ b/html/pages/admin/editgames.php
@@ -5,13 +5,13 @@ if (isset($_REQUEST['submit'])) {
 	foreach($_REQUEST['name'] as $id => $bla) {

 		if ($id == 0) {

 			if (empty($_REQUEST['name'][$id])) continue;

-			mysql_query("	INSERT	INTO	uts_games

+			mysqli_query($GLOBALS["___mysqli_link"], "	INSERT	INTO	uts_games

 									SET	name = '". my_addslashes($_REQUEST['name'][$id]) ."',

-											gamename = '(user defined)';") or die(mysql_error());

+											gamename = '(user defined)';") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 		} else {

-			mysql_query("	UPDATE	uts_games

+			mysqli_query($GLOBALS["___mysqli_link"], "	UPDATE	uts_games

 									SET	name = '". my_addslashes($_REQUEST['name'][$id]) ."'

-									WHERE	id =  '$id';") or die(mysql_error());

+									WHERE	id =  '$id';") or die(mysqli_error($GLOBALS["___mysqli_link"]));

 		}

 	}

 }

@@ -31,9 +31,9 @@ echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">
 

 

 $sql_games = "SELECT id, gamename, name FROM uts_games ORDER BY gamename ASC;";

-$q_games = mysql_query($sql_games) or die(mysql_error());

+$q_games = mysqli_query($GLOBALS["___mysqli_link"], $sql_games) or die(mysqli_error($GLOBALS["___mysqli_link"]));

 $i = 0;

-while ($r_games = mysql_fetch_array($q_games)) {

+while ($r_games = mysqli_fetch_array($q_games)) {

 	$i++;

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

 	echo '<tr>';

diff --git a/html/pages/admin/editgamestype.php b/html/pages/admin/editgamestype.php
index 0b8ac30..2f7a238 100644
--- a/html/pages/admin/editgamestype.php
+++ b/html/pages/admin/editgamestype.php
@@ -2,31 +2,31 @@
 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());

+$q_server = mysqli_query($GLOBALS["___mysqli_link"], $sql_server) or die(mysqli_error($GLOBALS["___mysqli_link"]));

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

 $serverips = ar