Update to mysqli

10 files changed, 119 insertions, 117 deletions

diff --git a/html/includes/config.php b/html/includes/config.php
index 77d42fa..2e5a8e1 100755
--- a/html/includes/config.php
+++ b/html/includes/config.php
@@ -182,6 +182,7 @@ $ftp_passive[$i]  = true;      // Use passive transfer mode for this connection?
 $ftp_delete[$i]   = true;      // Delete logs after download?

 */

 

+

 // This section is for stats graphs as of version 4.3

 $renderer_folder = "renderings";

 $renderer_width = 350;

@@ -239,4 +240,5 @@ define("RENDERER_CHART_FRAGS_PLAYERNORMAL5", 97);
 define("RENDERER_CHART_ITEMS_TEAMPICKUPS", 100);

 define("RENDERER_CHART_ITEMS_PLAYERPICKUPS", 101);

 define("RENDERER_CHART_ITEMS_AMPRUNS", 102);

+

 ?>

diff --git a/html/includes/ftp_class_pure.php b/html/includes/ftp_class_pure.php
index e7806db..4ec345e 100644
--- a/html/includes/ftp_class_pure.php
+++ b/html/includes/ftp_class_pure.php
@@ -1,5 +1,5 @@
 <?php

-// 

+//

 // pemftp - Class by Alexey Dotsenko <alex at paneuromedia dot com>

 // http://www.phpclasses.org/browse/package/1743.html

 // License: Free for non-commercial use

@@ -189,4 +189,4 @@ class ftp  extends ftp_base {
 		}

 	}

 }

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

diff --git a/html/includes/functions.php b/html/includes/functions.php
index 93614f7..d060edd 100755
--- a/html/includes/functions.php
+++ b/html/includes/functions.php
@@ -1,7 +1,6 @@
 <?php

 // Connect to database

-mysql_connect($hostname, $uname, $upass);

-mysql_select_db($dbname);

+$GLOBALS["___mysqli_link"] = mysqli_connect($hostname,  $uname,  $upass, $dbname);

 

 // Error reporting

 // error_reporting(E_ALL & ~E_NOTICE);

@@ -115,18 +114,18 @@ function my_fclose($fp, $compression) {
 

 // Small query

 function small_query($query) {

-  $sql_small = "$query";

-  $q_small = mysql_query($sql_small) or die(mysql_error());

-  $r_small = mysql_fetch_array($q_small);

-  return $r_small;

+	$sql_small = "$query";

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

+	$r_small = mysqli_fetch_array($q_small);

+	return $r_small;

 }

 

 // Small query count

 function small_count($query) {

-  $sql_small = "$query";

-  $q_small = mysql_query($sql_small) or die(mysql_error());

-  $r_small = mysql_num_rows($q_small);

-  return $r_small;

+	$sql_small = "$query";

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

+	$r_small = mysqli_num_rows($q_small);

+	return $r_small;

 }

 

 // uid generator

diff --git a/html/includes/functions_admin.php b/html/includes/functions_admin.php
index b4a788b..9d285f1 100755
--- a/html/includes/functions_admin.php
+++ b/html/includes/functions_admin.php
@@ -156,8 +156,8 @@ function adminselect(&$options) {
 					}

 					

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

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

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

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

+					while ($r_game = mysqli_fetch_array($q_game)) {

 						if (isset($var['exclude']) and $r_game['id'] == $values[$var['exclude']]) continue;

 						$selected = (isset($values[$var['name']]) and $r_game['id'] == $values[$var['name']]) ? 'selected' : '';

 						echo '<option '.$selected.' value="'.$r_game['id'].'">'. htmlentities($r_game['name'] .' ('. $r_game['gamename'] .')') .'</option>';

@@ -179,8 +179,8 @@ function adminselect(&$options) {
 					if (isset($var['wheregid'])) {

 						$sql_server = "SELECT id, servername, serverip FROM uts_match WHERE gid = '". $values[$var['wheregid']] ."' GROUP BY servername, serverip ORDER BY servername ASC";

 					}

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

-					while ($r_server = mysql_fetch_array($q_server)) {

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

+					while ($r_server = mysqli_fetch_array($q_server)) {

 						if (isset($var['exclude']) and $r_server['id'] == $values[$var['exclude']]) continue;

 						$selected = (isset($values[$var['name']]) and $r_server['id'] == $values[$var['name']]) ? 'selected' : '';

 						echo '<option '.$selected.' value="'.$r_server['id'].'">'. htmlentities($r_server['servername'] .' ('. $r_server['serverip'] .')').'</option>';

@@ -216,8 +216,8 @@ function adminselect(&$options) {
 					if (isset($var['wheregid'])) {

 						$sql_player = "SELECT pi.id, pi.name FROM uts_player p, uts_pinfo pi WHERE p.pid = pi.id AND p.gid = '". $values[$var['wheregid']] ."' $where_extra GROUP BY p.id ORDER BY pi.name ASC";

 					}

-					$q_player = mysql_query($sql_player) or die(mysql_error());

-					while ($r_player = mysql_fetch_array($q_player)) {

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

+					while ($r_player = mysqli_fetch_array($q_player)) {

 						if (isset($var['exclude']) and $r_player['id'] == $values[$var['exclude']]) continue;

 						$selected = (isset($values[$var['name']]) and $r_player['id'] == $values[$var['name']]) ? 'selected' : '';

 						echo '<option '.$selected.' value="'.$r_player['id'].'">'. htmlentities($r_player['name']) .'</option>';

@@ -248,8 +248,8 @@ function adminselect(&$options) {
 					if (isset($var['whereplayer'])) {

 						$sql_match = "SELECT m.id AS id, m.time AS time, m.serverip AS serverip, m.mapfile AS mapfile FROM uts_match m, uts_player p WHERE pid = '". $values[$var['whereplayer']] ."' AND p.matchid = m.id ORDER BY time DESC";

 					}

-					$q_match = mysql_query($sql_match) or die(mysql_error());

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

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

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

 						if (isset($var['exclude']) and $r_match['id'] == $values[$var['exclude']]) continue;

 						$selected = (isset($values[$var['name']]) and $r_match['id'] == $values[$var['name']]) ? 'selected' : '';

 						echo '<option '.$selected.' value="'.$r_match['id'].'">'. htmlentities($r_match['id'].': '.mdate2($r_match['time']).' ('.un_ut($r_match['mapfile']).' on '.$r_match['serverip'].')').'</option>';

diff --git a/html/includes/renderer-ctf.php b/html/includes/renderer-ctf.php
index 9e0cef3..b7cefc1 100644
--- a/html/includes/renderer-ctf.php
+++ b/html/includes/renderer-ctf.php
@@ -13,10 +13,10 @@ function renderScoreGraph($uid) {
 	global $playernumberofteams;
 	global $playerteams;
 	
-	$uid = mysql_real_escape_string($uid);
+	$uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid);
 	
 	// Get all frags related events + start & end
-	$q_frags = mysql_query("SELECT * FROM `uts_temp_$uid` WHERE col0>=".mysql_real_escape_string($time_gamestart)." ORDER BY id ASC") or die(mysql_error());
+	$q_frags = mysqli_query($GLOBALS["___mysqli_link"], "SELECT * FROM `uts_temp_$uid` WHERE col0>=".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $time_gamestart)." ORDER BY id ASC") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	
 	// init caps/grabs array
 	$caps = array();
@@ -41,7 +41,7 @@ function renderScoreGraph($uid) {
 	}
 	
 	$counter = 1;
-	while($data = mysql_fetch_array($q_frags)) {
+	while($data = mysqli_fetch_array($q_frags)) {
 	
 		// Collect data from utstats own table
 		$r_id = $data[0];
@@ -125,16 +125,16 @@ function renderScoreGraph($uid) {
 	}
 	
 	// Save team score over team for teams
-	mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_CTF_TEAMSCORE.", 
-		'".mysql_real_escape_string(gzencode(serialize(array($grabs,$caps))))."', 
-		'".mysql_real_escape_string(gzencode(serialize($teamLabels)))."')") or die(mysql_error());
+	mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_CTF_TEAMSCORE.", 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize(array($grabs,$caps))))."', 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($teamLabels)))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 
 	$labelsBreakdown = array('caps','close','base','mid','enemy base');
 		
 	// Save team score over team for teams
-	mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_CTF_GRABBREAKDOWN.", 
-		'".mysql_real_escape_string(gzencode(serialize(array($flagcap,$flagclose,$flagbase,$flagmid,$flagnmybase))))."', 
-		'".mysql_real_escape_string(gzencode(serialize($labelsBreakdown)))."')") or die(mysql_error());
+	mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_CTF_GRABBREAKDOWN.", 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize(array($flagcap,$flagclose,$flagbase,$flagmid,$flagnmybase))))."', 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($labelsBreakdown)))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	
 }
 
@@ -163,16 +163,16 @@ function analyseCap($uid, $capTime, $capPlayer,$capTeam, $capId) {
 	$event[1]['flag_captured'] = array('id' => 0, 'time' => 0, 'player' => '');
 			
 	// Get grab time for both teams related to this cap. Query of the month award.
-	$q_grabs = mysql_query("SELECT f.id AS id, f.col0 AS gtime, f.col1 AS event, f.col2 AS player, f.col3 AS team 
+	$q_grabs = mysqli_query($GLOBALS["___mysqli_link"], "SELECT f.id AS id, f.col0 AS gtime, f.col1 AS event, f.col2 AS player, f.col3 AS team 
 	FROM (	
-		SELECT col3, col1, MAX( col0 ) AS xgtime FROM `uts_temp_$uid` WHERE (col1 = 'flag_taken' OR col1 = 'flag_returned' OR col1 = 'flag_captured') AND id<".mysql_real_escape_string($capId)." GROUP BY col3,col1 ORDER BY col3 DESC	 
+		SELECT col3, col1, MAX( col0 ) AS xgtime FROM `uts_temp_$uid` WHERE (col1 = 'flag_taken' OR col1 = 'flag_returned' OR col1 = 'flag_captured') AND id<".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $capId)." GROUP BY col3,col1 ORDER BY col3 DESC	 
 	) AS x INNER JOIN `uts_temp_$uid` AS f 
-	on f.col3 = x.col3 AND f.col1 = x.col1 AND f.col0 = x.xgtime") or die(mysql_error());
+	on f.col3 = x.col3 AND f.col1 = x.col1 AND f.col0 = x.xgtime") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	
 	// Only continue if you have at least one event (should be at least flag_taken for this cap)
-	if(mysql_num_rows($q_grabs) >0) {
+	if(mysqli_num_rows($q_grabs) >0) {
 	
-		while($r_grabs = mysql_fetch_array($q_grabs)) {		
+		while($r_grabs = mysqli_fetch_array($q_grabs)) {		
 			// Ugly code to fix bug where sometimes 20 or 14 is imported instead of 0 and 1 respectively
 			$fixedteam = ($r_grabs['team']==20)?0:$r_grabs['team'];
 			$fixedteam = ($fixedteam==14)?1:$fixedteam;
@@ -190,7 +190,7 @@ function analyseCap($uid, $capTime, $capPlayer,$capTeam, $capId) {
 		// Only register as cherry pick if previous run was at least 10 sec, otherwise it's not really a hcerry pick but just a subsequent grab
 		if($event[$capTeam]['flag_returned']['time']>0 && ($event[$capTeam]['flag_taken']['time']-$event[$capTeam]['flag_returned']['time'])<4) {
 				
-			$prevRunTime = small_query("SELECT MAX( col0 ) as gtime FROM `uts_temp_$uid` WHERE id<".mysql_real_escape_string($event[$capTeam]['flag_returned']['id'])." AND col1='flag_taken' AND col3='".(1-$capTeam)."'") or die(mysql_error());
+			$prevRunTime = small_query("SELECT MAX( col0 ) as gtime FROM `uts_temp_$uid` WHERE id<".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $event[$capTeam]['flag_returned']['id'])." AND col1='flag_taken' AND col3='".(1-$capTeam)."'") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 				
 			if(($event[$capTeam]['flag_returned']['time'] - $prevRunTime[0]) > 10)
 				$cherrypickDone = true;
@@ -207,7 +207,7 @@ function analyseCap($uid, $capTime, $capPlayer,$capTeam, $capId) {
 		if($event[$capTeam]['flag_taken']['player'] == $capPlayer) {
 		
 			// Second check is to see no pickups were done during this run
-			if(small_count("SELECT * FROM `uts_temp_$uid` WHERE col1 = 'flag_pickedup' AND col3 = '".(1-$capTeam)."' AND id<".mysql_real_escape_string($capId)." AND id>".mysql_real_escape_string($event[$capTeam]['flag_taken']['id'])) == 0) {
+			if(small_count("SELECT * FROM `uts_temp_$uid` WHERE col1 = 'flag_pickedup' AND col3 = '".(1-$capTeam)."' AND id<".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $capId)." AND id>".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $event[$capTeam]['flag_taken']['id'])) == 0) {
 			
 				$solocap = "<br>Solo cap";
 								
@@ -236,7 +236,7 @@ Prep temporary database for CTF parsing
 function prepCTFdata($safe_uid) {
 	
 	// Replace time-out return by normal return
-	mysql_query("UPDATE `uts_temp_$safe_uid` SET col1='flag_returned', col2=(@temp:=col2),col2='-1',col3=@temp WHERE col1='flag_returned_timeout'") or die(mysql_error());
+	mysqli_query($GLOBALS["___mysqli_link"], "UPDATE `uts_temp_$safe_uid` SET col1='flag_returned', col2=(@temp:=col2),col2='-1',col3=@temp WHERE col1='flag_returned_timeout'") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 
 }
 
diff --git a/html/includes/renderer-dm.php b/html/includes/renderer-dm.php
index 8e9f439..a7c2b23 100644
--- a/html/includes/renderer-dm.php
+++ b/html/includes/renderer-dm.php
@@ -21,25 +21,25 @@ function renderFragBarsTeams($datafragsteam,$derivfragsteam,$topTeams,$counter)
 		}
 				
 		// Save net frags in db for first 2 teams
-		mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_TEAMDERIV.", 
-		'".mysql_real_escape_string(gzencode(serialize(array($netfragsteam,$datafragsteam))))."', 
-		'".mysql_real_escape_string(gzencode(serialize($teamLabels)))."')") or die(mysql_error());
+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_TEAMDERIV.", 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize(array($netfragsteam,$datafragsteam))))."', 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($teamLabels)))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	
 	} else {
 		
 		// Save team score over team for teams
-		mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_TEAMSCORE.", 
-		'".mysql_real_escape_string(gzencode(serialize($datafragsteam)))."', 
-		'".mysql_real_escape_string(gzencode(serialize($teamLabels)))."')") or die(mysql_error());
+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_TEAMSCORE.", 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($datafragsteam)))."', 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($teamLabels)))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 
 	}
 	
 	// Generate normalized data (vs #2) & store it
 	$normalfragsteam = normalizeDMdata($datafragsteam,$topTeams,$counter);
 	
-	mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_TEAMNORMAL.", 
-	'".mysql_real_escape_string(gzencode(serialize($normalfragsteam)))."', 
-	'".mysql_real_escape_string(gzencode(serialize($teamLabels)))."')") or die(mysql_error());
+	mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_TEAMNORMAL.", 
+	'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($normalfragsteam)))."', 
+	'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($teamLabels)))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	
 }
 
@@ -71,16 +71,16 @@ function renderFragBars($datafrags, $derivfrags, $topFraggers,$counter) {
 				$netfrags[1][$i] = $netfrags[1][$i]>0 ? $netfrags[1][$i] : 0;
 			}
 			
-			mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERDERIV.", 
-			'".mysql_real_escape_string(gzencode(serialize(array($netfrags,$datafragschunks[0]))))."', 
-			'".mysql_real_escape_string(gzencode(serialize($topFraggersLabels[0])))."')") or die(mysql_error());	
+			mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERDERIV.", 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize(array($netfrags,$datafragschunks[0]))))."', 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($topFraggersLabels[0])))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));	
 		
 		} else {
 				
 			// Generate graph for player 1 to 4
-			mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERSCORE.", 
-			'".mysql_real_escape_string(gzencode(serialize($datafragschunks[0])))."', 
-			'".mysql_real_escape_string(gzencode(serialize($topFraggersLabels[0])))."')") or die(mysql_error());
+			mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERSCORE.", 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($datafragschunks[0])))."', 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($topFraggersLabels[0])))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 			
 		}
 		
@@ -88,18 +88,18 @@ function renderFragBars($datafrags, $derivfrags, $topFraggers,$counter) {
 		$normalfrags = normalizeDMdata($datafrags,$topFraggers,$counter);
 		$normalfragschunks = array_chunk(sortDMdata($normalfrags,$topFraggers),4);
 		
-		mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERNORMAL.", 
-		'".mysql_real_escape_string(gzencode(serialize($normalfragschunks[0])))."', '".mysql_real_escape_string(gzencode(serialize($topFraggersLabels[0])))."')") or die(mysql_error());
+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERNORMAL.", 
+		'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($normalfragschunks[0])))."', '".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($topFraggersLabels[0])))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	
 		// If at least 8 players, also great second graph for 5 to 8
 		if($countPlayers >= 8) {
-			mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERSCORE5.", 
-			'".mysql_real_escape_string(gzencode(serialize($datafragschunks[1])))."', 
-			'".mysql_real_escape_string(gzencode(serialize($topFraggersLabels[1])))."')") or die(mysql_error());
+			mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERSCORE5.", 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($datafragschunks[1])))."', 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($topFraggersLabels[1])))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 		
-			mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERNORMAL5.", 
-			'".mysql_real_escape_string(gzencode(serialize($normalfragschunks[1])))."', 
-			'".mysql_real_escape_string(gzencode(serialize($topFraggersLabels[1])))."')") or die(mysql_error());		
+			mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_FRAGS_PLAYERNORMAL5.", 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($normalfragschunks[1])))."', 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($topFraggersLabels[1])))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));		
 		}
 		
 		
@@ -164,14 +164,14 @@ function parseDMdata($uid) {
 	global $playernumberofteams;
 	global $playerteams;
 	
-	$uid = mysql_real_escape_string($uid);
+	$uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid);
 	
 	// Get all frags related events + start & end
-	$q_frags = mysql_query("SELECT * FROM `uts_temp_$uid` WHERE col0>=".mysql_real_escape_string($time_gamestart)." ORDER BY id ASC") or die(mysql_error());
+	$q_frags = mysqli_query($GLOBALS["___mysqli_link"], "SELECT * FROM `uts_temp_$uid` WHERE col0>=".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $time_gamestart)." ORDER BY id ASC") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	
 	// Get all unique player id's
-	$q_ids = mysql_query("SELECT DISTINCT col2 FROM `uts_temp_$uid` WHERE col1='kill'");
-	while($data = mysql_fetch_array($q_ids)) {
+	$q_ids = mysqli_query($GLOBALS["___mysqli_link"], "SELECT DISTINCT col2 FROM `uts_temp_$uid` WHERE col1='kill'");
+	while($data = mysqli_fetch_array($q_ids)) {
 		$ids[] = $data[0];
 	}
 		
@@ -183,7 +183,7 @@ function parseDMdata($uid) {
 	$firstrun = true;
 	$realTimeEnd = ($time_gameend-$time_gamestart)/$time_ratio_correction/60;
 	
-	while($data = mysql_fetch_array($q_frags)) {
+	while($data = mysqli_fetch_array($q_frags)) {
 	
 		// Collect data from utstats own table
 		$r_time = ($data[1]-$time_gamestart)/$time_ratio_correction/60;	// Transform UT time to real time
diff --git a/html/includes/renderer-dom.php b/html/includes/renderer-dom.php
index d481695..f6b8266 100644
--- a/html/includes/renderer-dom.php
+++ b/html/includes/renderer-dom.php
@@ -23,7 +23,7 @@ function createEmptyTempTable($table_name) {
 	 PRIMARY KEY (`id`) 
 	 ) ENGINE=MyISAM 
 	";
-	mysql_query($sqlCreateTable) or die(mysql_error());
+	mysqli_query($GLOBALS["___mysqli_link"], $sqlCreateTable) or die(mysqli_error($GLOBALS["___mysqli_link"]));
 }
 	
 /*
@@ -37,13 +37,13 @@ function generateTempTable($uid) {
 	global $time_gameend;
 	global $time_ratio_correction;
 
-	$uid = mysql_real_escape_string($uid);
+	$uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid);
 	$tempTableName = "uts_tempidom_".$uid;
 	
 	createEmptyTempTable($tempTableName);
 			
 	// iterate over cp's. also capture game-end event as a quick hack to also do final iteration over final cp
-	$q_logdom = mysql_query("SELECT * FROM uts_temp_$uid WHERE (col1='controlpoint_capture' OR col1='game_end') AND col0>".mysql_real_escape_string($time_gamestart)." ORDER BY col1, col2, id ASC")or die(mysql_error());
+	$q_logdom = mysqli_query($GLOBALS["___mysqli_link"], "SELECT * FROM uts_temp_$uid WHERE (col1='controlpoint_capture' OR col1='game_end') AND col0>".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $time_gamestart)." ORDER BY col1, col2, id ASC")or die(mysqli_error($GLOBALS["___mysqli_link"]));
 		
 	$prev_time = 0;		
 	
@@ -51,7 +51,7 @@ function generateTempTable($uid) {
 	$insertQuery = "INSERT INTO $tempTableName (cp, teamid, playerid, playername, start, end, time,scoret0,scoret1,realTimeEnd) VALUES";
 	
 	// basically loop over all capture events per CP. Each time calculate how long the previous owner had the point and translate this to dom points
-	while($r_logdom = mysql_fetch_array($q_logdom)) {
+	while($r_logdom = mysqli_fetch_array($q_logdom)) {
 		$points[0] = 0;
 		$points[1] = 0;
 		$ticks[0] = 0;
@@ -59,8 +59,8 @@ function generateTempTable($uid) {
 			
 		$start_time = $prev_time;
 		
-		$r_cp = mysql_real_escape_string($r_logdom['col2']);	
-		$r_time = mysql_real_escape_string($r_logdom['col0']);
+		$r_cp = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $r_logdom['col2']);	
+		$r_time = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $r_logdom['col0']);
 		
 		// skip first capture event - no dom points given at start of map since no-one has cp		
 		if($prev_time > 0) {
@@ -114,16 +114,16 @@ function generateTempTable($uid) {
 		$prev_time = $r_time;
 		$prev_cp = $r_cp;
 		
-		$r_event = mysql_real_escape_string($r_logdom['col1']);
-		$r_pid = mysql_real_escape_string($r_logdom['col3']);
-		$r_teamid = mysql_real_escape_string($playerteams[$r_pid]);
-		$r_pname = mysql_real_escape_string($playernames[$r_pid]);
+		$r_event = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $r_logdom['col1']);
+		$r_pid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $r_logdom['col3']);
+		$r_teamid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $playerteams[$r_pid]);
+		$r_pname = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $playernames[$r_pid]);
 		
 	} 
 	
 	// populate table
 	$insertQuery = rtrim($insertQuery,",");
-	mysql_query($insertQuery) or die(mysql_error());
+	mysqli_query($GLOBALS["___mysqli_link"], $insertQuery) or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	
 	return $tempTableName;
 	
@@ -143,11 +143,11 @@ function generateAmpTimes($uid) {
 	$amps = array();
 	$prev_time = array();
 	
-	$uid = mysql_real_escape_string($uid);
+	$uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid);
 	
 	// Get activate & deactivate times & players
-	$q_amps = mysql_query("SELECT col0,col1,col3 FROM uts_temp_$uid WHERE col2='Damage Amplifier' AND (col1='item_activate' OR col1='item_deactivate') ORDER BY id ASC");
-	while($r_amps = mysql_fetch_array($q_amps)) {
+	$q_amps = mysqli_query($GLOBALS["___mysqli_link"], "SELECT col0,col1,col3 FROM uts_temp_$uid WHERE col2='Damage Amplifier' AND (col1='item_activate' OR col1='item_deactivate') ORDER BY id ASC");
+	while($r_amps = mysqli_fetch_array($q_amps)) {
 		$time = ($r_amps[0]-$time_gamestart)/$time_ratio_correction/60;
 		$event = $r_amps[1];
 		$pid = $r_amps[2];
@@ -175,21 +175,21 @@ function renderAmpBars($uid,$tempTableName) {
 	global $matchid;
 	global $renderer_color;
 	
-	$uid = mysql_real_escape_string($uid);
+	$uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid);
 	
 	// Iterate over amp runs
 	for($i=0;$i<2;$i++) {
 		foreach ($ampTimes[$i] as $ampTaken) {
-			$ampStart = mysql_real_escape_string($ampTaken[0]);
-			$ampEnd = mysql_real_escape_string($ampTaken[1]);
+			$ampStart = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $ampTaken[0]);
+			$ampEnd = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $ampTaken[1]);
 			$pid = $ampTaken[2];
 			
 			// Only save amp runs longer than 20seconds
 			if($ampEnd > ($ampStart+.33)) {
 			
 				// Get scores during amprun
-				$q_scoresDuringAmp = mysql_query("SELECT SUM(scoret0),SUM(scoret1) FROM $tempTableName WHERE realTimeEnd > $ampStart AND realTimeEnd < $ampEnd");
-				$r_scoresDuringAmps = mysql_fetch_array($q_scoresDuringAmp);
+				$q_scoresDuringAmp = mysqli_query($GLOBALS["___mysqli_link"], "SELECT SUM(scoret0),SUM(scoret1) FROM $tempTableName WHERE realTimeEnd > $ampStart AND realTimeEnd < $ampEnd");
+				$r_scoresDuringAmps = mysqli_fetch_array($q_scoresDuringAmp);
 												
 				$netPoints = $r_scoresDuringAmps[$i] - $r_scoresDuringAmps[1-$i];
 				
@@ -230,10 +230,10 @@ function renderAmpBars($uid,$tempTableName) {
 		}
 				
 		// Save team score over team for teams
-		mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels,categories) VALUES (".$matchid.", ".RENDERER_CHART_ITEMS_AMPRUNS.", 
-			'".mysql_real_escape_string(gzencode(serialize(array($data))))."', 
-			'".mysql_real_escape_string(gzencode(serialize($labels)))."', 
-			'".mysql_real_escape_string(gzencode(serialize($categories)))."')") or die(mysql_error());
+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels,categories) VALUES (".$matchid.", ".RENDERER_CHART_ITEMS_AMPRUNS.", 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize(array($data))))."', 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($labels)))."', 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($categories)))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 				
 	}
 	
@@ -254,11 +254,11 @@ function renderDataTotal($uid,$tempTableName) {
 Render dom points over time & net rate of change per minute per cp
 */
 function renderDataCPs($uid,$tempTableName) {
-	$q_cps = mysql_query("SELECT DISTINCT(cp) FROM $tempTableName");
+	$q_cps = mysqli_query($GLOBALS["___mysqli_link"], "SELECT DISTINCT(cp) FROM $tempTableName");
 	
 	$i=0;
-	while($r_cps = mysql_fetch_array($q_cps)) {
-		$r_cp = mysql_real_escape_string($r_cps[0]);
+	while($r_cps = mysqli_fetch_array($q_cps)) {
+		$r_cp = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $r_cps[0]);
 		$query = "SELECT t.realTimeEnd,@t0sum := @t0sum + t.scoret0 AS cumulScoret0,@t1sum := @t1sum + t.scoret1 AS cumulScoret1 FROM $tempTableName t JOIN (SELECT @t0sum := 0) r JOIN (SELECT @t1sum := 0) s WHERE t.CP = '$r_cp' ORDER BY realTimeEnd ASC";
 		$appex = "cp".$i++;
 		renderData($uid,$tempTableName,$query,$appex,"Score CP ".$r_cps[0],$r_cps[0]);
@@ -289,10 +289,10 @@ function renderData($uid,$tempTableName,$query,$appex,$title,$cp) {
 		}
 				
 		// Deriv Dom points over time per team
-		mysql_query("INSERT INTO uts_chartdata (mid,chartid,title,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_DOM_SCOREDERIV.", 
-			'".mysql_real_escape_string($title)."', 
-			'".mysql_real_escape_string(gzencode(serialize(array($derivdompoints,$dompoints))))."', 
-			'".mysql_real_escape_string(gzencode(serialize($labels)))."')") or die(mysql_error());
+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,title,data,labels) VALUES (".$matchid.", ".RENDERER_CHART_DOM_SCOREDERIV.", 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $title)."', 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize(array($derivdompoints,$dompoints))))."', 
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($labels)))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 		
 	}
 }
@@ -301,7 +301,7 @@ function renderData($uid,$tempTableName,$query,$appex,$title,$cp) {
 Helper function to parse the data for the main renderData
 */
 function parseData($query) {
-	$q_result = mysql_query($query) or die(mysql_error()); 
+	$q_result = mysqli_query($GLOBALS["___mysqli_link"], $query) or die(mysqli_error($GLOBALS["___mysqli_link"])); 
 
 	$smallcounter = 1/3;
 	$counter = 1;
@@ -309,9 +309,9 @@ function parseData($query) {
 	$prevtime = 0;
 	
 	$run = 0;
-	$numRows = mysql_num_rows($q_result);
+	$numRows = mysqli_num_rows($q_result);
 	
-	while($data = mysql_fetch_array($q_result)) {	
+	while($data = mysqli_fetch_array($q_result)) {	
 		$r_time = round($data[0],2);
 		if($run==($numRows-1))
 			$r_time = $prevtime;
@@ -364,9 +364,9 @@ Render the names of players that played the cp
 function renderNamesCP($tempTableName,$cp) {
 	$labels = array();
 
-	$q_namesPerCP = mysql_query("SELECT playername, COUNT( playername ) AS cplayer, MAX( teamid ) AS tid, AVG( realTimeEnd ) AS ati FROM  $tempTableName WHERE cp = '".mysql_real_escape_string($cp)."' GROUP BY playername ORDER BY tid,ati") or die(mysql_error());
+	$q_namesPerCP = mysqli_query($GLOBALS["___mysqli_link"], "SELECT playername, COUNT( playername ) AS cplayer, MAX( teamid ) AS tid, AVG( realTimeEnd ) AS ati FROM  $tempTableName WHERE cp = '".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $cp)."' GROUP BY playername ORDER BY tid,ati") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 				
-	while($r_namesPerCP = mysql_fetch_array($q_namesPerCP)) {
+	while($r_namesPerCP = mysqli_fetch_array($q_namesPerCP)) {
 	
 		$playerName = substr($r_namesPerCP[0],0,18);
 		$timesTouched = $r_namesPerCP[1];
diff --git a/html/includes/renderer-general-import.php b/html/includes/renderer-general-import.php
index 6b642f1..ceba873 100644
--- a/html/includes/renderer-general-import.php
+++ b/html/includes/renderer-general-import.php
@@ -11,13 +11,13 @@ function getPlayerTeam() {
 	$playernames = array();
 	$playerteams = array();
 
-	$uid = mysql_real_escape_string($uid);
+	$uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid);
 
 	// Get List of Player IDs and Process What They Have Done
 	$sql_player = "SELECT p.playerid,p.team,i.name FROM uts_player p JOIN uts_pinfo i ON p.pid = i.id WHERE p.matchid=$matchid";
-	$q_player = mysql_query($sql_player) or die(mysql_error());
+	$q_player = mysqli_query($GLOBALS["___mysqli_link"], $sql_player) or die(mysqli_error($GLOBALS["___mysqli_link"]));
 
-	while ($r_player = mysql_fetch_array($q_player)) {
+	while ($r_player = mysqli_fetch_array($q_player)) {
 		$playerid = $r_player['playerid'];
 		$playername = $r_player['name'];
 		$playerteam = $r_player['team'];
@@ -38,10 +38,11 @@ Get time game starts, game ends, and ratio compared to real time
 */
 function getGameStartEndRatio($uid) {
 	// gather game start & end time
-	$q_logdom = mysql_query("SELECT col0 FROM uts_temp_$uid WHERE col1='game_start' OR col1='game_end' ORDER BY id ASC")or die(mysql_error());
+	$result = mysqli_query($GLOBALS["___mysqli_link"], "SELECT col0 FROM uts_temp_$uid WHERE col1='game_start' OR col1='game_end' ORDER BY id ASC")or die(mysqli_error($GLOBALS["___mysqli_link"]));
+
+	$time_gamestart = mysqli_fetch_row($result)[0];
+	$time_gameend = mysqli_fetch_row($result)[0];
 
-	$time_gamestart = mysql_result($q_logdom,0);
-	$time_gameend = mysql_result($q_logdom,1);
 	//$time_ratio_correction = ($time_gameend-$time_gamestart)/1200;
 	$time_ratio_correction = TIMERATIO; // based on hardcore mode
 
@@ -62,11 +63,11 @@ function renderDataPickups($uid,$team=true,$playerRedWins=true,$topFraggers) {
 	global $renderer_width;
 	global $renderer_heigth;
 
-	$uid = mysql_real_escape_string($uid);
+	$uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid);
 
-	$q_pickups = mysql_query("SELECT SUM(pu_belt), SUM(pu_keg), SUM(pu_pads), SUM(pu_armour), SUM(pu_amp) FROM uts_player as p WHERE matchid = ".mysql_real_escape_string($matchid)." GROUP BY team") or die(mysql_error());
+	$q_pickups = mysqli_query($GLOBALS["___mysqli_link"], "SELECT SUM(pu_belt), SUM(pu_keg), SUM(pu_pads), SUM(pu_armour), SUM(pu_amp) FROM uts_player as p WHERE matchid = ".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $matchid)." GROUP BY team") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 
-	while($r_pickups = mysql_fetch_row($q_pickups)) {
+	while($r_pickups = mysqli_fetch_row($q_pickups)) {
 		$preData[] = $r_pickups;
 	}
 
@@ -107,10 +108,10 @@ function renderDataPickups($uid,$team=true,$playerRedWins=true,$topFraggers) {
 		$charttype = $team?RENDERER_CHART_ITEMS_TEAMPICKUPS:RENDERER_CHART_ITEMS_PLAYERPICKUPS;
 
 		// Save team score over team for teams
-		mysql_query("INSERT INTO uts_chartdata (mid,chartid,data,labels,categories) VALUES (".$matchid.", ".$charttype.",
-			'".mysql_real_escape_string(gzencode(serialize($data)))."',
-			'".mysql_real_escape_string(gzencode(serialize($labels)))."',
-			'".mysql_real_escape_string(gzencode(serialize($itemsPickedUp)))."')") or die(mysql_error());
+		mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_chartdata (mid,chartid,data,labels,categories) VALUES (".$matchid.", ".$charttype.",
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($data)))."',
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($labels)))."',
+			'".mysqli_real_escape_string($GLOBALS["___mysqli_link"], gzencode(serialize($itemsPickedUp)))."')") or die(mysqli_error($GLOBALS["___mysqli_link"]));
 	}
 }
 
diff --git a/html/includes/teamstats.php b/html/includes/teamstats.php
index d0b1b58..20b7cd6 100755
--- a/html/includes/teamstats.php
+++ b/html/includes/teamstats.php
@@ -27,11 +27,11 @@ function teamstats($mid, $title, $extra = NULL, $extratitle = NULL, $order = 'ga
   $sql_players = "SELECT pi.name, pi.banned, p.pid, p.team, p.country, p.gametime, p.gamescore, p.frags, p.deaths, p.suicides, p.teamkills, p.eff, p.accuracy, p.ttl, p.rank".(($extra) ? ', p.'.$extra.' AS '.$extra  : '')."

 	  FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $mid

 	  ORDER BY".(($teams) ? ' team ASC,' : '')." $order";

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

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

   $header = true;

   teamstats_init_totals($totals, $num);

 

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

+  while ($r_players = zero_out(mysqli_fetch_array($q_players))) {

     $r_players['dom_cp'] = $r_players['gamescore'] - $r_players['frags'];

     $r_players['team'] = intval($r_players['team']);

 

diff --git a/html/includes/weaponstats.php b/html/includes/weaponstats.php
index ff97685..ddfd162 100644
--- a/html/includes/weaponstats.php
+++ b/html/includes/weaponstats.php
@@ -55,8 +55,8 @@ uts_weaponstats AS w
                     w.weapon";

   }

 

-  $q_weapons = mysql_query($sql_weapons) or die(mysql_error());

-  while ($r_weapons = zero_out(mysql_fetch_array($q_weapons))) {

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

+  while ($r_weapons = zero_out(mysqli_fetch_array($q_weapons))) {

     $weaponid = intval($r_weapons['weaponid']);

     $playerid = intval($r_weapons['playerid']);