diff options
71 files changed, 683 insertions, 688 deletions
diff --git a/html/import.php b/html/import.php index c2bcfe6..af94cc2 100755 --- a/html/import.php +++ b/html/import.php @@ -278,16 +278,16 @@ while (false !== ($filename = readdir($logdir))) { KEY `full` (`col0` (20),`col1` (20),`col2` (20),`col3` (20),`col4` (20))
) ENGINE=". ($import_use_heap_tables ? 'HEAP' : 'MyISAM') .";";
- $result = mysql_query($sql);
+ $result = mysqli_query($GLOBALS["___mysqli_link"], $sql);
if ($result) break;
- if (mysql_errno() == 1044 and $import_use_temporary_tables) {
- echo "<br><strong>WARNING: Unable to create temporary table (". mysql_error() .")<br>";
+ if (mysqli_errno($GLOBALS["___mysqli_link"]) == 1044 and $import_use_temporary_tables) {
+ echo "<br><strong>WARNING: Unable to create temporary table (". mysqli_error($GLOBALS["___mysqli_link"]) .")<br>";
echo "I'll retry without using MySQL's temporary table feature (see \$import_use_temporary_tables in config.php for details).<br><br></strong>";
$import_use_temporary_tables = false;
continue;
}
- die("<br><strong>Unable to create the temporary table:<br>". mysql_error() ."<br><br></strong>");
+ die("<br><strong>Unable to create the temporary table:<br>". mysqli_error($GLOBALS["___mysqli_link"]) ."<br><br></strong>");
}
$id = 0;
@@ -327,8 +327,8 @@ while (false !== ($filename = readdir($logdir))) { $num = count($data);
$row++;
- for ($c=0; $c < 1; $c++) {
+ for ($c=0; $c < 1; $c++) {
$col0 = addslashes($data[0]);
$col1 = addslashes($data[1]);
$col2 = addslashes($data[2]);
@@ -342,7 +342,7 @@ while (false !== ($filename = readdir($logdir))) { $col4 = trim($col4, " \n\r");
$id++;
- mysql_query("INSERT INTO uts_temp_$uid VALUES ($id, '$col0', '$col1', '$col2', '$col3', '$col4');") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_temp_$uid VALUES ($id, '$col0', '$col1', '$col2', '$col3', '$col4');") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
}
fclose($handle);
@@ -432,8 +432,8 @@ while (false !== ($filename = readdir($logdir))) { } else {
$sql_mutators = "SELECT col3 FROM uts_temp_$uid WHERE col1 = 'game' AND col2 = 'GoodMutator'";
- $q_mutators = mysql_query($sql_mutators);
- while ($r_mutators = mysql_fetch_array($q_mutators)) {
+ $q_mutators = mysqli_query($GLOBALS["___mysqli_link"], $sql_mutators);
+ while ($r_mutators = mysqli_fetch_array($q_mutators)) {
$qm_mutators .= "".$r_mutators[col3].", ";
}
@@ -486,8 +486,8 @@ while (false !== ($filename = readdir($logdir))) { if ($r_gid) {
$gid = $r_gid['id'];
} else {
- mysql_query("INSERT INTO uts_games SET gamename = '$gamename', name = '$gamename'") or die(mysql_error());
- $gid = mysql_insert_id();
+ mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_games SET gamename = '$gamename', name = '$gamename'") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ $gid = ((is_null($___mysqli_res = mysqli_insert_id($GLOBALS["___mysqli_link"]))) ? false : $___mysqli_res);
}
// Check wheter we want to override the gametype for this match
@@ -498,8 +498,8 @@ while (false !== ($filename = readdir($logdir))) { if (!isset($overriderules)) {
$overriderules = array();
$sql_overriderules = "SELECT id, serverip, gamename, mutator, gid FROM uts_gamestype ORDER BY id ASC;";
- $q_overriderules = mysql_query($sql_overriderules);
- while ($r_overriderules = mysql_fetch_array($q_overriderules)) {
+ $q_overriderules = mysqli_query($GLOBALS["___mysqli_link"], $sql_overriderules);
+ while ($r_overriderules = mysqli_fetch_array($q_overriderules)) {
$overriderules[$r_overriderules['id']]['serverip'] = $r_overriderules['serverip'];
$overriderules[$r_overriderules['id']]['gamename'] = $r_overriderules['gamename'];
$overriderules[$r_overriderules['id']]['mutator'] = $r_overriderules['mutator'];
@@ -544,14 +544,14 @@ while (false !== ($filename = readdir($logdir))) { // Get Teams Info
$sql_tinfo = "SELECT col4 FROM uts_temp_$uid WHERE col1 = 'player' AND col2 = 'TeamName' GROUP BY col4 ORDER BY col4 ASC";
- $q_tinfo = mysql_query($sql_tinfo) or die(mysql_error());
+ $q_tinfo = mysqli_query($GLOBALS["___mysqli_link"], $sql_tinfo) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$t0info = 0;
$t1info = 0;
$t2info = 0;
$t3info = 0;
- while ($r_tinfo = mysql_fetch_array($q_tinfo)) {
+ while ($r_tinfo = mysqli_fetch_array($q_tinfo)) {
if ($r_tinfo[col4] == "Red") { $t0info = 1; }
if ($r_tinfo[col4] == "Blue") { $t1info = 1; }
if ($r_tinfo[col4] == "Green") { $t2info = 1; }
@@ -560,14 +560,14 @@ while (false !== ($filename = readdir($logdir))) { // Get Teamscores
$sql_tscore = "SELECT col2 AS team, col3 AS score FROM uts_temp_$uid WHERE col1 = 'teamscore'";
- $q_tscore = mysql_query($sql_tscore) or die(mysql_error());
+ $q_tscore = mysqli_query($GLOBALS["___mysqli_link"], $sql_tscore) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$t0score = 0;
$t1score = 0;
$t2score = 0;
$t3score = 0;
- while ($r_tscore = mysql_fetch_array($q_tscore)) {
+ while ($r_tscore = mysqli_fetch_array($q_tscore)) {
if ($r_tscore['team'] == "0") $t0score = $r_tscore['score'];
if ($r_tscore['team'] == "1") $t1score = $r_tscore['score'];
if ($r_tscore['team'] == "2") $t2score = $r_tscore['score'];
@@ -581,8 +581,8 @@ VALUES ('$gametime', '$servername', '$serverip:$serverport', '$gamename', '$gid' '$teamgame', '$mapname', '$mapfile', '$serverinfo', '$gameinfo', '$s_frags', '$s_kills', '$s_suicides', '$s_teamkills', '$s_deaths',
$t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);";
- $q_serverinfo = mysql_query($sql_serverinfo) or die(mysql_error());
- $matchid = mysql_insert_id(); // Get our Match ID
+ $q_serverinfo = mysqli_query($GLOBALS["___mysqli_link"], $sql_serverinfo) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ $matchid = ((is_null($___mysqli_res = mysqli_insert_id($GLOBALS["___mysqli_link"]))) ? false : $___mysqli_res); // Get our Match ID
echo "Yes (ID: $matchid)\n";
if ($html) echo '</td></tr>';
@@ -598,9 +598,9 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; // Get List of Player IDs and Process What They Have Done
$sql_player = "SELECT DISTINCT col4 FROM uts_temp_$uid WHERE col1 = 'player' AND col2 = 'rename' AND col4 <> ''";
- $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[col4];
// Get players last name used
@@ -614,7 +614,7 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; if ($playertype == 'True' and $import_ignore_bots) {
$ignored_players[] = $playername;
// We do not want to know who killed and who was killed by this bot...
- mysql_query("DELETE FROM uts_temp_$uid WHERE (col1 = 'kill' OR col1 = 'teamkill') AND (col2 = '$playerid' OR col4 = '$playerid');") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_temp_$uid WHERE (col1 = 'kill' OR col1 = 'teamkill') AND (col2 = '$playerid' OR col4 = '$playerid');") or die(mysqli_error($GLOBALS["___mysqli_link"]));
if ($html) echo "<span style='text-decoration: line-through;'>";
echo "Bot:$playername ";
if ($html) echo "</span>";
@@ -640,12 +640,12 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; if ($playerbanned) {
// Banned players don't have a rank.
- mysql_query("DELETE FROM uts_rank WHERE pid = '$pid'");
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank WHERE pid = '$pid'");
if ($import_ban_type == 2) {
// We do not want to know who killed and who was killed by this banned player
$ignored_players[] = $playername;
- mysql_query("DELETE FROM uts_temp_$uid WHERE (col1 = 'kill' OR col1 = 'teamkill') AND (col2 = '$playerid' OR col4 = '$playerid');") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_temp_$uid WHERE (col1 = 'kill' OR col1 = 'teamkill') AND (col2 = '$playerid' OR col4 = '$playerid');") or die(mysqli_error($GLOBALS["___mysqli_link"]));
if ($html) echo "<span style='text-decoration: line-through;'>";
echo "Banned:$playername ";
if ($html) echo "</span>";
@@ -688,8 +688,8 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; </tr>';
$sql_radjust = "SELECT pid, gid, rank FROM uts_player WHERE matchid = $matchid";
- $q_radjust = mysql_query($sql_radjust) or die(mysql_error());
- while ($r_radjust = mysql_fetch_array($q_radjust)) {
+ $q_radjust = mysqli_query($GLOBALS["___mysqli_link"], $sql_radjust) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_radjust = mysqli_fetch_array($q_radjust)) {
$pid = $r_radjust[pid];
$gid = $r_radjust[gid];
$rank = $r_radjust[rank];
@@ -702,16 +702,16 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; $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());
+ 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"]));
}
- mysql_query("DELETE FROM uts_rank WHERE matches = 0") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank WHERE matches = 0") or die(mysqli_error($GLOBALS["___mysqli_link"]));
$rem_mrecord = "DELETE FROM uts_match WHERE id = $matchid";
- mysql_query($rem_mrecord);
+ mysqli_query($GLOBALS["___mysqli_link"], $rem_mrecord);
$rem_precord = "DELETE FROM uts_player WHERE matchid = $matchid";
- mysql_query($rem_precord);
+ mysqli_query($GLOBALS["___mysqli_link"], $rem_precord);
$rem_precord = "DELETE FROM uts_events WHERE matchid = $matchid";
- mysql_query($rem_precord);
+ mysqli_query($GLOBALS["___mysqli_link"], $rem_precord);
} else {
// Make our weapons statistics
echo "\n";
@@ -738,9 +738,9 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; include("import/import_pcleanup.php");
echo "Done\n";
- if ($html) echo'</td></tr>';
+ if ($html) echo "</td></tr>";
- include('import/import_renderer-preconfig.php');
+ include("import/import_renderer-preconfig.php");
$updategameinfo = false;
if (count($ignored_players) > 0) {
@@ -755,22 +755,22 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; }
}
if ($updategameinfo) {
- mysql_query("UPDATE uts_match SET gameinfo = '$gameinfo' WHERE id = '$matchid'");
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_match SET gameinfo = '$gameinfo' WHERE id = '$matchid'");
$updategameinfo = false;
}
if ($gamename == "Domination" || $gamename == "Domination (insta)" ) {
if ($html) echo '<tr><td class="smheading" align="left" width="350">';
echo "Generating dom graphs: ";
if ($html) echo '</td><td class="grey" align="left" width="200">';
- include("import/import_renderer-dom.php");
+ include("import/import_renderer-dom.php");
echo "Done\n";
if ($html) echo'</td></tr>';
- }
+ }
else if ($gamename == "Tournament DeathMatch" || $gamename == "Tournament DeathMatch (insta)" || $gamename == "Tournament Team Game" || $gamename == "Tournament Team Game (insta)" ) {
if ($html) echo '<tr><td class="smheading" align="left" width="350">';
echo "Generating dm graphs: ";
if ($html) echo '</td><td class="grey" align="left" width="200">';
- include("import/import_renderer-dm.php");
+ include("import/import_renderer-dm.php");
echo "Done\n";
if ($html) echo'</td></tr>';
}
@@ -778,7 +778,7 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; if ($html) echo '<tr><td class="smheading" align="left" width="350">';
echo "Generating ctf graphs: ";
if ($html) echo '</td><td class="grey" align="left" width="200">';
- include("import/import_renderer-ctf.php");
+ include("import/import_renderer-ctf.php");
echo "Done\n";
if ($html) echo'</td></tr>';
}
@@ -787,7 +787,7 @@ $t0info, $t1info, $t2info, $t3info, $t0score, $t1score, $t2score, $t3score);"; // Delete Temp MySQL Table
$droptable = "DROP TABLE uts_temp_$uid";
- mysql_query($droptable) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $droptable) or die(mysqli_error($GLOBALS["___mysqli_link"]));
if ($html) echo'<tr><td class="smheading" align="left" width="350">';
echo "Deleting Temp MySQL Table: ";
@@ -862,7 +862,7 @@ if ($files != 0) { if (rand(0, 5) == 0) {
if ($html) echo '<p class="pages">';
echo "Optimizing tables... ";
- mysql_query("OPTIMIZE TABLE uts_match, uts_player, uts_rank, uts_killsmatrix, uts_weaponstats, uts_pinfo;") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "OPTIMIZE TABLE uts_match, uts_player, uts_rank, uts_killsmatrix, uts_weaponstats, uts_pinfo;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo "Done\n";
if ($html) echo '</p>';
}
@@ -871,7 +871,7 @@ if (rand(0, 5) == 0) { if (rand(0, 10) == 0) {
if ($html) echo '<p class="pages">';
echo "Analyzing tables... ";
- mysql_query("ANALYZE TABLE uts_match, uts_player, uts_rank, uts_killsmatrix, uts_weaponstats, uts_pinfo;") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "ANALYZE TABLE uts_match, uts_player, uts_rank, uts_killsmatrix, uts_weaponstats, uts_pinfo;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo "Done\n";
if ($html) echo '</p>';
}
diff --git a/html/import/import_ass.php b/html/import/import_ass.php index 9539bc5..22819a1 100755 --- a/html/import/import_ass.php +++ b/html/import/import_ass.php @@ -3,32 +3,32 @@ $r_assobj = small_query("SELECT count(id) AS assobjcount FROM uts_temp_$uid WHERE col1 = 'assault_obj' AND col2 = $playerid");
$assobjcount = $r_assobj[assobjcount];
$upd_assobj = "UPDATE uts_player SET ass_obj = $assobjcount WHERE id = $playerecordid";
- mysql_query($upd_assobj) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $upd_assobj) or die(mysqli_error($GLOBALS["___mysqli_link"]));
// Get assault game code (unique code give for the 2 games played)
$r_asscode = small_query("SELECT col2 FROM uts_temp_$uid WHERE col1 = 'assault_gamecode' LIMIT 0,1");
$asscode = $r_asscode[col2];
$updateasscode = "UPDATE uts_match SET assaultid = '$asscode' WHERE id = $matchid";
- mysql_query($updateasscode) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $updateasscode) or die(mysqli_error($GLOBALS["___mysqli_link"]));
// Get Which Teams Attacking
$r_assteam = small_query("SELECT col2 FROM uts_temp_$uid WHERE col1 = 'assault_attacker' LIMIT 0,1");
$assteam = $r_assteam[col2];
$updateassteam = "UPDATE uts_match SET ass_att = $assteam WHERE id = $matchid;";
- mysql_query($updateassteam) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $updateassteam) or die(mysqli_error($GLOBALS["___mysqli_link"]));
// Did they do it?
$sql_asswin = "SELECT col0 FROM uts_temp_$uid WHERE col1 = 'game_end' AND col2 = 'Assault succeeded!' LIMIT 0,1";
- $q_asswin = mysql_query($sql_asswin) or die(mysql_error());
+ $q_asswin = mysqli_query($GLOBALS["___mysqli_link"], $sql_asswin) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$asswin = 0;
- while ($r_asswin = mysql_fetch_array($q_asswin)) {
+ while ($r_asswin = mysqli_fetch_array($q_asswin)) {
IF ($r_asswin[col0] != NULL ) { $asswin = 1; }
}
$updateasswin = "UPDATE uts_match SET ass_win = $asswin WHERE id = $matchid;";
- mysql_query($updateasswin) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $updateasswin) or die(mysqli_error($GLOBALS["___mysqli_link"]));
?>
diff --git a/html/import/import_bt.php b/html/import/import_bt.php index fe6a480..be1ea5c 100755 --- a/html/import/import_bt.php +++ b/html/import/import_bt.php @@ -1,14 +1,14 @@ <?php
// get the caps, captimes and store them in the events database
$sql_capbt = "SELECT col0, col1, col2, col3, col4 FROM uts_temp_$uid WHERE (col1 = 'cap' OR col1 = 'btcap') AND col2 = $playerid";
- $q_capbt = mysql_query($sql_capbt);
+ $q_capbt = mysqli_query($GLOBALS["___mysqli_link"], $sql_capbt);
$cap_speed = 0;
$cap_time = 0;
$cap_gametime = 0;
$flag_capture = 0;
- while ($r_capbt = mysql_fetch_array($q_capbt)) {
+ while ($r_capbt = mysqli_fetch_array($q_capbt)) {
if ($cap_speed == 0 || $r_capbt['col3'] > $cap_speed) {
$cap_speed = $r_capbt['col3'];
$col0 = $r_capbt['col0']; // time
@@ -34,13 +34,13 @@ $sql_eventsbt = "INSERT INTO uts_events
(matchid, playerid, col0, col1, col2, col3, col4) VALUES
($matchid, $playerid, '$col0', '$col1', '$col2', '$col3', '$col4')";
- mysql_query($sql_eventsbt) or die (mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $sql_eventsbt) or die (mysqli_error($GLOBALS["___mysqli_link"]));
}
if ($flag_capture > 0) {
$sql_playerflags = " UPDATE uts_player
SET flag_capture = $flag_capture
WHERE id = $playerecordid";
- mysql_query($sql_playerflags) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $sql_playerflags) or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
?>
diff --git a/html/import/import_ctf.php b/html/import/import_ctf.php index 206cbb0..73c1bb2 100755 --- a/html/import/import_ctf.php +++ b/html/import/import_ctf.php @@ -1,7 +1,7 @@ <?php
// Get Player Flag Events Count
$sql_playerctf = "SELECT col1, COUNT(col1) AS flag_count FROM uts_temp_$uid WHERE (col1 LIKE 'flag_%' OR col1 = 'cover' OR col1 = 'seal') AND col2 = $playerid GROUP BY col1";
- $q_playerctf = mysql_query($sql_playerctf);
+ $q_playerctf = mysqli_query($GLOBALS["___mysqli_link"], $sql_playerctf);
$flag_taken = 0;
$flag_dropped = 0;
@@ -13,7 +13,7 @@ $flag_kill = 0;
$flag_pickedup = 0;
- while ($r_playerctf = mysql_fetch_array($q_playerctf)) {
+ while ($r_playerctf = mysqli_fetch_array($q_playerctf)) {
// Cycle through events and see what the player got
@@ -39,5 +39,5 @@ flag_kill = $flag_kill,
flag_pickedup = $flag_pickedup
WHERE id = $playerecordid";
- mysql_query($sql_playerflags) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $sql_playerflags) or die(mysqli_error($GLOBALS["___mysqli_link"]));
?>
diff --git a/html/import/import_dom.php b/html/import/import_dom.php index 91106ac..fc00352 100755 --- a/html/import/import_dom.php +++ b/html/import/import_dom.php @@ -1,19 +1,19 @@ <?php
// Get dom player scores
$sql_domplayer = "SELECT col3 FROM uts_temp_$uid WHERE col1 = 'dom_playerscore_update' AND col2 = $playerid ORDER BY id DESC LIMIT 0,1";
- $q_domplayer = mysql_query($sql_domplayer) or die(mysql_error());
- $r_domplayer = mysql_fetch_array($q_domplayer);
+ $q_domplayer = mysqli_query($GLOBALS["___mysqli_link"], $sql_domplayer) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ $r_domplayer = mysqli_fetch_array($q_domplayer);
$domplayer = $r_domplayer[col3];
if (empty($domplayer)) {
$domplayer = 0;
}
$updatedomplayer = "UPDATE uts_player SET ass_obj = $domplayer WHERE id = $playerecordid";
- mysql_query($updatedomplayer) or die("Error idom1:" . mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $updatedomplayer) or die("Error idom1:" . mysqli_error($GLOBALS["___mysqli_link"]));
// Who did the control points
$r_domcp = small_query("SELECT count(id) AS domcpcount FROM uts_temp_$uid WHERE col1 = 'controlpoint_capture' AND col3 = $playerid");
$domcpcount = $r_domcp[domcpcount];
$upd_domcp = "UPDATE uts_player SET dom_cp = $domcpcount WHERE id = $playerecordid";
- mysql_query($upd_domcp) or die("Error idom2:" . mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $upd_domcp) or die("Error idom2:" . mysqli_error($GLOBALS["___mysqli_link"]));
?>
\ No newline at end of file diff --git a/html/import/import_jailbreak.php b/html/import/import_jailbreak.php index 6d6e0da..dded76f 100755 --- a/html/import/import_jailbreak.php +++ b/html/import/import_jailbreak.php @@ -12,11 +12,11 @@ $r_efficiency = get_dp(($r_kills / ($r_kills + $r_deaths + $r_suicides + $r_teamkills)) * 100);
- mysql_query(" UPDATE uts_player
+ mysqli_query($GLOBALS["___mysqli_link"], " UPDATE uts_player
SET ass_obj = '$r_releases',
suicides = '$r_suicides',
frags = '$r_frags',
eff = '$r_efficiency'
- WHERE id = $playerecordid;") or die(mysql_error());
+ WHERE id = $playerecordid;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
?>
\ No newline at end of file diff --git a/html/import/import_killsmatrix.php b/html/import/import_killsmatrix.php index 433a659..cb17375 100755 --- a/html/import/import_killsmatrix.php +++ b/html/import/import_killsmatrix.php @@ -7,8 +7,8 @@ OR col1 = 'teamkill'
GROUP BY col2, col4";
- $q_killmatrix = mysql_query($sql_killmatrix) or die(mysql_error());
- while ($r_killmatrix = mysql_fetch_array($q_killmatrix)) {
+ $q_killmatrix = mysqli_query($GLOBALS["___mysqli_link"], $sql_killmatrix) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_killmatrix = mysqli_fetch_array($q_killmatrix)) {
$sql = " INSERT
INTO uts_killsmatrix
@@ -16,7 +16,7 @@ killer = '". $r_killmatrix['killer'] ."',
victim = '". $r_killmatrix['killed'] ."',
kills = '". $r_killmatrix['kills'] ."';";
- mysql_query($sql) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $sql) or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
?>
diff --git a/html/import/import_lms.php b/html/import/import_lms.php index eb3ebd7..df752f1 100755 --- a/html/import/import_lms.php +++ b/html/import/import_lms.php @@ -13,19 +13,19 @@ $sql_eventslms = "INSERT INTO uts_events
(matchid, playerid, col0, col1, col2, col3, col4) VALUES
($matchid, $playerid, '$col0', '$col1', '$col2', '$col3', '$col4')";
- mysql_query($sql_eventslms) or die (mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $sql_eventslms) or die (mysqli_error($GLOBALS["___mysqli_link"]));
// Fix ttl
$ttl = ($outtime[col0] - $gamestart) / ($qc_deaths[col4] + $q_suicides[col4]);
- mysql_query("UPDATE uts_player SET ttl = $ttl WHERE id = $playerecordid") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_player SET ttl = $ttl WHERE id = $playerecordid") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
else {
$disconnect = small_query("SELECT col0 FROM uts_temp_$uid WHERE col1 = 'player' AND col2 = 'Disconnect' AND col3 = $playerid");
if ((!empty($disconnect[col0])) and (intval($disconnect[col0]) < intval($gameend))) {
// echo " get out time ";
$outtime = $player_left - $gamestart;
- $q_out = mysql_query($sql_out);
+ $q_out = mysqli_query($GLOBALS["___mysqli_link"], $sql_out);
$col0 = $disconnect[col0];
$col1 = 'out';
$col2 = intval($disconnect[col0] - $gamestart); //time
@@ -35,12 +35,12 @@ $sql_eventslms = "INSERT INTO uts_events
(matchid, playerid, col0, col1, col2, col3, col4) VALUES
($matchid, $playerid, '$col0', '$col1', '$col2', '$col3', '$col4')";
- mysql_query($sql_eventslms) or die (mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $sql_eventslms) or die (mysqli_error($GLOBALS["___mysqli_link"]));
// Update ttl and set score to 0
$ttl = ($disconnect[col0] - $gamestart) / ($qc_deaths[col4] + $q_suicides[col4]);
- mysql_query("UPDATE uts_player SET ttl = $ttl, gamescore = 0 WHERE id = $playerecordid") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_player SET ttl = $ttl, gamescore = 0 WHERE id = $playerecordid") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
}
?>
diff --git a/html/import/import_pcleanup.php b/html/import/import_pcleanup.php index 3e1be8a..fa8dbfb 100755 --- a/html/import/import_pcleanup.php +++ b/html/import/import_pcleanup.php @@ -2,27 +2,27 @@ $sql_tgame = small_query("SELECT teamgame FROM uts_match WHERE id = $matchid");
IF($sql_tgame == "True") {
$rem_srecord = "DELETE FROM uts_player WHERE matchid = $matchid AND team > 3";
- mysql_query($rem_srecord);
+ mysqli_query($GLOBALS["___mysqli_link"], $rem_srecord);
}
$cleaned = false;
// Get list of players
$sql_pname = "SELECT pid, name FROM uts_player, uts_pinfo AS pi WHERE matchid = $matchid AND pid = pi.id";
-$q_pname = mysql_query($sql_pname);
-while ($r_pname = mysql_fetch_array($q_pname)) {
+$q_pname = mysqli_query($GLOBALS["___mysqli_link"], $sql_pname);
+while ($r_pname = mysqli_fetch_array($q_pname)) {
$playername = addslashes($r_pname[name]);
$pid = $r_pname['pid'];
// Check if player has more than 1 record
- $q_ids = mysql_query("SELECT playerid FROM uts_player WHERE pid = '$pid' AND matchid = $matchid");
+ $q_ids = mysqli_query($GLOBALS["___mysqli_link"], "SELECT playerid FROM uts_player WHERE pid = '$pid' AND matchid = $matchid");
- IF (mysql_num_rows($q_ids) > 1) {
- $numrecords = mysql_num_rows($q_ids);
+ IF (mysqli_num_rows($q_ids) > 1) {
+ $numrecords = mysqli_num_rows($q_ids);
echo $r_pname[name] .' ';
// get all the ids this player had
$playerids = array();
- while ($r_ids = mysql_fetch_array($q_ids)) {
+ while ($r_ids = mysqli_fetch_array($q_ids)) {
$playerids[] = $r_ids['playerid'];
}
@@ -31,7 +31,7 @@ while ($r_pname = mysql_fetch_array($q_pname)) { // Fix the events table
foreach ($playerids as $i => $oldplayerid) {
- mysql_query("UPDATE uts_events SET playerid = $newplayerid WHERE playerid = $oldplayerid AND matchid = $matchid");
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_events SET playerid = $newplayerid WHERE playerid = $oldplayerid AND matchid = $matchid");
}
// Fix matchcount in ranking table
@@ -46,9 +46,9 @@ while ($r_pname = mysql_fetch_array($q_pname)) { AND killer IN (". implode(",", $playerids) .")
GROUP BY victim;";
- $q_kmupdate = mysql_query($sql_kmupdate);
- while ($r_kmupdate = mysql_fetch_array($q_kmupdate)) {
- mysql_query(" INSERT
+ $q_kmupdate = mysqli_query($GLOBALS["___mysqli_link"], $sql_kmupdate);
+ while ($r_kmupdate = mysqli_fetch_array($q_kmupdate)) {
+ mysqli_query($GLOBALS["___mysqli_link"], " INSERT
INTO uts_killsmatrix
SET matchid = $matchid,
killer = $newplayerid,
@@ -63,9 +63,9 @@ while ($r_pname = mysql_fetch_array($q_pname)) { AND victim IN (". implode(",", $playerids) .")
GROUP BY killer;";
- $q_kmupdate = mysql_query($sql_kmupdate);
- while ($r_kmupdate = mysql_fetch_array($q_kmupdate)) {
- mysql_query(" INSERT
+ $q_kmupdate = mysqli_query($GLOBALS["___mysqli_link"], $sql_kmupdate);
+ while ($r_kmupdate = mysqli_fetch_array($q_kmupdate)) {
+ mysqli_query($GLOBALS["___mysqli_link"], " INSERT
INTO uts_killsmatrix
SET matchid = $matchid,
killer = ${r_kmupdate['killer']},
@@ -73,7 +73,7 @@ while ($r_pname = mysql_fetch_array($q_pname)) { kills = ${r_kmupdate['kills']};");
}
- mysql_query(" DELETE
+ mysqli_query($GLOBALS["___mysqli_link"], " DELETE
FROM uts_killsmatrix
WHERE matchid = $matchid
AND (killer IN (". implode(",", $playerids) .")
@@ -192,7 +192,7 @@ while ($r_pname = mysql_fetch_array($q_pname)) { // Remove all of this player's records
$rem_precord = "DELETE FROM uts_player WHERE matchid = $matchid AND pid = '$pid'";
- mysql_query($rem_precord);
+ mysqli_query($GLOBALS["___mysqli_link"], $rem_precord);
// Add this new record to match
$upd_precord = " INSERT
@@ -248,7 +248,7 @@ while ($r_pname = mysql_fetch_array($q_pname)) { pu_belt = '$r_truepinfo2[pu_belt]',
pu_amp = '$r_truepinfo2[pu_amp]',
rank = '$r_truepinfo2[rank]';";
- mysql_query($upd_precord) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $upd_precord) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$cleaned = true;
}
}
diff --git a/html/import/import_playerstuff.php b/html/import/import_playerstuff.php index cf80b25..90c9792 100755 --- a/html/import/import_playerstuff.php +++ b/html/import/import_playerstuff.php @@ -10,8 +10,8 @@ $pid_country = $r_pid['country'];
$playerbanned = ($r_pid['banned'] == 'Y') ? true : false;
} else {
- mysql_query("INSERT INTO uts_pinfo SET name = '$playername'") or die(mysql_error());
- $pid = mysql_insert_id();
+ mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_pinfo SET name = '$playername'") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ $pid = ((is_null($___mysqli_res = mysqli_insert_id($GLOBALS["___mysqli_link"]))) ? false : $___mysqli_res);
$pid_country = false;
$playerbanned = false;
}
@@ -24,7 +24,7 @@ // Did the player do first blood?
IF($playerid == $firstblood) {
$upd_firstblood = "UPDATE uts_match SET firstblood = '$pid' WHERE id = $matchid";
- mysql_query($upd_firstblood) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $upd_firstblood) or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
// Get player's IP
@@ -37,7 +37,7 @@ if ($playercountry != $pid_country)
{
- mysql_query("UPDATE uts_pinfo SET country = '$playercountry' WHERE id = '$pid'") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_pinfo SET country = '$playercountry' WHERE id = '$pid'") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
@@ -56,7 +56,7 @@ // Get Count of Pickups
$sql_player7 = "SELECT col2, COUNT(col2) AS pu_count FROM uts_temp_$uid WHERE col1 = 'item_get' AND col3 = $playerid GROUP BY col2";
- $q_player7 = mysql_query($sql_player7);
+ $q_player7 = mysqli_query($GLOBALS["___mysqli_link"], $sql_player7);
$pu_pads = 0;
$pu_armour = 0;
@@ -65,7 +65,7 @@ $pu_amp = 0;
$pu_invis = 0;
- while ($r_player7 = mysql_fetch_array($q_player7)) {
+ while ($r_player7 = mysqli_fetch_array($q_player7)) {
// Cycle through pickups and see what the player got
IF ($r_player7[col2] == "Thigh Pads") { $pu_pads = $r_player7[pu_count]; }
IF ($r_player7[col2] == "Body Armor") { $pu_armour = $r_player7[pu_count]; }
@@ -179,8 +179,8 @@ ttl = '$r_ttl',
gamescore= '$r_score'";
- $q_playerid = mysql_query($sql_playerid) or die(mysql_error());
- $playerecordid = mysql_insert_id();
+ $q_playerid = mysqli_query($GLOBALS["___mysqli_link"], $sql_playerid) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ $playerecordid = ((is_null($___mysqli_res = mysqli_insert_id($GLOBALS["___mysqli_link"]))) ? false : $___mysqli_res);
?>
diff --git a/html/import/import_ranking.php b/html/import/import_ranking.php index 9ad18a2..fe6ce6c 100755 --- a/html/import/import_ranking.php +++ b/html/import/import_ranking.php @@ -46,8 +46,8 @@ // noobs and fewer for the good players. The new ranking would be based on the fastest captime.
$rank_bt = 0;
$sql_btmaprank = "SELECT e.col2 AS no, COUNT(e.col2) AS count FROM uts_events AS e, uts_player AS p WHERE p.pid = $pid AND p.gid = $gid AND p.playerid = e.playerid AND e.matchid = p.matchid AND e.matchid <= $matchid AND e.col2 > 0 AND e.col2 <= 5 GROUP BY e.col2";
- $q_btmaprank = mysql_query($sql_btmaprank) or die ("Can't retrieve \$q_btmaprank: ". mysql_error());
- while($r_btmaprank = mysql_fetch_assoc($q_btmaprank)) {
+ $q_btmaprank = mysqli_query($GLOBALS["___mysqli_link"], $sql_btmaprank) or die ("Can't retrieve \$q_btmaprank: ". mysqli_error($GLOBALS["___mysqli_link"]));
+ while($r_btmaprank = mysqli_fetch_assoc($q_btmaprank)) {
IF ($r_btmaprank[no] == 1) {
$rank_bt += $r_btmaprank[count] * 10;
} elseIF ($r_btmaprank[no] == 2) {
@@ -104,8 +104,8 @@ // Add new rank record if one does not exist
IF($rank_id == NULL) {
- mysql_query("INSERT INTO uts_rank SET time = '$r_gametime', pid = '$pid', gid = '$gid', rank = '0', matches = '0';") or die(mysql_error());
- $rank_id = mysql_insert_id();
+ mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_rank SET time = '$r_gametime', pid = '$pid', gid = '$gid', rank = '0', matches = '0';") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ $rank_id = ((is_null($___mysqli_res = mysqli_insert_id($GLOBALS["___mysqli_link"]))) ? false : $___mysqli_res);
$rank_gametime = 0;
$rank_crank = 0;
$rank_matches = 0;
@@ -120,8 +120,8 @@ // if ($dbg) echo "", intval($rank_crank), "-", intval($rank_nrank). "-", $rank_matches, " ";
// Add effective rank points given to uts_player record
- mysql_query("UPDATE uts_player SET rank = $eff_rank WHERE id = $playerecordid") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_player SET rank = $eff_rank WHERE id = $playerecordid") or die(mysqli_error($GLOBALS["___mysqli_link"]));
// Update the rank
- mysql_query("UPDATE uts_rank SET time = '$rank_gametime', rank = '$rank_nrank', prevrank = '$rank_crank', matches = '$rank_matches' WHERE id = $rank_id;") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_rank SET time = '$rank_gametime', rank = '$rank_nrank', prevrank = '$rank_crank', matches = '$rank_matches' WHERE id = $rank_id;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
?>
diff --git a/html/import/import_renderer-ctf.php b/html/import/import_renderer-ctf.php index 3e49bf5..0c6db6f 100644 --- a/html/import/import_renderer-ctf.php +++ b/html/import/import_renderer-ctf.php @@ -7,7 +7,7 @@ if(($time_gameend-$time_gamestart)>300 && count(array_unique($playernames))>=2) { try { - $safe_uid = mysql_real_escape_string($uid); + $safe_uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid); prepCTFdata($safe_uid); diff --git a/html/import/import_renderer-dm.php b/html/import/import_renderer-dm.php index e680bbf..a889865 100644 --- a/html/import/import_renderer-dm.php +++ b/html/import/import_renderer-dm.php @@ -7,7 +7,7 @@ if(($time_gameend-$time_gamestart)>300 && count(array_unique($playernames))>=2) { try { - $safe_uid = mysql_real_escape_string($uid); + $safe_uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid); // Get relevant data list($datafrags, $derivfrags, $topFraggers,$counter,$datafragsteam,$derivfragsteam,$topTeams) = parseDMdata($safe_uid); diff --git a/html/import/import_renderer-dom.php b/html/import/import_renderer-dom.php index d680d49..4e20d1f 100644 --- a/html/import/import_renderer-dom.php +++ b/html/import/import_renderer-dom.php @@ -27,6 +27,6 @@ } // drop table - mysql_query("DROP TABLE $tableTempIdom") or die(mysql_error()); + mysqli_query($GLOBALS["___mysqli_link"], "DROP TABLE $tableTempIdom") or die(mysqli_error($GLOBALS["___mysqli_link"])); } ?>
\ No newline at end of file diff --git a/html/import/import_renderer-preconfig.php b/html/import/import_renderer-preconfig.php index bb83526..0cfe696 100644 --- a/html/import/import_renderer-preconfig.php +++ b/html/import/import_renderer-preconfig.php @@ -1,17 +1,18 @@ <?php - require_once 'includes/renderer-general-import.php'; - $safe_uid = mysql_real_escape_string($uid); +require_once "includes/renderer-general-import.php"; - // Get relevant info - $playerinfo = getPlayerTeam($uid); - $playernames = $playerinfo[0]; - $playerteams = $playerinfo[1]; - $playernumberofteams = $playerinfo[2]; - - $time_gameinfo = getGameStartEndRatio($uid); - $time_gamestart = $time_gameinfo[0]; - $time_gameend = $time_gameinfo[1]; - $time_ratio_correction = $time_gameinfo[2]; - -?>
\ No newline at end of file +$safe_uid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $uid); + +// Get relevant info +$playerinfo = getPlayerTeam($uid); +$playernames = $playerinfo[0]; +$playerteams = $playerinfo[1]; +$playernumberofteams = $playerinfo[2]; + +$time_gameinfo = getGameStartEndRatio($uid); +$time_gamestart = $time_gameinfo[0]; +$time_gameend = $time_gameinfo[1]; +$time_ratio_correction = $time_gameinfo[2]; + +?> diff --git a/html/import/import_weapons.php b/html/import/import_weapons.php index 5d59a3f..3e6ed14 100755 --- a/html/import/import_weapons.php +++ b/html/import/import_weapons.php @@ -3,8 +3,8 @@ // Read all available weapons, we'll need them later if (!isset($weaponnames)) { $sql_weaponnames = "SELECT id, name FROM uts_weapons"; - $q_weaponnames = mysql_query($sql_weaponnames); - while ($r_weaponnames = mysql_fetch_array($q_weaponnames)) { + $q_weaponnames = mysqli_query($GLOBALS["___mysqli_link"], $sql_weaponnames); + while ($r_weaponnames = mysqli_fetch_array($q_weaponnames)) { $weaponnames[$r_weaponnames['name']] = $r_weaponnames['id']; } } @@ -19,17 +19,17 @@ $sql_weapons = " SELECT col2 AS player, OR col1 = 'teamkill' GROUP BY weaponname, player"; -$q_weapons = mysql_query($sql_weapons) or die(mysql_error()); +$q_weapons = mysqli_query($GLOBALS["___mysqli_link"], $sql_weapons) or die(mysqli_error($GLOBALS["___mysqli_link"])); $weapons = array(); -while ($r_weapons = mysql_fetch_array($q_weapons)) { +while ($r_weapons = mysqli_fetch_array($q_weapons)) { // Get the wepon's id or assign a new one if (empty($r_weapons['weaponname'])) continue; if (isset($weaponnames[$r_weapons['weaponname']])) { $weaponid = $weaponnames[$r_weapons['weaponname']]; } else { - mysql_query("INSERT INTO uts_weapons SET name = '". addslashes($r_weapons['weaponname']) ."'") or die(mysql_error()); - $weaponid = mysql_insert_id(); + mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_weapons SET name = '". addslashes($r_weapons['weaponname']) ."'") or die(mysqli_error($GLOBALS["___mysqli_link"])); + $weaponid = ((is_null($___mysqli_res = mysqli_insert_id($GLOBALS["___mysqli_link"]))) ? false : $___mysqli_res); $weaponnames[$r_weapons['weaponname']] = $weaponid; } @@ -60,15 +60,15 @@ $sql_weapons = " SELECT col1 AS type, FROM uts_temp_$uid WHERE col1 LIKE 'weap_%'"; -$q_weapons = mysql_query($sql_weapons) or die(mysql_error()); -while ($r_weapons = mysql_fetch_array($q_weapons)) { +$q_weapons = mysqli_query($GLOBALS["___mysqli_link"], $sql_weapons) or die(mysqli_error($GLOBALS["___mysqli_link"])); +while ($r_weapons = mysqli_fetch_array($q_weapons)) { // Get the wepon's id or assign a new one if (empty($r_weapons['weaponname'])) continue; if (isset($weaponnames[$r_weapons['weaponname']])) { $weaponid = $weaponnames[$r_weapons['weaponname']]; } else { - mysql_query("INSERT INTO uts_weapons SET name = '". addslashes($r_weapons['weaponname']) ."'") or die(mysql_error()); - $weaponid = mysql_insert_id(); + mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_weapons SET name = '". addslashes($r_weapons['weaponname']) ."'") or die(mysqli_error($GLOBALS["___mysqli_link"])); + $weaponid = ((is_null($___mysqli_res = mysqli_insert_id($GLOBALS["___mysqli_link"]))) ? false : $___mysqli_res); $weaponnames[$r_weapons['weaponname']] = $weaponid; } @@ -99,7 +99,7 @@ $s_weapons = array(); foreach($weapons as $playerid => $weapon) { foreach($weapon as $weaponid => $infos) { if ($infos['weap_kills'] == 0 and $infos['weap_shotcount'] == 0) continue; - mysql_query(" INSERT + mysqli_query($GLOBALS["___mysqli_link"], " INSERT INTO uts_weaponstats SET matchid = '$matchid', pid = '$playerid', @@ -108,7 +108,7 @@ foreach($weapons as $playerid => $weapon) { shots = '${infos['weap_shotcount']}', hits= '${infos['weap_hitcount']}', damage = '${infos['weap_damagegiven']}', - acc = '". round($infos['weap_accuracy'], 2) ."';") or die(mysql_error()); + acc = '". round($infos['weap_accuracy'], 2) ."';") or die(mysqli_error($GLOBALS["___mysqli_link"])); // Summarize totals for this match if (!isset($s_weapons[$weaponid]['weap_kills'])) { @@ -141,7 +141,7 @@ foreach($weapons as $playerid => $weapon) { AND weapon = '$weaponid'"); // No -> create if (!$r_pstat) { - mysql_query(" INSERT + mysqli_query($GLOBALS["___mysqli_link"], " INSERT INTO uts_weaponstats SET matchid = '0', pid = '$playerid', @@ -150,10 +150,10 @@ foreach($weapons as $playerid => $weapon) { shots = '${infos['weap_shotcount']}', hits= '${infos['weap_hitcount']}', damage = '${infos['weap_damagegiven']}', - acc = '". round($infos['weap_accuracy'], 2) ."';") or die(mysql_error()); + acc = '". round($infos['weap_accuracy'], 2) ."';") or die(mysqli_error($GLOBALS["___mysqli_link"])); // Yes -> update } else { - mysql_query(" UPDATE uts_weaponstats + mysqli_query($GLOBALS["___mysqli_link"], " UPDATE uts_weaponstats SET weapon = '$weaponid', kills = kills + '${infos['weap_kills']}', shots = shots + '${infos['weap_shotcount']}', @@ -162,7 +162,7 @@ foreach($weapons as $playerid => $weapon) { acc = (acc + '". round($infos['weap_accuracy'], 2) ."') / 2 WHERE matchid = '0' AND pid = '$playerid' - AND weapon = '$weaponid';") or die(mysql_error()); + AND weapon = '$weaponid';") or die(mysqli_error($GLOBALS["___mysqli_link"])); } } } @@ -178,7 +178,7 @@ foreach($s_weapons as $weaponid => $infos) { AND weapon = '$weaponid'"); // No -> create if (!$r_pstat) { - mysql_query(" INSERT + mysqli_query($GLOBALS["___mysqli_link"], " INSERT INTO uts_weaponstats SET matchid = '0', pid = '0', @@ -187,10 +187,10 @@ foreach($s_weapons as $weaponid => $infos) { shots = '${infos['weap_shotcount']}', hits= '${infos['weap_hitcount']}', damage = '${infos['weap_damagegiven']}', - acc = '". round($infos['weap_accuracy'], 2) ."';") or die(mysql_error()); + acc = '". round($infos['weap_accuracy'], 2) ."';") or die(mysqli_error($GLOBALS["___mysqli_link"])); // Yes -> update } else { - mysql_query(" UPDATE uts_weaponstats + mysqli_query($GLOBALS["___mysqli_link"], " UPDATE uts_weaponstats SET weapon = '$weaponid', kills = kills + '${infos['weap_kills']}', shots = shots + '${infos['weap_shotcount']}', @@ -199,7 +199,7 @@ foreach($s_weapons as $weaponid => $infos) { acc = (acc + '". round($infos['weap_accuracy'], 2) ."') / 2 WHERE matchid = '0' AND pid = '0' - AND weapon = '$weaponid';") or die(mysql_error()); + AND weapon = '$weaponid';") or die(mysqli_error($GLOBALS["___mysqli_link"])); } } 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']);
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 = array('0' => '*');
-while ($r_server = mysql_fetch_array($q_server)) {
+while ($r_server = mysqli_fetch_array($q_server)) {
$servernames[$r_server['id']] = $r_server['servername'];
$serverips[$r_server['id']] = $r_server['serverip'];
}
$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"]));
$gamedisplaynames = array('0' => '');
$gamenames = array('0' => '*');
-while ($r_games = mysql_fetch_array($q_games)) {
+while ($r_games = mysqli_fetch_array($q_games)) {
$gamenames[$r_games['id']] = $r_games['gamename'];
$gamedisplaynames[$r_games['id']] = $r_games['name'];
}
if (isset($_REQUEST['submit'])) {
- mysql_query(" INSERT INTO uts_gamestype
+ mysqli_query($GLOBALS["___mysqli_link"], " INSERT INTO uts_gamestype
SET serverip = '". my_addslashes($_REQUEST['serverip']) ."',
gamename = '". my_addslashes($_REQUEST['gamename']) ."',
mutator = '". my_addslashes($_REQUEST['mutator']) ."',
gid = '". my_addslashes($_REQUEST['gid']) ."'
- ") or die(mysql_error());
+ ") or die(mysqli_error($GLOBALS["___mysqli_link"]));
if (isset($_REQUEST['update'])) {
echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600">
@@ -50,8 +50,8 @@ if (isset($_REQUEST['submit'])) { $where .= " AND m.mutators LIKE '%".my_addslashes($_REQUEST['mutator'])."%'";
}
- mysql_query("UPDATE uts_player p, uts_match m SET p.gid = '". my_addslashes($_REQUEST['gid']) ."' $where AND m.id = p.matchid;") or die(mysql_error());
- echo'<td class="grey" align="left" width="400">Done (updated '.mysql_affected_rows().' records)</td>
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_player p, uts_match m SET p.gid = '". my_addslashes($_REQUEST['gid']) ."' $where AND m.id = p.matchid;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ echo'<td class="grey" align="left" width="400">Done (updated '.mysqli_affected_rows($GLOBALS["___mysqli_link"]).' records)</td>
</tr>
@@ -59,8 +59,8 @@ if (isset($_REQUEST['submit'])) { <tr>
<td class="smheading" align="left" width="200">Updating Matches</td>';
- mysql_query("UPDATE uts_match m SET m.gid = '". my_addslashes($_REQUEST['gid']) ."' $where;") or die(mysql_error());
- echo'<td class="grey" align="left" width="400">Done (updated '.mysql_affected_rows().' matches)</td>
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_match m SET m.gid = '". my_addslashes($_REQUEST['gid']) ."' $where;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ echo'<td class="grey" align="left" width="400">Done (updated '.mysqli_affected_rows($GLOBALS["___mysqli_link"]).' matches)</td>
</tr>
@@ -76,13 +76,13 @@ if (isset($_REQUEST['submit'])) { } else {
$where = 'WHERE 1';
}
- mysql_query("DELETE FROM uts_rank $where;") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank $where;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
$sql_nrank = "SELECT SUM(p.gametime) AS time, p.pid, p.gid, SUM(p.rank) AS rank, COUNT(p.matchid) AS matches FROM uts_player p, uts_pinfo pi $where AND pi.id = p.pid AND pi.banned <> 'Y' GROUP BY p.gid, p.pid";
- $q_nrank = mysql_query($sql_nrank) or die(mysql_error());
+ $q_nrank = mysqli_query($GLOBALS["___mysqli_link"], $sql_nrank) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$num_ranks = 0;
- while ($r_nrank = mysql_fetch_array($q_nrank)) {
- mysql_query("INSERT INTO uts_rank SET time = '${r_nrank['time']}', pid = ${r_nrank['pid']}, gid = ${r_nrank['gid']}, rank = '${r_nrank['rank']}', prevrank = '${r_nrank['rank']}', matches = ${r_nrank['matches']}") or die(mysql_error());
+ while ($r_nrank = mysqli_fetch_array($q_nrank)) {
+ mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_rank SET time = '${r_nrank['time']}', pid = ${r_nrank['pid']}, gid = ${r_nrank['gid']}, rank = '${r_nrank['rank']}', prevrank = '${r_nrank['rank']}', matches = ${r_nrank['matches']}") or die(mysqli_error($GLOBALS["___mysqli_link"]));
$num_ranks++;
}
echo'<td class="grey" align="left" width="400">Done (recalculated '.$num_ranks.' rankings)</td>
@@ -95,9 +95,9 @@ if (isset($_REQUEST['submit'])) { }
if (isset($_REQUEST['del'])) {
- mysql_query(" DELETE FROM uts_gamestype
+ mysqli_query($GLOBALS["___mysqli_link"], " DELETE FROM uts_gamestype
WHERE id = '". my_addslashes($_REQUEST['del']) ."'
- ") or die(mysql_error());
+ ") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
@@ -123,9 +123,9 @@ echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600"> $sql_gamestype = "SELECT id, serverip, gamename, mutator, gid FROM uts_gamestype ORDER BY id ASC;";
-$q_gamestype = mysql_query($sql_gamestype) or die(mysql_error());
+$q_gamestype = mysqli_query($GLOBALS["___mysqli_link"], $sql_gamestype) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
-while ($r_gamestype = mysql_fetch_array($q_gamestype)) {
+while ($r_gamestype = mysqli_fetch_array($q_gamestype)) {
$i++;
$class = ($i%2) ? 'grey' : 'grey2';
echo '<tr>';
diff --git a/html/pages/admin/editweapons.php b/html/pages/admin/editweapons.php index e7b3251..0921d95 100644 --- a/html/pages/admin/editweapons.php +++ b/html/pages/admin/editweapons.php @@ -3,11 +3,11 @@ if (empty($import_adminkey) or isset($_REQUEST['import_adminkey']) or $import_ad if (isset($_REQUEST['submit'])) {
foreach($_REQUEST['image'] as $id => $bla) {
- mysql_query(" UPDATE uts_weapons
+ mysqli_query($GLOBALS["___mysqli_link"], " UPDATE uts_weapons
SET image = '". my_addslashes($_REQUEST['image'][$id]) ."',
sequence = '". my_addslashes($_REQUEST['sequence'][$id]) ."',
hide = '". (isset($_REQUEST['hide'][$id]) ? 'Y' : 'N') ."'
- WHERE id = '$id';") or die(mysql_error());
+ WHERE id = '$id';") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
}
@@ -28,9 +28,9 @@ echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600"> $sql_weapons = "SELECT id, name, image, sequence, hide FROM uts_weapons ORDER BY sequence ASC;";
-$q_weapons = mysql_query($sql_weapons) or die(mysql_error());
+$q_weapons = mysqli_query($GLOBALS["___mysqli_link"], $sql_weapons) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
-while ($r_weapons = mysql_fetch_array($q_weapons)) {
+while ($r_weapons = mysqli_fetch_array($q_weapons)) {
$i++;
$class = ($i%2) ? 'grey' : 'grey2';
echo '<tr>';
diff --git a/html/pages/admin/emptydb.php b/html/pages/admin/emptydb.php index 63599fc..cecd14b 100755 --- a/html/pages/admin/emptydb.php +++ b/html/pages/admin/emptydb.php @@ -30,18 +30,18 @@ IF ($results['sure'] == "Yes" and $results['really'] == "Yes") { Emptying All Tables except uts_ip2country, uts_weaponstats and uts_charttypes
</td>';
- mysql_query("TRUNCATE uts_chartdata;") or die(mysql_error());
- mysql_query("TRUNCATE uts_events;") or die(mysql_error());
- mysql_query("TRUNCATE uts_games;") or die(mysql_error());
- mysql_query("TRUNCATE uts_gamestype;") or die(mysql_error());
- mysql_query("TRUNCATE uts_killsmatrix;") or die(mysql_error());
- mysql_query("TRUNCATE uts_match;") or die(mysql_error());
- mysql_query("TRUNCATE uts_pinfo;") or die(mysql_error());
- mysql_query("TRUNCATE uts_player;") or die(mysql_error());
- mysql_query("TRUNCATE uts_rank;") or die(mysql_error());
- mysql_query("DELETE FROM uts_weapons WHERE id > 19") or die(mysql_error());
- mysql_query("ALTER TABLE uts_weapons AUTO_INCREMENT=20") or die(mysql_error());
- mysql_query("TRUNCATE uts_weaponstats;") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_chartdata;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_events;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_games;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_gamestype;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_killsmatrix;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_match;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_pinfo;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_player;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_rank;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weapons WHERE id > 19") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "ALTER TABLE uts_weapons AUTO_INCREMENT=20") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_weaponstats;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo '<td class="grey" align="left" width="300">Done</td>
</tr>
diff --git a/html/pages/admin/ipsearch.php b/html/pages/admin/ipsearch.php index fcfe17f..6db94dc 100644 --- a/html/pages/admin/ipsearch.php +++ b/html/pages/admin/ipsearch.php @@ -29,17 +29,17 @@ echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600"> $sql_players = "SELECT pi.name, pi.id AS pid FROM uts_player p, uts_pinfo pi WHERE p.pid = pi.id AND p.ip BETWEEN INET_ATON('$ip_from') AND INET_ATON('$ip_to') GROUP BY pid";
-$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"]));
$j = 0;
-while ($r_players = mysql_fetch_array($q_players)) {
+while ($r_players = mysqli_fetch_array($q_players)) {
echo '<tr>';
echo '<td class="dark" align="center" valign="top" width="150">';
echo '<a class="darkhuman" href="admin.php?action=pinfo&pid='.$r_players['pid'].'">'.$r_players['name'].'</a></td>';
$sql_recent = "SELECT m.time AS time, m.id AS mid, INET_NTOA(p.ip) AS ip FROM uts_player p, uts_match m WHERE m.id = p.matchid AND p.pid = '${r_players['pid']}' AND p.ip BETWEEN INET_ATON('$ip_from') AND INET_ATON('$ip_to') ORDER BY m.time DESC LIMIT 0,5";
echo '<td class="grey">';
echo '<table width="100%" border="0" cellspacing="0" cellpadding="2">';
- $q_recent= mysql_query($sql_recent) or die(mysql_error());
- while ($r_recent = mysql_fetch_array($q_recent)) {
+ $q_recent= mysqli_query($GLOBALS["___mysqli_link"], $sql_recent) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_recent = mysqli_fetch_array($q_recent)) {
$j++;
$class = ($j%2) ? 'grey' : 'grey2';
echo '<tr><td class="'.$class.'" align="center" width="60%">';
diff --git a/html/pages/admin/main.php b/html/pages/admin/main.php index 697909a..569d142 100644 --- a/html/pages/admin/main.php +++ b/html/pages/admin/main.php @@ -3,7 +3,7 @@ if (empty($import_adminkey) or isset($_REQUEST['import_adminkey']) or $import_ad if (isset($_REQUEST['droptable'])) {
$droptable = my_addslashes($_REQUEST['droptable']);
if (substr($droptable, 0, 9) == 'uts_temp_' and strlen($droptable) == 17) {
- mysql_query("DROP TABLE $droptable;") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "DROP TABLE $droptable;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
} else {
die('NO!');
}
@@ -22,11 +22,11 @@ echo'<table class = "box" border="0" cellpadding="0" cellspacing="0" width="600" <td class="smheading" align="center" height="25" colspan="4">Database Statistics</td>
</tr>';
-$q_dbsize = mysql_query("SHOW table STATUS") or die(mysql_error());
+$q_dbsize = mysqli_query($GLOBALS["___mysqli_link"], "SHOW table STATUS") or die(mysqli_error($GLOBALS["___mysqli_link"]));
$tot_size = 0;
$tot_rows = 0;
$max_size = 0;
-while ($r_dbsize = mysql_fetch_array($q_dbsize)) {
+while ($r_dbsize = mysqli_fetch_array($q_dbsize)) {
if (substr($r_dbsize['Name'], 0, 4) != 'uts_') continue;
$size = $r_dbsize['Data_length'] + $r_dbsize['Index_length'];
$rows = $r_dbsize['Rows'];
diff --git a/html/pages/admin/mplayers.php b/html/pages/admin/mplayers.php index c9b58a3..efe7658 100644 --- a/html/pages/admin/mplayers.php +++ b/html/pages/admin/mplayers.php @@ -32,55 +32,55 @@ echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600"> </tr>
<tr>
<td class="smheading" align="left" width="200">Removing Info Records</td>';
-mysql_query("DELETE FROM uts_pinfo WHERE id = $mplayer2") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_pinfo WHERE id = $mplayer2") 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">Updating Player Records</td>';
-mysql_query("UPDATE uts_player SET pid = $mplayer1 WHERE pid = $mplayer2") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_player SET pid = $mplayer1 WHERE pid = $mplayer2") 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">Updating Weapon Records</td>';
-mysql_query("UPDATE uts_weaponstats SET pid = $mplayer1 WHERE pid = $mplayer2") or die(mysql_error());
-mysql_query("DELETE FROM uts_weaponstats WHERE pid = $mplayer2") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_weaponstats SET pid = $mplayer1 WHERE pid = $mplayer2") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE pid = $mplayer2") 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='0' AND pid = '$mplayer1'") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid='0' AND pid = '$mplayer1'") 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 = '$mplayer1' 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='$mplayer1', 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 = '$mplayer1' 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='$mplayer1', 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">Updating First Blood Records</td>';
-mysql_query("UPDATE uts_match SET firstblood = $mplayer1 WHERE firstblood = $mplayer2") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_match SET firstblood = $mplayer1 WHERE firstblood = $mplayer2") 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">Temporary Rank</td>';
-mysql_query("UPDATE uts_rank SET pid = $mplayer2 WHERE pid= $mplayer1") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_rank SET pid = $mplayer2 WHERE pid= $mplayer1") 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">Creating New Rank</td>';
$sql_nrank = "SELECT SUM(time) AS time, pid, gid, AVG(rank) AS rank, AVG(prevrank) AS prevrank, SUM(matches) AS matches FROM uts_rank WHERE pid = $mplayer2 GROUP BY pid, gid";
-$q_nrank = mysql_query($sql_nrank) or die(mysql_error());
-while ($r_nrank = mysql_fetch_array($q_nrank)) {
+$q_nrank = mysqli_query($GLOBALS["___mysqli_link"], $sql_nrank) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+while ($r_nrank = mysqli_fetch_array($q_nrank)) {
- mysql_query("INSERT INTO uts_rank SET time = '$r_nrank[time]', pid = $mplayer1, gid = $r_nrank[gid], rank = '$r_nrank[rank]', prevrank = '$r_nrank[prevrank]', matches = $r_nrank[matches]") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_rank SET time = '$r_nrank[time]', pid = $mplayer1, gid = $r_nrank[gid], rank = '$r_nrank[rank]', prevrank = '$r_nrank[prevrank]', matches = $r_nrank[matches]") 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 Old Rank</td>';
-mysql_query("DELETE FROM uts_rank WHERE pid = $mplayer2") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank WHERE pid = $mplayer2") 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/mservers.php b/html/pages/admin/mservers.php index 9e0bf6a..f58937f 100644 --- a/html/pages/admin/mservers.php +++ b/html/pages/admin/mservers.php @@ -31,7 +31,7 @@ echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600"> </tr>
<tr>
<td class="smheading" align="left" width="200">Merging Records</td>';
-mysql_query("UPDATE uts_match SET serverip = '". addslashes($q_myserver1[serverip]) ."', servername = '". addslashes($q_myserver1[servername]) ."' WHERE serverip = '". addslashes($q_myserver2[serverip]) ."' and servername = '". addslashes($q_myserver2[servername]) ."'") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_match SET serverip = '". addslashes($q_myserver1[serverip]) ."', servername = '". addslashes($q_myserver1[servername]) ."' WHERE serverip = '". addslashes($q_myserver2[serverip]) ."' and servername = '". addslashes($q_myserver2[servername]) ."'") 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/pban.php b/html/pages/admin/pban.php index 88aa6a4..4d11daa 100644 --- a/html/pages/admin/pban.php +++ b/html/pages/admin/pban.php @@ -32,12 +32,12 @@ if ($ban) { </tr>
<tr>
<td class="smheading" align="left">Removing Player Rank:</td>';
- mysql_query("DELETE FROM uts_rank WHERE pid = $pid") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank WHERE pid = $pid") or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo'<td class="grey" align="left">Done</td>
</tr>
<tr>
<td class="smheading" align="left">Updating Player Record:</td>';
- mysql_query("UPDATE uts_pinfo SET banned = 'Y' WHERE id = $pid") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_pinfo SET banned = 'Y' WHERE id = $pid") or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo'<td class="grey" align="left">Done</td>
</tr>
@@ -51,17 +51,17 @@ if ($ban) { </tr>
<tr>
<td class="smheading" align="left">Updating Player Record:</td>';
- mysql_query("UPDATE uts_pinfo SET banned = 'N' WHERE id = $pid") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_pinfo SET banned = 'N' WHERE id = $pid") or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo'<td class="grey" align="left">Done</td>
</tr>
<tr>
<td class="smheading" align="left" width="200">Restoring Rankings</td>';
$sql_nrank = "SELECT SUM(gametime) AS time, pid, gid, SUM(rank) AS rank, COUNT(matchid) AS matches FROM uts_player WHERE pid = $pid GROUP BY pid, gid";
- $q_nrank = mysql_query($sql_nrank) or die(mysql_error());
- while ($r_nrank = mysql_fetch_array($q_nrank)) {
+ $q_nrank = mysqli_query($GLOBALS["___mysqli_link"], $sql_nrank) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_nrank = mysqli_fetch_array($q_nrank)) {
- mysql_query("INSERT INTO uts_rank SET time = '$r_nrank[time]', pid = $pid, gid = $r_nrank[gid], rank = '$r_nrank[rank]', prevrank = '$r_nrank[rank]', matches = $r_nrank[matches]") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_rank SET time = '$r_nrank[time]', pid = $pid, gid = $r_nrank[gid], rank = '$r_nrank[rank]', prevrank = '$r_nrank[rank]', matches = $r_nrank[matches]") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
echo'<td class="grey" align="left" width="400">Done</td>
diff --git a/html/pages/admin/pinfo.php b/html/pages/admin/pinfo.php index 3ae57f7..cf04b3d 100644 --- a/html/pages/admin/pinfo.php +++ b/html/pages/admin/pinfo.php @@ -1,6 +1,6 @@ <?php
if (empty($import_adminkey) or isset($_REQUEST['import_adminkey']) or $import_adminkey != $adminkey) die('bla');
-
+
$options['title'] = 'Extended Player Info';
$options['requireconfirmation'] = false;
$i = 0;
@@ -23,7 +23,7 @@ include('pages/players_info.php'); echo '<br>';
$sql_ips = "SELECT INET_NTOA(p.ip) AS ip, COUNT(p.id) AS matches, MIN(m.time) AS first, MAX(m.time) AS last FROM uts_player AS p, uts_match AS m WHERE p.pid = ".$pid." AND m.id = p.matchid GROUP BY ip ORDER BY ip";
-$q_ips = mysql_query($sql_ips) or die("Can't get ip's: " . mysql_error());
+$q_ips = mysqli_query($GLOBALS["___mysqli_link"], $sql_ips) or die("Can't get ip's: " . mysqli_error($GLOBALS["___mysqli_link"]));
echo '
<table class = "box" border="0" cellpadding="0" cellspacing="0" width="720">
<tbody>
@@ -32,14 +32,14 @@ echo ' </tr>
<tr>
<td class="smheading" width="80" align = "center">IP</td>
- <td class="smheading" width="180" align = "left">Hostname</td>
+ <td class="smheading" width="180" align = "left">Hostname</td>
<td class="smheading" width="60" align = "center">Matches</td>
<td class="smheading" width="200" align = "left">First</td>
<td class="smheading" width="200" align = "left">Last</td>
</tr>';
-while ($r_ips = mysql_fetch_assoc($q_ips)) {
- echo '
+while ($r_ips = mysqli_fetch_assoc($q_ips)) {
+ echo '
<tr>
<td class="grey" align = "center">'.$r_ips['ip'].'</td>
<td class="grey" align = "left">'.gethostbyaddr($r_ips['ip']).'</td>
@@ -55,10 +55,10 @@ echo ' <div class="opnote">* Hostnames are real time and might have been different at the time of playing. *</div>
<br>';
-mysql_free_result($q_ips);
+((mysqli_free_result($q_ips) || (is_object($q_ips) && (get_class($q_ips) == "mysqli_result"))) ? true : false);
$sql_fakes = "SELECT INET_NTOA(p1.ip) AS ip, pi.name FROM uts_player AS p1, uts_player AS p2, uts_pinfo AS pi WHERE p1.pid = ".$pid." AND p1.ip = p2.ip AND p1.pid <> p2.pid AND pi.id = p2.pid GROUP BY pi.name";
-$q_fakes = mysql_query($sql_fakes) or die("Can't retrieve fake nicks: " . mysql_error());
+$q_fakes = mysqli_query($GLOBALS["___mysqli_link"], $sql_fakes) or die("Can't retrieve fake nicks: " . mysqli_error($GLOBALS["___mysqli_link"]));
echo '
<table class = "box" border="0" cellpadding="0" cellspacing="0" width="480">
<tbody>
@@ -70,14 +70,14 @@ echo ' <td class="smheading" width="360" align = "center">IP</td>
</tr>';
-if (mysql_num_rows($q_fakes) == 0) {
+if (mysqli_num_rows($q_fakes) == 0) {
echo '
<tr>
<td class="grey" align = "center" colspan="2">No other names found</td>
</tr>';
}
else {
- while($r_fakes = mysql_fetch_assoc($q_fakes)) {
+ while($r_fakes = mysqli_fetch_assoc($q_fakes)) {
echo '
<tr>
<td class="grey" align = "center">'.$r_fakes[ip].'</td>
diff --git a/html/pages/admin/plm.php b/html/pages/admin/plm.php index 1ea9f52..be26f71 100644 --- a/html/pages/admin/plm.php +++ b/html/pages/admin/plm.php @@ -13,25 +13,25 @@ function merge_players($mplayer1, $mplayer2) { $mp1name = small_query("SELECT name FROM uts_pinfo WHERE id = $mplayer1");
$mp2name = small_query("SELECT name FROM uts_pinfo WHERE id = $mplayer2");
- mysql_query("DELETE FROM uts_pinfo WHERE id = $mplayer2") or die(mysql_error());
- mysql_query("UPDATE uts_player SET pid = $mplayer1 WHERE pid = $mplayer2") or die(mysql_error());
- mysql_query("UPDATE uts_weaponstats SET pid = $mplayer1 WHERE pid = $mplayer2") or die(mysql_error());
- mysql_query("DELETE FROM uts_weaponstats WHERE pid = $mplayer2") or die(mysql_error());
- mysql_query("DELETE FROM uts_weaponstats WHERE matchid='0' AND pid = '$mplayer1'") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_pinfo WHERE id = $mplayer2") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_player SET pid = $mplayer1 WHERE pid = $mplayer2") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_weaponstats SET pid = $mplayer1 WHERE pid = $mplayer2") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE pid = $mplayer2") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_weaponstats WHERE matchid='0' AND pid = '$mplayer1'") 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 = '$mplayer1' 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='$mplayer1', 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 = '$mplayer1' 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='$mplayer1', 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"]));
}
- mysql_query("UPDATE uts_match SET firstblood = $mplayer1 WHERE firstblood = $mplayer2") or die(mysql_error());
- mysql_query("UPDATE uts_rank SET pid = $mplayer2 WHERE pid= $mplayer1") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_match SET firstblood = $mplayer1 WHERE firstblood = $mplayer2") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_rank SET pid = $mplayer2 WHERE pid= $mplayer1") or die(mysqli_error($GLOBALS["___mysqli_link"]));
$sql_nrank = "SELECT SUM(time) AS time, pid, gid, AVG(rank) AS rank, AVG(prevrank) AS prevrank, SUM(matches) AS matches FROM uts_rank WHERE pid = $mplayer2 GROUP BY pid, gid";
- $q_nrank = mysql_query($sql_nrank) or die(mysql_error());
- while ($r_nrank = mysql_fetch_array($q_nrank)) {
+ $q_nrank = mysqli_query($GLOBALS["___mysqli_link"], $sql_nrank) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_nrank = mysqli_fetch_array($q_nrank)) {
- mysql_query("INSERT INTO uts_rank SET time = '$r_nrank[time]', pid = $mplayer1, gid = $r_nrank[gid], rank = '$r_nrank[rank]', prevrank = '$r_nrank[prevrank]', matches = $r_nrank[matches]") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "INSERT INTO uts_rank SET time = '$r_nrank[time]', pid = $mplayer1, gid = $r_nrank[gid], rank = '$r_nrank[rank]', prevrank = '$r_nrank[prevrank]', matches = $r_nrank[matches]") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
- mysql_query("DELETE FROM uts_rank WHERE pid = $mplayer2") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_rank WHERE pid = $mplayer2") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
// If debugmode is on, get start time
@@ -52,9 +52,9 @@ if($_GET['manignore'] == "true") { echo "<P>Stopped ignore ip's</P>";
foreach($_POST as $key=>$value) {
if($key !='submit') {
- $key = mysql_real_escape_string(str_replace("_",".",$key));
+ $key = mysqli_real_escape_string($GLOBALS["___mysqli_link"], str_replace("_",".",$key));
$query = "DELETE FROM uts_ignoreips WHERE ip = (INET_ATON('".$key."'))";
- mysql_query($query) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $query) or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo "<br>$key";
}
}
@@ -63,13 +63,13 @@ if($_GET['manignore'] == "true") { echo '<P>Ignored ip\'s in range '.htmlentities($_POST['from']).' to '.htmlentities($_POST['to']).'<br><I>If you want to stop ignoring some ip\'s, because for example you accidently ignored these, check these and press the button at the lower end to confirm this</I></P>';
echo '<FORM METHOD="POST" ACTION="admin.php?key='.$adminkey.'&action=plm&manignore=true" target="_blank">';
- $from = mysql_real_escape_string($_POST['from']);
- $to = mysql_real_escape_string($_POST['to']);
+ $from = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_POST['from']);
+ $to = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_POST['to']);
- $ignore_ips = mysql_query("SELECT ip FROM uts_ignoreips WHERE ip >= INET_ATON('$from') AND ip <= INET_ATON('$to') ORDER BY ip ASC");
+ $ignore_ips = mysqli_query($GLOBALS["___mysqli_link"], "SELECT ip FROM uts_ignoreips WHERE ip >= INET_ATON('$from') AND ip <= INET_ATON('$to') ORDER BY ip ASC");
- if(mysql_num_rows($ignore_ips) > 0) {
- while ($r_pipcheck = mysql_fetch_array($ignore_ips)) {
+ if(mysqli_num_rows($ignore_ips) > 0) {
+ while ($r_pipcheck = mysqli_fetch_array($ignore_ips)) {
$playerip = $r_pipcheck[ip];
$trueplayerip = long2ip($playerip);
@@ -79,8 +79,8 @@ if($_GET['manignore'] == "true") { // Query for player names and ids associated to that ip during the cycle
$sql_pcheck = "SELECT pi.id, pi.name, pi.country, p.pid, p.ip FROM uts_pinfo AS pi, uts_player AS p WHERE pi.id = p.pid AND p.ip = $playerip GROUP BY pi.id, pi.name, p.pid, p.ip, pi.country";
- $q_pcheck = mysql_query($sql_pcheck) or die(mysql_error());
- while ($r_pcheck = mysql_fetch_array($q_pcheck)) {
+ $q_pcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_pcheck = mysqli_fetch_array($q_pcheck)) {
echo '<br><a class="darkhuman" href="admin.php?key='.$adminkey.'&action=pinfo&pid='.$r_pcheck[pid].'">'.FormatPlayerName($r_pcheck[country], $r_pcheck['pid'], $r_pcheck['name']).'</a> ';
}
echo '<br />';
@@ -99,9 +99,9 @@ if($_GET['manignore'] == "true") { echo '<P>Ignored ip\'s<br><I>If you want to stop ignoring some ip\'s, because for example you accidently ignored these, check these and press the button at the lower end to confirm this</I></P>';
echo '<FORM METHOD="POST" ACTION="admin.php?key='.$adminkey.'&action=plm&manignore=true" target="_blank">';
- $ignore_ips = mysql_query("SELECT ip FROM uts_ignoreips ORDER BY ip ASC");
- if(mysql_num_rows($ignore_ips) > 0) {
- while ($r_pipcheck = mysql_fetch_array($ignore_ips)) {
+ $ignore_ips = mysqli_query($GLOBALS["___mysqli_link"], "SELECT ip FROM uts_ignoreips ORDER BY ip ASC");
+ if(mysqli_num_rows($ignore_ips) > 0) {
+ while ($r_pipcheck = mysqli_fetch_array($ignore_ips)) {
$playerip = $r_pipcheck[ip];
$trueplayerip = long2ip($playerip);
@@ -111,8 +111,8 @@ if($_GET['manignore'] == "true") { // Query for player names and ids associated to that ip during the cycle
$sql_pcheck = "SELECT pi.id, pi.name, pi.country, p.pid, p.ip FROM uts_pinfo AS pi, uts_player AS p WHERE pi.id = p.pid AND p.ip = $playerip GROUP BY pi.id, pi.name, p.pid, p.ip, pi.country";
- $q_pcheck = mysql_query($sql_pcheck) or die(mysql_error());
- while ($r_pcheck = mysql_fetch_array($q_pcheck)) {
+ $q_pcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_pcheck = mysqli_fetch_array($q_pcheck)) {
echo '<br><a class="darkhuman" href="admin.php?key='.$adminkey.'&action=pinfo&pid='.$r_pcheck[pid].'">'.FormatPlayerName($r_pcheck[country], $r_pcheck['pid'], $r_pcheck['name']).'</a> ';
}
echo '<br />';
@@ -128,9 +128,9 @@ if($_GET['manignore'] == "true") { echo "<P>Ignored ips</P>";
foreach($_POST as $key=>$value) {
if($key !='submit') {
- $key = mysql_real_escape_string(str_replace("_",".",$key));
+ $key = mysqli_real_escape_string($GLOBALS["___mysqli_link"], str_replace("_",".",$key));
$query = "INSERT INTO uts_ignoreips (ip) VALUES (INET_ATON('".$key."'))";
- mysql_query($query) or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], $query) or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo "<br>$key";
}
}
@@ -140,10 +140,10 @@ if($_GET['manignore'] == "true") { } else if(substr($_POST['submit'],0,8) == "merge - ") {
echo "<P>Merge nicks with shared ip</P>";
- $ip = mysql_real_escape_string(str_replace("_",".",substr($_POST['submit'],8)));
+ $ip = mysqli_real_escape_string($GLOBALS["___mysqli_link"], str_replace("_",".",substr($_POST['submit'],8)));
$sql_pipcheck = "SELECT ip, COUNT(DISTINCT pid) AS pidcount FROM uts_player WHERE ip = INET_ATON('$ip') GROUP BY ip ORDER BY ip ASC";
- $q_pipcheck = mysql_query($sql_pipcheck) or die(mysql_error());
- while ($r_pipcheck = mysql_fetch_array($q_pipcheck)) {
+ $q_pipcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pipcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_pipcheck = mysqli_fetch_array($q_pipcheck)) {
$playerip = $r_pipcheck[ip];
$trueplayerip = long2ip($playerip);
@@ -157,8 +157,8 @@ if($_GET['manignore'] == "true") { // Query for player names and ids associated to that ip during the cycle
$sql_pcheck = "SELECT pi.id, pi.name, pi.country, p.pid, p.ip FROM uts_pinfo AS pi, uts_player AS p WHERE pi.id = p.pid AND p.ip = $playerip GROUP BY pi.id, pi.name, p.pid, p.ip, pi.country";
- $q_pcheck = mysql_query($sql_pcheck) or die(mysql_error());
- while ($r_pcheck = mysql_fetch_array($q_pcheck)) {
+ $q_pcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_pcheck = mysqli_fetch_array($q_pcheck)) {
echo '<br><a class="darkhuman" href="./?p=pinfo&pid='.$r_pcheck[pid].'">'.FormatPlayerName($r_pcheck[country], $r_pcheck['pid'], $r_pcheck['name']).'</a> ';
$options .= '<OPTION value="'.$r_pcheck[pid].'">'.$r_pcheck['name'].'</OPTION>';
}
@@ -172,11 +172,11 @@ if($_GET['manignore'] == "true") { } else if($_POST['submit'] == "Player merge") {
echo "<P>Merging nicks with shared ip</P>";
- $ip = mysql_real_escape_string(str_replace("_",".",$_POST['ip']));
- $merge_to_pid = mysql_real_escape_string($_POST['merge_to']);
+ $ip = mysqli_real_escape_string($GLOBALS["___mysqli_link"], str_replace("_",".",$_POST['ip']));
+ $merge_to_pid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_POST['merge_to']);
$sql_pipcheck = "SELECT ip, COUNT(DISTINCT pid) AS pidcount FROM uts_player WHERE ip = INET_ATON('$ip') GROUP BY ip ORDER BY ip ASC";
- $q_pipcheck = mysql_query($sql_pipcheck) or die(mysql_error());
- while ($r_pipcheck = mysql_fetch_array($q_pipcheck)) {
+ $q_pipcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pipcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_pipcheck = mysqli_fetch_array($q_pipcheck)) {
$playerip = $r_pipcheck[ip];
$trueplayerip = long2ip($playerip);
@@ -189,9 +189,9 @@ if($_GET['manignore'] == "true") { // Query for player names and ids associated to that ip during the cycle
$sql_pcheck = "SELECT p.pid FROM uts_pinfo AS pi, uts_player AS p WHERE pi.id = p.pid AND p.ip = $playerip GROUP BY pi.id, pi.name, p.pid, p.ip, pi.country";
- $q_pcheck = mysql_query($sql_pcheck) or die(mysql_error());
+ $q_pcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i=0;
- while ($r_pcheck = mysql_fetch_array($q_pcheck)) {
+ while ($r_pcheck = mysqli_fetch_array($q_pcheck)) {
if($r_pcheck['pid'] != $merge_to_pid) {
$pid_from[$i] = $r_pcheck['pid'];
echo $pid_from[$i].'<br>';
@@ -211,13 +211,13 @@ if($_GET['manignore'] == "true") { } else if($_GET['onlyrange'] == "true") {
if($_POST['submit'] == "Confirm") {
echo "<P>Showing all ip's in range ".htmlentities($_POST['from'])." to ".htmlentities($_POST['to'])."<br><I>If you want to ignore some ip's, because for example different but unrelated nicks are associated with it, check these and press the button at the lower end to confirm this</I></P>";
- $from = mysql_real_escape_string($_POST['from']);
- $to = mysql_real_escape_string($_POST['to']);
+ $from = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_POST['from']);
+ $to = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_POST['to']);
- $ignore_ips = mysql_query("SELECT ip FROM uts_ignoreips WHERE ip >= INET_ATON('$from') AND ip <= INET_ATON('$to')");
+ $ignore_ips = mysqli_query($GLOBALS["___mysqli_link"], "SELECT ip FROM uts_ignoreips WHERE ip >= INET_ATON('$from') AND ip <= INET_ATON('$to')");
$extended_query = "WHERE ip >= INET_ATON('$from') AND ip <= INET_ATON('$to')";
$i=0;
- while($ignore_ips_array = mysql_fetch_array($ignore_ips)) {
+ while($ignore_ips_array = mysqli_fetch_array($ignore_ips)) {
$ip = $ignore_ips_array[0];
$extended_query .= " AND ";
$extended_query .= "ip <> '".$ip."'";
@@ -229,9 +229,9 @@ if($_GET['manignore'] == "true") { // Query for list of unique ips and player ids
$sql_pipcheck = "SELECT ip, COUNT(DISTINCT pid) AS pidcount FROM uts_player ".$extended_query." GROUP BY ip ORDER BY ip ASC";
- $q_pipcheck = mysql_query($sql_pipcheck) or die(mysql_error());
- if(mysql_num_rows($q_pipcheck) > 0) {
- while ($r_pipcheck = mysql_fetch_array($q_pipcheck)) {
+ $q_pipcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pipcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ if(mysqli_num_rows($q_pipcheck) > 0) {
+ while ($r_pipcheck = mysqli_fetch_array($q_pipcheck)) {
$playerip = $r_pipcheck[ip];
$trueplayerip = long2ip($playerip);
@@ -244,8 +244,8 @@ if($_GET['manignore'] == "true") { // Query for player names and ids associated to that ip during the cycle
$sql_pcheck = "SELECT pi.id, pi.name, pi.country, p.pid, p.ip FROM uts_pinfo AS pi, uts_player AS p WHERE pi.id = p.pid AND p.ip = $playerip GROUP BY pi.id, pi.name, p.pid, p.ip, pi.country";
- $q_pcheck = mysql_query($sql_pcheck) or die(mysql_error());
- while ($r_pcheck = mysql_fetch_array($q_pcheck)) {
+ $q_pcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_pcheck = mysqli_fetch_array($q_pcheck)) {
echo '<br><a class="darkhuman" href="admin.php?key='.$adminkey.'&action=pinfo&pid='.$r_pcheck[pid].'">'.FormatPlayerName($r_pcheck[country], $r_pcheck['pid'], $r_pcheck['name']).'</a> ';
}
echo "<br><INPUT TYPE=\"SUBMIT\" VALUE=\"merge - $trueplayerip\" NAME=\"submit\">";
@@ -270,10 +270,10 @@ if($_GET['manignore'] == "true") { } else {
echo "<P>IP's linked with more than one nick<br><I>If you want to ignore some ip's, because for example different but unrelated nicks are associated with it, check these and press the button at the lower end to confirm this</I></P>";
- $ignore_ips = mysql_query("SELECT ip FROM uts_ignoreips");
+ $ignore_ips = mysqli_query($GLOBALS["___mysqli_link"], "SELECT ip FROM uts_ignoreips");
$extended_query = "";
$i=0;
- while($ignore_ips_array = mysql_fetch_array($ignore_ips)) {
+ while($ignore_ips_array = mysqli_fetch_array($ignore_ips)) {
$ip = $ignore_ips_array[0];
if($i==0)
$extended_query = " WHERE ";
@@ -288,9 +288,9 @@ if($_GET['manignore'] == "true") { // Query for list of unique ips and player ids
$sql_pipcheck = "SELECT ip, COUNT(DISTINCT pid) AS pidcount FROM uts_player ".$extended_query." GROUP BY ip ORDER BY ip ASC";
- $q_pipcheck = mysql_query($sql_pipcheck) or die(mysql_error());
- if(mysql_num_rows($q_pipcheck) > 0) {
- while ($r_pipcheck = mysql_fetch_array($q_pipcheck)) {
+ $q_pipcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pipcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ if(mysqli_num_rows($q_pipcheck) > 0) {
+ while ($r_pipcheck = mysqli_fetch_array($q_pipcheck)) {
$playerip = $r_pipcheck[ip];
$trueplayerip = long2ip($playerip);
@@ -303,8 +303,8 @@ if($_GET['manignore'] == "true") { // Query for player names and ids associated to that ip during the cycle
$sql_pcheck = "SELECT pi.id, pi.name, pi.country, p.pid, p.ip FROM uts_pinfo AS pi, uts_player AS p WHERE pi.id = p.pid AND p.ip = $playerip GROUP BY pi.id, pi.name, p.pid, p.ip, pi.country";
- $q_pcheck = mysql_query($sql_pcheck) or die(mysql_error());
- while ($r_pcheck = mysql_fetch_array($q_pcheck)) {
+ $q_pcheck = mysqli_query($GLOBALS["___mysqli_link"], $sql_pcheck) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_pcheck = mysqli_fetch_array($q_pcheck)) {
echo '<br><a class="darkhuman" href="admin.php?key='.$adminkey.'&action=pinfo&pid='.$r_pcheck[pid].'">'.FormatPlayerName($r_pcheck[country], $r_pcheck['pid'], $r_pcheck['name']).'</a> ';
}
echo "<br><INPUT TYPE=\"SUBMIT\" VALUE=\"merge - $trueplayerip\" NAME=\"submit\">";
diff --git a/html/pages/admin/recalcflags.php b/html/pages/admin/recalcflags.php index 2c88610..228247e 100644 --- a/html/pages/admin/recalcflags.php +++ b/html/pages/admin/recalcflags.php @@ -39,27 +39,27 @@ echo'</tr> echo'Recalculating pinfo table...<br>';
/* update pinfo table */
- $sql_pids = mysql_query("SELECT uts_pinfo.id as pid, uts_pinfo.country as country, uts_player.ip as ip FROM uts_pinfo, uts_player WHERE uts_pinfo.id = uts_player.pid GROUP BY uts_player.pid;") or die(mysql_error());
- while($sql_pid = mysql_fetch_array($sql_pids))
+ $sql_pids = mysqli_query($GLOBALS["___mysqli_link"], "SELECT uts_pinfo.id as pid, uts_pinfo.country as country, uts_player.ip as ip FROM uts_pinfo, uts_player WHERE uts_pinfo.id = uts_player.pid GROUP BY uts_player.pid;") or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while($sql_pid = mysqli_fetch_array($sql_pids))
{
$playercountry = strtolower(geoip_country_code_by_addr($gi,long2ip($sql_pid['ip'])));
if ($playercountry != $sql_pid['country'] )
{
- mysql_query("UPDATE uts_pinfo SET country = '$playercountry' WHERE id = '".$sql_pid['pid']."'") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_pinfo SET country = '$playercountry' WHERE id = '".$sql_pid['pid']."'") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
}
echo'Recalculating player table...<br>';
/* update player table */
- $sql_pids = mysql_query("SELECT pid, ip, country FROM uts_player");
- while ($sql_pid = mysql_fetch_array($sql_pids))
+ $sql_pids = mysqli_query($GLOBALS["___mysqli_link"], "SELECT pid, ip, country FROM uts_player");
+ while ($sql_pid = mysqli_fetch_array($sql_pids))
{
$playercountry = strtolower(geoip_country_code_by_addr($gi,long2ip($sql_pid['ip'])));
if ($playercountry != $sql_pid['country'])
{
- mysql_query("UPDATE uts_player SET country = '$playercountry' WHERE pid = '".$sql_pid['pid']."'") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "UPDATE uts_player SET country = '$playercountry' WHERE pid = '".$sql_pid['pid']."'") or die(mysqli_error($GLOBALS["___mysqli_link"]));
}
}
echo 'Done</td>
diff --git a/html/pages/admin/recalcranking.php b/html/pages/admin/recalcranking.php index 0065439..236687c 100644 --- a/html/pages/admin/recalcranking.php +++ b/html/pages/admin/recalcranking.php @@ -30,7 +30,7 @@ echo'<br><table border="0" cellpadding="0" cellspacing="0" width="600"> echo'<tr>
<td class="smheading" align="left" width="200">Deleting rankings</td>';
- mysql_query("TRUNCATE uts_rank") or die(mysql_error());
+ mysqli_query($GLOBALS["___mysqli_link"], "TRUNCATE uts_rank") or die(mysqli_error($GLOBALS["___mysqli_link"]));
echo'<td class="grey" align="left" width="400">Done</td>';
@@ -39,7 +39,7 @@ echo'</tr> <td class="smheading" align="left">Recalculating Rankings:</td>';
echo'<td class="grey" align="left">';
$playerbanned = false;
- $q_pm = mysql_query( " SELECT p.id,
+ $q_pm = mysqli_query($GLOBALS["___mysqli_link"], " SELECT p.id,
p.matchid,
p.pid,
p.gid,
@@ -53,7 +53,7 @@ echo'</tr> ORDER BY p.matchid ASC,
p.playerid ASC");
$i = 0;
- while ($r_pm = mysql_fetch_array($q_pm)) {
+ while ($r_pm = mysqli_fetch_array($q_pm)) {
$i++;
if ($i%50 == 0) {
echo '. ';
diff --git a/html/pages/credits.php b/html/pages/credits.php index 406bbf0..236c38c 100755 --- a/html/pages/credits.php +++ b/html/pages/credits.php @@ -148,7 +148,7 @@ Added an option to the admin page to delete temporary tables (if any)<br><br></dd>
<dd>Bug Fixes:<br>
- Import fix for MySQL v3.x<br>
+ Import fix for MySQL v3.x<br>
Partial Import delete fix<br>
bbcode and Clanbase Report Fix - not showing high score win reports.<br>
Ranking fix (was more than 300 mins to get full ranking points)<br>
diff --git a/html/pages/dpmatch.php b/html/pages/dpmatch.php index 2605249..0bc7043 100644 --- a/html/pages/dpmatch.php +++ b/html/pages/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,31 +65,31 @@ 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 From Match:</td>';
-mysql_query("DELETE FROM uts_player WHERE matchid = $matchid AND pid = $pid") or die(mysql_error());
+mysqli_query($GLOBALS["___mysqli_link"], "DELETE FROM uts_player 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">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/graph_mbreakdown.php b/html/pages/graph_mbreakdown.php index 677e0c1..da9bce1 100755 --- a/html/pages/graph_mbreakdown.php +++ b/html/pages/graph_mbreakdown.php @@ -7,11 +7,11 @@ $sql_ghours = "SELECT HOUR(time) AS res_hour, COUNT(*) AS res_count WHERE $bgwhere
GROUP by res_hour";
-$q_ghours = mysql_query($sql_ghours) or die(mysql_error());
+$q_ghours = mysqli_query($GLOBALS["___mysqli_link"], $sql_ghours) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$hour_max = 0;
$hour_sum = 0;
-while ($r_ghours = mysql_fetch_array($q_ghours)) {
+while ($r_ghours = mysqli_fetch_array($q_ghours)) {
$gb_hour[$r_ghours['res_hour']] = $r_ghours['res_count'];
if ($r_ghours['res_count'] > $hour_max) $hour_max = $r_ghours['res_count'];
$hour_sum += $r_ghours['res_count'];
@@ -26,11 +26,11 @@ $sql_gdays = "SELECT WEEKDAY(time) AS res_day, COUNT(*) AS res_count WHERE $bgwhere
GROUP by res_day";
-$q_gdays = mysql_query($sql_gdays) or die(mysql_error());
+$q_gdays = mysqli_query($GLOBALS["___mysqli_link"], $sql_gdays) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$day_max = 0;
$day_sum = 0;
-while ($r_gdays = mysql_fetch_array($q_gdays)) {
+while ($r_gdays = mysqli_fetch_array($q_gdays)) {
$gb_day[$r_gdays['res_day']] = $r_gdays['res_count'];
if ($r_gdays['res_count'] > $day_max) $day_max = $r_gdays['res_count'];
$day_sum += $r_gdays['res_count'];
@@ -42,11 +42,11 @@ $sql_gmonths = "SELECT MONTH(time) AS res_month, COUNT(*) AS res_count WHERE $bgwhere
GROUP by res_month";
-$q_gmonths = mysql_query($sql_gmonths) or die(mysql_error());
+$q_gmonths = mysqli_query($GLOBALS["___mysqli_link"], $sql_gmonths) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$month_max = 0;
$month_sum = 0;
-while ($r_gmonths = mysql_fetch_array($q_gmonths)) {
+while ($r_gmonths = mysqli_fetch_array($q_gmonths)) {
$gb_month[$r_gmonths['res_month']] = $r_gmonths['res_count'];
if ($r_gmonths['res_count'] > $month_max) $month_max = $r_gmonths['res_count'];
$month_sum += $r_gmonths['res_count'];
@@ -73,12 +73,12 @@ $sql_gcountries = "SELECT country AS res_country, COUNT(*) AS res_count GROUP BY p.pid) AS res_table
GROUP BY res_country ORDER BY res_count DESC";
-$q_gcountries = mysql_query($sql_gcountries) or die(mysql_error());
+$q_gcountries = mysqli_query($GLOBALS["___mysqli_link"], $sql_gcountries) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$country_max = 0;
$country_sum = 0;
$i = 0;
-while ($r_gcountries = mysql_fetch_array($q_gcountries)) {
+while ($r_gcountries = mysqli_fetch_array($q_gcountries)) {
$gb_country[$i] = $r_gcountries['res_country'] . ";" . $r_gcountries['res_count'];
if ($r_gcountries['res_count'] > $country_max) $country_max = $r_gcountries['res_count'];
$country_sum += $r_gcountries['res_count'];
diff --git a/html/pages/graph_pbreakdown.php b/html/pages/graph_pbreakdown.php index b287865..9e99226 100644 --- a/html/pages/graph_pbreakdown.php +++ b/html/pages/graph_pbreakdown.php @@ -4,10 +4,10 @@ $max_height = 80; // Hourly Breakdown
$sql_ghours = "SELECT HOUR(m.time) AS res_hour, COUNT(p.id) AS res_count
FROM uts_match m, uts_player p WHERE $bgwhere AND m.id = p.matchid GROUP by res_hour";
-$q_ghours = mysql_query($sql_ghours) or die(mysql_error());
+$q_ghours = mysqli_query($GLOBALS["___mysqli_link"], $sql_ghours) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$hour_max = 0;
$hour_sum = 0;
-while ($r_ghours = mysql_fetch_array($q_ghours)) {
+while ($r_ghours = mysqli_fetch_array($q_ghours)) {
$gb_hour[$r_ghours['res_hour']] = $r_ghours['res_count'];
if ($r_ghours['res_count'] > $hour_max) $hour_max = $r_ghours['res_count'];
$hour_sum += $r_ghours['res_count'];
@@ -18,10 +18,10 @@ if ($hour_max == 0) return; // We use WEEKDAY rather then DAYOFWEEK because now the week starts with Monday instead of Sunday
$sql_gdays = "SELECT WEEKDAY(time) AS res_day, COUNT(*) AS res_count
FROM uts_match m, uts_player p WHERE $bgwhere AND m.id = p.matchid GROUP by res_day";
-$q_gdays = mysql_query($sql_gdays) or die(mysql_error());
+$q_gdays = mysqli_query($GLOBALS["___mysqli_link"], $sql_gdays) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$day_max = 0;
$day_sum = 0;
-while ($r_gdays = mysql_fetch_array($q_gdays)) {
+while ($r_gdays = mysqli_fetch_array($q_gdays)) {
$gb_day[$r_gdays['res_day']] = $r_gdays['res_count'];
if ($r_gdays['res_count'] > $day_max) $day_max = $r_gdays['res_count'];
$day_sum += $r_gdays['res_count'];
@@ -30,10 +30,10 @@ while ($r_gdays = mysql_fetch_array($q_gdays)) { // Monthly Breakdown
$sql_gmonths = "SELECT MONTH(m.time) AS res_month, COUNT(p.id) AS res_count
FROM uts_match m, uts_player p WHERE $bgwhere AND m.id = p.matchid GROUP by res_month";
-$q_gmonths = mysql_query($sql_gmonths) or die(mysql_error());
+$q_gmonths = mysqli_query($GLOBALS["___mysqli_link"], $sql_gmonths) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$month_max = 0;
$month_sum = 0;
-while ($r_gmonths = mysql_fetch_array($q_gmonths)) {
+while ($r_gmonths = mysqli_fetch_array($q_gmonths)) {
$gb_month[$r_gmonths['res_month']] = $r_gmonths['res_count'];
if ($r_gmonths['res_count'] > $month_max) $month_max = $r_gmonths['res_count'];
$month_sum += $r_gmonths['res_count'];
diff --git a/html/pages/home.php b/html/pages/home.php index fc419af..c86ecab 100755 --- a/html/pages/home.php +++ b/html/pages/home.php @@ -79,9 +79,9 @@ echo ' </tr>';
$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 10";
-$q_recent = mysql_query($sql_recent) or die(mysql_error());
+$q_recent = mysqli_query($GLOBALS["___mysqli_link"], $sql_recent) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_recent = mysql_fetch_array($q_recent)) {
+while ($r_recent = mysqli_fetch_array($q_recent)) {
$r_time = mdate($r_recent[time]);
$r_mapfile = un_ut($r_recent[mapfile]);
$r_gametime = GetMinutes($r_recent[gametime]);
@@ -192,9 +192,9 @@ $sql_gamesummary = "SELECT g.id AS gid, g.name AS gamename, SUM(p.frags) AS frag GROUP BY gamename, gid
ORDER BY gamename ASC";
-$q_gamesummary = mysql_query($sql_gamesummary) or die(mysql_error());
+$q_gamesummary = mysqli_query($GLOBALS["___mysqli_link"], $sql_gamesummary) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_gamesummary = mysql_fetch_array($q_gamesummary)) {
+while ($r_gamesummary = mysqli_fetch_array($q_gamesummary)) {
$gid = $r_gamesummary[gid];
$q_gametime = small_query("SELECT SUM(gametime) AS gametime FROM uts_match WHERE gid = '$gid'");
diff --git a/html/pages/maps.php b/html/pages/maps.php index bd1106e..4baa5f7 100644 --- a/html/pages/maps.php +++ b/html/pages/maps.php @@ -95,8 +95,8 @@ 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)) {
+ $q_game = mysqli_query($GLOBALS["___mysqli_link"], $sql_game) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_game = mysqli_fetch_array($q_game)) {
$selected = ($r_game['gid'] == $gid) ? 'selected' : '';
echo '<option '.$selected.' value="'.$r_game['gid'].'">'. $r_game['name'] .'</option>';
}
@@ -120,9 +120,9 @@ echo '</select> $sql_maps = "SELECT IF(RIGHT(mapfile,4) LIKE '.unr', mapfile, CONCAT(mapfile, '.unr')) as mapfile, COUNT(id) AS matchcount, AVG(frags) AS frags, AVG(t0score+t1score+t2score+t3score) AS matchscore, SUM(gametime) AS gametime
FROM uts_match" . $sql_condition . " GROUP BY mapfile ORDER BY $filter $sort LIMIT $qpage,25";
-$q_maps = mysql_query($sql_maps) or die(mysql_error());
+$q_maps = mysqli_query($GLOBALS["___mysqli_link"], $sql_maps) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_maps = mysql_fetch_array($q_maps)) {
+while ($r_maps = mysqli_fetch_array($q_maps)) {
$r_mapfile = un_ut($r_maps[mapfile]);
$myurl = urlencode($r_mapfile);
$r_gametime = GetMinutes($r_maps[gametime]);
diff --git a/html/pages/maps_info.php b/html/pages/maps_info.php index fc0a9e3..46033c9 100644 --- a/html/pages/maps_info.php +++ b/html/pages/maps_info.php @@ -1,6 +1,6 @@ <?php
-$map = mysql_real_escape_string($_GET[map]);
-$bugmap = mysql_real_escape_string($_GET[map]);
+$map = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_GET[map]);
+$bugmap = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_GET[map]);
$realmap = $bugmap.".unr";
$map_matches = small_query("SELECT COUNT(id) as matchcount, SUM(t0score+t1score+t2score+t3score) AS gamescore,
@@ -226,9 +226,9 @@ if($map_matches[gametime]<= 0) { $sql_maps = "SELECT m.id, m.time, g.name AS gamename, m.gametime
FROM uts_match AS m, uts_games AS g WHERE (m.mapfile = '$realmap' OR m.mapfile = '$bugmap') AND m.gid = g.id ORDER BY time DESC LIMIT $qpage,25";
- $q_maps = mysql_query($sql_maps) or die(mysql_error());
+ $q_maps = mysqli_query($GLOBALS["___mysqli_link"], $sql_maps) or die(mysqli_error($GLOBALS["___mysqli_link"]));
- while ($r_maps = mysql_fetch_array($q_maps)) {
+ while ($r_maps = mysqli_fetch_array($q_maps)) {
$r_mapfile = un_ut($r_maps[mapfile]);
$r_matchtime = mdate($r_maps[time]);
$r_gametime = GetMinutes($r_maps[gametime]);
@@ -291,9 +291,9 @@ if($map_matches[gametime]<= 0) { if ($cpage == "$lpage") { $lpageurl = "[Last]"; }
$sql_btrecords = "SELECT pi.id, pi.name AS name, pi.country, e.col3 AS time, e.col4 AS date FROM uts_events AS e, uts_pinfo AS pi, uts_player AS p, uts_match AS m WHERE m.id = e.matchid AND m.id = p.matchid AND p.playerid = e.playerid AND pi.id = p.pid AND (m.mapfile = '$realmap' OR m.mapfile = '$bugmap') AND e.col1 = 'btcap' GROUP BY pi.id ORDER BY (0 + e.col3) ASC, e.col4 ASC LIMIT $qpage,25";
- $q_btrecords = mysql_query($sql_btrecords) or die (mysql_error());
+ $q_btrecords = mysqli_query($GLOBALS["___mysqli_link"], $sql_btrecords) or die (mysqli_error($GLOBALS["___mysqli_link"]));
- if (mysql_num_rows($q_btrecords) > 0) {
+ if (mysqli_num_rows($q_btrecords) > 0) {
echo '
<div class="pages">Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' / '.$ppageurl.' / '.$npageurl.' / '.$lpageurl.'</div>
<table class="zebra box" border="0" cellpadding="0" cellspacing="0" width="700">
@@ -311,7 +311,7 @@ if($map_matches[gametime]<= 0) { $i = $qpage;
$lasttime = -1;
- while ($r_btrecords = mysql_fetch_array($q_btrecords)) {
+ while ($r_btrecords = mysqli_fetch_array($q_btrecords)) {
$i++;
$class = ($i%2) ? 'grey' : 'grey2';
echo '
diff --git a/html/pages/match_info_bt.php b/html/pages/match_info_bt.php index 16bee03..81b11fa 100644 --- a/html/pages/match_info_bt.php +++ b/html/pages/match_info_bt.php @@ -35,9 +35,9 @@ $sql_msred = "SELECT p.playerid, pi.name, pi.banned, p.country, p.pid, p.gamesco WHERE p.pid = pi.id AND p.matchid = $mid AND team = 0
GROUP BY p.playerid
ORDER BY e.col1 DESC, (0 + e.col3) ASC, gamescore DESC";
-$q_msred = mysql_query($sql_msred) or die(mysql_error());
+$q_msred = mysqli_query($GLOBALS["___mysqli_link"], $sql_msred) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
-while ($r_msred = zero_out(mysql_fetch_array($q_msred))) {
+while ($r_msred = zero_out(mysqli_fetch_array($q_msred))) {
if (!$r_msred['playerid']) {
$r_msred['playerid'] = 0;
}
@@ -108,9 +108,9 @@ $sql_msblue = "SELECT p.playerid, pi.name, pi.banned, p.country, p.pid, p.gamesc WHERE p.pid = pi.id AND p.matchid = $mid AND team = 1
GROUP BY p.playerid
ORDER BY e.col1 DESC, (0 + e.col3) ASC, gamescore DESC";
-$q_msblue = mysql_query($sql_msblue) or die(mysql_error());
+$q_msblue = mysqli_query($GLOBALS["___mysqli_link"], $sql_msblue) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
-while ($r_msblue = zero_out(mysql_fetch_array($q_msblue))) {
+while ($r_msblue = zero_out(mysqli_fetch_array($q_msblue))) {
if (!$r_msblue['playerid']) {
$r_msblue['playerid'] = 0;
}
diff --git a/html/pages/match_info_charts.php b/html/pages/match_info_charts.php index ed62fe5..549d00d 100644 --- a/html/pages/match_info_charts.php +++ b/html/pages/match_info_charts.php @@ -5,25 +5,25 @@ include_once 'includes/renderer-general-output.php'; global $renderer_heigth; global $renderer_width; -$mid = mysql_real_escape_string($mid); +$mid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $mid); $prevCategory = ""; $chartOutput = ""; $prevRenderedChart = ""; // get all charts for this match -$charts = mysql_query("SELECT d.* , t.charttype, t.category, t.type, t.color, t.layout,t.columns +$charts = mysqli_query($GLOBALS["___mysqli_link"], "SELECT d.* , t.charttype, t.category, t.type, t.color, t.layout,t.columns FROM uts_chartdata d JOIN uts_charttypes t ON d.chartid = t.id WHERE d.mid = $mid - ORDER BY d.id ASC") or die(mysql_error()); + ORDER BY d.id ASC") or die(mysqli_error($GLOBALS["___mysqli_link"])); -$chartCount = mysql_num_rows($charts); +$chartCount = mysqli_num_rows($charts); if ($chartCount >0) { $i = 0; // cycle over charts - while ($chart = mysql_fetch_array($charts)) { + while ($chart = mysqli_fetch_array($charts)) { // retrieve both generic as the specific data $category = $chart['category']; diff --git a/html/pages/match_info_ctf.php b/html/pages/match_info_ctf.php index 378b831..c3d2983 100644 --- a/html/pages/match_info_ctf.php +++ b/html/pages/match_info_ctf.php @@ -28,10 +28,10 @@ echo' $sql_msred = "SELECT p.playerid, pi.name, pi.banned, p.country, p.pid, p.gamescore, p.flag_taken, p.flag_pickedup, p.flag_dropped, p.flag_assist, p.flag_cover, p.flag_seal, p.flag_capture, p.flag_kill, p.flag_return, p.rank
FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $mid AND team = 0 ORDER BY gamescore DESC";
-$q_msred = mysql_query($sql_msred) or die(mysql_error());
+$q_msred = mysqli_query($GLOBALS["___mysqli_link"], $sql_msred) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
-while ($r_msred = zero_out(mysql_fetch_array($q_msred))) {
+while ($r_msred = zero_out(mysqli_fetch_array($q_msred))) {
$i++;
$class = ($i % 2) ? 'grey' : 'grey2';
@@ -114,10 +114,10 @@ echo' $sql_msblue = "SELECT p.playerid, pi.name, pi.banned, p.country, p.pid, p.gamescore, p.flag_taken, p.flag_pickedup, p.flag_dropped, p.flag_assist, p.flag_cover, p.flag_seal, p.flag_capture, p.flag_kill, p.flag_return, p.rank
FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $mid AND team = 1 ORDER BY gamescore DESC";
-$q_msblue = mysql_query($sql_msblue) or die(mysql_error());
+$q_msblue = mysqli_query($GLOBALS["___mysqli_link"], $sql_msblue) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
-while ($r_msblue = zero_out(mysql_fetch_array($q_msblue))) {
+while ($r_msblue = zero_out(mysqli_fetch_array($q_msblue))) {
$i++;
$class = ($i % 2) ? 'grey' : 'grey2';
@@ -203,10 +203,10 @@ if ($greencheck > 0) { $sql_msgreen = "SELECT p.playerid, pi.name, pi.banned, p.country, p.pid, p.gamescore, p.flag_taken, p.flag_pickedup, p.flag_dropped, p.flag_assist, p.flag_cover, p.flag_seal, p.flag_capture, p.flag_kill, p.flag_return, p.rank
FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $mid AND team = 2 ORDER BY gamescore DESC";
- $q_msgreen = mysql_query($sql_msgreen) or die(mysql_error());
+ $q_msgreen = mysqli_query($GLOBALS["___mysqli_link"], $sql_msgreen) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
- while ($r_msgreen = zero_out(mysql_fetch_array($q_msgreen))) {
+ while ($r_msgreen = zero_out(mysqli_fetch_array($q_msgreen))) {
$i++;
$class = ($i % 2) ? 'grey' : 'grey2';
@@ -293,10 +293,10 @@ if ($goldcheck > 0) { $sql_msgold = "SELECT p.playerid, pi.name, pi.banned, p.country, p.pid, p.gamescore, p.flag_taken, p.flag_pickedup, p.flag_dropped, p.flag_assist, p.flag_cover, p.flag_seal, p.flag_capture, p.flag_kill, p.flag_return, p.rank
FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $mid AND team = 3 ORDER BY gamescore DESC";
- $q_msgold = mysql_query($sql_msgold) or die(mysql_error());
+ $q_msgold = mysqli_query($GLOBALS["___mysqli_link"], $sql_msgold) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
- while ($r_msgold = zero_out(mysql_fetch_array($q_msgold))) {
+ while ($r_msgold = zero_out(mysqli_fetch_array($q_msgold))) {
$i++;
$class = ($i % 2) ? 'grey' : 'grey2';
diff --git a/html/pages/match_info_killsmatrix.php b/html/pages/match_info_killsmatrix.php index 3083419..41e6f8a 100644 --- a/html/pages/match_info_killsmatrix.php +++ b/html/pages/match_info_killsmatrix.php @@ -13,8 +13,8 @@ $sql_km = "SELECT killer, victim, kills FROM uts_killsmatrix
WHERE matchid = $mid;";
-$q_km = mysql_query($sql_km) or die(mysql_error());
-while ($r_km = mysql_fetch_array($q_km)) {
+$q_km = mysqli_query($GLOBALS["___mysqli_link"], $sql_km) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+while ($r_km = mysqli_fetch_array($q_km)) {
$km[intval($r_km['killer'])][intval($r_km['victim'])] = $r_km['kills'];
}
@@ -40,8 +40,8 @@ $sql_players = " SELECT p.pid, AND matchid = '$mid'
ORDER BY team ASC,
gamescore DESC;";
-$q_players = mysql_query($sql_players) or die(mysql_error());
-while ($r_players = mysql_fetch_array($q_players)) {
+$q_players = mysqli_query($GLOBALS["___mysqli_link"], $sql_players) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+while ($r_players = mysqli_fetch_array($q_players)) {
$players[intval($r_players['playerid'])] = array( 'pid' => $r_players['pid'],
'name' => $r_players['name'],
'country' => $r_players['country'],
diff --git a/html/pages/match_info_lms.php b/html/pages/match_info_lms.php index 3caffaa..21ba6c4 100644 --- a/html/pages/match_info_lms.php +++ b/html/pages/match_info_lms.php @@ -30,7 +30,7 @@ GROUP BY p.playerid
ORDER BY p.gamescore DESC, (0+e.col2) DESC";
- $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;
$totals['gamescore'] = 0;
@@ -45,7 +45,7 @@ $totals['ttl'] = 0;
$num = 0;
- while ($r_players = zero_out(mysql_fetch_array($q_players))) {
+ while ($r_players = zero_out(mysqli_fetch_array($q_players))) {
if ($header) {
$header = false;
echo '
diff --git a/html/pages/match_info_other.php b/html/pages/match_info_other.php index 63e840e..9013468 100755 --- a/html/pages/match_info_other.php +++ b/html/pages/match_info_other.php @@ -38,10 +38,10 @@ $sql_multis = "SELECT p.pid, pi.name, p.country, SUM(spree_double) AS spree_doub GROUP BY pid, p.country
ORDER BY name ASC";
-$q_multis = mysql_query($sql_multis) or die(mysql_error());
+$q_multis = mysqli_query($GLOBALS["___mysqli_link"], $sql_multis) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
-while ($r_multis = zero_out(mysql_fetch_array($q_multis))) {
+while ($r_multis = zero_out(mysqli_fetch_array($q_multis))) {
$i++;
$class = ($i % 2) ? 'grey' : 'grey2';
$r_pname = $r_multis[name];
@@ -76,10 +76,10 @@ if ((strpos($gamename, '(insta)') === false) && (strpos($gamename, "Last Man Sta GROUP BY pid, p.country
ORDER BY name ASC";
- $q_pickups = mysql_query($sql_pickups) or die(mysql_error());
+ $q_pickups = mysqli_query($GLOBALS["___mysqli_link"], $sql_pickups) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
- while ($r_pickups = zero_out(mysql_fetch_array($q_pickups))) {
+ while ($r_pickups = zero_out(mysqli_fetch_array($q_pickups))) {
$i++;
$class = ($i % 2) ? 'grey' : 'grey2';
$r_pname = $r_pickups[name];
diff --git a/html/pages/match_info_other2.php b/html/pages/match_info_other2.php index e25d426..6c1594f 100644 --- a/html/pages/match_info_other2.php +++ b/html/pages/match_info_other2.php @@ -28,9 +28,9 @@ echo' $sql_pickups = "SELECT p.pid, pi.name, p.country, SUM(p.pu_pads) AS pu_pads, SUM(p.pu_armour) AS pu_armour, SUM(p.pu_keg) AS pu_keg,
SUM(p.pu_invis) AS pu_invis, SUM(p.pu_belt) AS pu_belt, SUM(p.pu_amp) AS pu_amp
FROM uts_player as p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' AND matchid = $mid GROUP BY pid ORDER BY name ASC";
-$q_pickups = mysql_query($sql_pickups) or die(mysql_error());
+$q_pickups = mysqli_query($GLOBALS["___mysqli_link"], $sql_pickups) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
-while ($r_pickups = zero_out(mysql_fetch_array($q_pickups))) {
+while ($r_pickups = zero_out(mysqli_fetch_array($q_pickups))) {
$i++;
$class = ($i % 2) ? 'grey' : 'grey2';
@@ -70,9 +70,9 @@ IF($mid2 == NULL) { $sql_pickups = "SELECT p.pid, pi.name, p.country, SUM(p.pu_pads) AS pu_pads, SUM(p.pu_armour) AS pu_armour, SUM(p.pu_keg) AS pu_keg,
SUM(p.pu_invis) AS pu_invis, SUM(p.pu_belt) AS pu_belt, SUM(p.pu_amp) AS pu_amp
FROM uts_player as p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' AND matchid = $mid2 GROUP BY pid ORDER BY name ASC";
- $q_pickups = mysql_query($sql_pickups) or die(mysql_error());
+ $q_pickups = mysqli_query($GLOBALS["___mysqli_link"], $sql_pickups) or die(mysqli_error($GLOBALS["___mysqli_link"]));
$i = 0;
- while ($r_pickups = zero_out(mysql_fetch_array($q_pickups))) {
+ while ($r_pickups = zero_out(mysqli_fetch_array($q_pickups))) {
$i++;
$class = ($i % 2) ? 'grey' : 'grey2';
diff --git a/html/pages/players.php b/html/pages/players.php index b038405..323eb4f 100755 --- a/html/pages/players.php +++ b/html/pages/players.php @@ -100,9 +100,9 @@ echo' $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());
+$q_plist = mysqli_query($GLOBALS["___mysqli_link"], $sql_plist) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_plist = mysql_fetch_array($q_plist)) {
+while ($r_plist = mysqli_fetch_array($q_plist)) {
$gametime = sec2hour($r_plist[gametime]);
$eff = get_dp($r_plist[eff]);
$acc = get_dp($r_plist[accuracy]);
diff --git a/html/pages/players_explain_ranking.php b/html/pages/players_explain_ranking.php index 4648c3c..705a9a8 100644 --- a/html/pages/players_explain_ranking.php +++ b/html/pages/players_explain_ranking.php @@ -87,9 +87,9 @@ echo ' if ($real_gamename == "Bunny Track") {
$sql_btmaprank = "SELECT e.col2 AS no, COUNT(e.col2) AS count FROM uts_events AS e, uts_player AS p WHERE p.pid = $pid AND p.gid = $gid AND p.playerid = e.playerid AND e.matchid = p.matchid AND e.col2 > 0 AND e.col2 <= 5 GROUP BY e.col2";
- $q_btmaprank = mysql_query($sql_btmaprank) or die ("Can't retrieve \$q_btmaprank: ". mysql_error());
+ $q_btmaprank = mysqli_query($GLOBALS["___mysqli_link"], $sql_btmaprank) or die ("Can't retrieve \$q_btmaprank: ". mysqli_error($GLOBALS["___mysqli_link"]));
$mapranks = array();
- while($r_btmaprank = mysql_fetch_assoc($q_btmaprank)) {
+ while($r_btmaprank = mysqli_fetch_assoc($q_btmaprank)) {
$mapranks[$r_btmaprank[no]] = $r_btmaprank[count];
}
diff --git a/html/pages/players_info.php b/html/pages/players_info.php index 746bac1..160cb72 100755 --- a/html/pages/players_info.php +++ b/html/pages/players_info.php @@ -2,7 +2,7 @@ global $pic_enable;
$pid = isset($pid) ? $pid : $_GET['pid'];
-$pid = mysql_real_escape_string(preg_replace('/\D/', '', $pid));
+$pid = mysqli_real_escape_string($GLOBALS["___mysqli_link"], preg_replace('/\D/', '', $pid));
$r_info = small_query("SELECT name, country, banned FROM uts_pinfo WHERE id = '$pid'");
@@ -74,8 +74,8 @@ if (isset($_GET['pics'])) { echo '</tr></table><br><br>';
}
if (!$disp) {
- echo "Sorry, no pictures in this category";
- }
+ echo "Sorry, no pictures in this category";
+ }
echo '</div>';
return;
}
@@ -83,7 +83,7 @@ if (isset($_GET['pics'])) { echo '
<table class="zebra box" border="0" cellpadding="0" cellspacing="0" width="700">
<tbody>
- <tr>
+ <tr>
<th class="heading" colspan="14" align="center">Career Summary for '.htmlentities($playername).' ';
if (PlayerOnWatchlist($pid)) {
@@ -111,47 +111,48 @@ echo '</th> <th class="smheading" align="center">Hours</th>
</tr>';
-$sql_plist = "SELECT
- g.name AS gamename,
- SUM(p.gamescore) AS gamescore,
- COUNT(p.gamescore) as played,
- SUM(p.frags) AS frags,
- SUM(p.kills) AS kills,
- SUM(p.deaths) AS deaths,
- SUM(p.suicides) AS suicides,
- SUM(p.teamkills) AS teamkills,
- SUM(p.kills+p.deaths+p.suicides+p.teamkills) AS sumeff,
- AVG(p.accuracy) AS accuracy,
- AVG(p.ttl) AS ttl,
- SUM(IF(
- p.team = 0,
- IF((m.t0score > m.t1score AND m.t0score > m.t2score AND m.t0score > m.t3score), 1, 0),
- IF(
- p.team = 1,
- IF((m.t1score > m.t0score AND m.t1score > m.t2score AND m.t1score > m.t3score), 1, 0),
- IF(
- p.team = 2,
- IF((m.t2score > m.t0score AND m.t2score > m.t1score AND m.t2score > m.t3score), 1, 0),
- IF((m.t3score > m.t0score AND m.t3score > m.t1score AND m.t3score > m.t2score), 1, 0)
- )
+$sql_plist = "SELECT
+ g.name AS gamename,
+ SUM(p.gamescore) AS gamescore,
+ COUNT(p.gamescore) as played,
+ SUM(p.frags) AS frags,
+ SUM(p.kills) AS kills,
+ SUM(p.deaths) AS deaths,
+ SUM(p.suicides) AS suicides,
+ SUM(p.teamkills) AS teamkills,
+ SUM(p.kills+p.deaths+p.suicides+p.teamkills) AS sumeff,
+ AVG(p.accuracy) AS accuracy,
+ AVG(p.ttl) AS ttl,
+ SUM(IF(
+ p.team = 0,
+ IF((m.t0score > m.t1score AND m.t0score > m.t2score AND m.t0score > m.t3score), 1, 0),
+ IF(
+ p.team = 1,
+ IF((m.t1score > m.t0score AND m.t1score > m.t2score AND m.t1score > m.t3score), 1, 0),
+ IF(
+ p.team = 2,
+ IF((m.t2score > m.t0score AND m.t2score > m.t1score AND m.t2score > m.t3score), 1, 0),
+ IF((m.t3score > m.t0score AND m.t3score > m.t1score AND m.t3score > m.t2score), 1, 0)
+ )
)
-)) as wins,
- COUNT(p.id) AS games,
- SUM(p.gametime) as gametime
- FROM
- uts_player AS p,
- uts_games AS g,
- uts_match as m
- WHERE
- p.gid = g.id AND m.id = p.matchid
- AND
- p.pid = '$pid'
- GROUP BY
- p.gid";
-
-$q_plist = mysql_query($sql_plist) or die(mysql_error());
-
-while ($r_plist = mysql_fetch_array($q_plist)) {
+ )
+ ) as wins,
+ COUNT(p.id) AS games,
+ SUM(p.gametime) as gametime
+ FROM
+ uts_player AS p,
+ uts_games AS g,
+ uts_match as m
+ WHERE
+ p.gid = g.id AND m.id = p.matchid
+ AND
+ p.pid = '$pid'
+ GROUP BY
+ p.gid";
+
+$q_plist = mysqli_query($GLOBALS["___mysqli_link"], $sql_plist) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+
+while ($r_plist = mysqli_fetch_array($q_plist)) {
$gametime = sec2hour($r_plist[gametime]);
$eff = get_dp($r_plist[kills]/$r_plist[sumeff]*100);
$acc = get_dp($r_plist[accuracy]);
@@ -170,29 +171,33 @@ while ($r_plist = mysql_fetch_array($q_plist)) { <td align="center">'.$eff.'</td>
<td align="center">'.$acc.'</td>
<td align="center">'.$ttl.'</td>
- <td align="center">'.$r_plist[games].'</td>
- <td align="center">'.$r_plist[wins].'</td>
- <td align="center">'.$winpercent.'%</td>
+ <td align="center">'.$r_plist[games].'</td>
+ <td align="center">'.$r_plist[wins].'</td>
+ <td align="center">'.$winpercent.'%</td>
<td align="center">'.$gametime.'</td>
</tr>';
}
$r_sumplist = small_query("SELECT 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, SUM(p.teamkills) AS teamkills, SUM(p.kills+p.deaths+p.suicides+p.teamkills) AS sumeff,
-AVG(p.accuracy) AS accuracy, AVG(p.ttl) AS ttl, COUNT(p.id) AS games, SUM(IF(
- p.team = 0,
- IF((m.t0score > m.t1score AND m.t0score > m.t2score AND m.t0score > m.t3score), 1, 0),
- IF(
- p.team = 1,
- IF((m.t1score > m.t0score AND m.t1score > m.t2score AND m.t1score > m.t3score), 1, 0),
- IF(
- p.team = 2,
- IF((m.t2score > m.t0score AND m.t2score > m.t1score AND m.t2score > m.t3score), 1, 0),
- IF((m.t3score > m.t0score AND m.t3score > m.t1score AND m.t3score > m.t2score), 1, 0)
- )
+ SUM(p.suicides) AS suicides, SUM(p.teamkills) AS teamkills, SUM(p.kills+p.deaths+p.suicides+p.teamkills) AS sumeff,
+ AVG(p.accuracy) AS accuracy, AVG(p.ttl) AS ttl, COUNT(p.id) AS games,
+ SUM(IF(
+ p.team = 0,
+ IF((m.t0score > m.t1score AND m.t0score > m.t2score AND m.t0score > m.t3score), 1, 0),
+ IF(
+ p.team = 1,
+ IF((m.t1score > m.t0score AND m.t1score > m.t2score AND m.t1score > m.t3score), 1, 0),
+ IF(
+ p.team = 2,
+ IF((m.t2score > m.t0score AND m.t2score > m.t1score AND m.t2score > m.t3score), 1, 0),
+ IF((m.t3score > m.t0score AND m.t3score > m.t1score AND m.t3score > m.t2score), 1, 0)
)
-)) as wins, SUM(p.gametime) as gametime
-FROM uts_player p, uts_match m WHERE p.matchid = m.id AND pid = '$pid'");
+ )
+ )
+ ) as wins, SUM(p.gametime) as gametime
+ FROM uts_player p, uts_match m
+ WHERE p.matchid = m.id
+ AND pid = '$pid'");
$gametime = sec2hour($r_sumplist[gametime]);
$eff = get_dp($r_sumplist[kills]/$r_sumplist[sumeff]*100);
@@ -220,10 +225,10 @@ echo' </tbody></table>
<br>';
-$q_assgids = mysql_query("SELECT id FROM uts_games WHERE gamename LIKE '%Assault%';") or die(mysql_error());
+$q_assgids = mysqli_query($GLOBALS["___mysqli_link"], "SELECT id FROM uts_games WHERE gamename LIKE '%Assault%';") or die(mysqli_error($GLOBALS["___mysqli_link"]));
$assgids = array();
-while ($r_assgids = mysql_fetch_array($q_assgids)) {
+while ($r_assgids = mysqli_fetch_array($q_assgids)) {
$assgids[] = $r_assgids['id'];
}
@@ -377,9 +382,9 @@ ORDER BY m.mapfile,
0 + e.col3 ASC";
-$q_btrecords = mysql_query($sql_btrecords) or die (mysql_error());
+$q_btrecords = mysqli_query($GLOBALS["___mysqli_link"], $sql_btrecords) or die (mysqli_error($GLOBALS["___mysqli_link"]));
-if (mysql_num_rows($q_btrecords) > 0) {
+if (mysqli_num_rows($q_btrecords) > 0) {
echo '
<table class="zebra box" border="0" cellpadding="0" cellspacing="0" width="700">
<tbody>
@@ -393,7 +398,7 @@ if (mysql_num_rows($q_btrecords) > 0) { <th class="smheading" align="center" width="200">Date</th>
</tr>';
- while ($r_btrecords = mysql_fetch_array($q_btrecords)) {
+ while ($r_btrecords = mysqli_fetch_array($q_btrecords)) {
$map = un_ut($r_btrecords['map']);
$myurl = urlencode($map);
$maprank = 1 + small_count("SELECT DISTINCT p.pid AS rank FROM uts_player as p, uts_events AS e, uts_match as m WHERE (m.mapfile = '" . addslashes($map) . "' OR m.mapfile = '" . addslashes($map) . ".unr') AND m.id = e.matchid AND e.matchid = p.matchid AND e.playerid = p.playerid AND e.col3 < ".$r_btrecords['time'] . " AND e.col1 = 'btcap'");
@@ -423,7 +428,7 @@ echo '<table class="zebra box" border="0" cellpadding="0" cellspacing="0" width= <th class="smheading" align="center" width="140">Match Type</th>
<th class="smheading" align="center" width="80">Rank</th>
<th class="smheading" align="center" width="50">Matches</th>
-<th class="smheading" align="center" width="50">Explain</th>';
+ <th class="smheading" align="center" width="50">Explain</th>';
if ($pic_enable and basename($_SERVER['PATH_TRANSLATED']) != 'admin.php') {
echo '<th class="smheading" align="center" width="50">Pics</th>';
@@ -431,9 +436,9 @@ if ($pic_enable and basename($_SERVER['PATH_TRANSLATED']) != 'admin.php') { echo '</tr>';
$sql_rank = "SELECT g.name AS gamename, r.rank, r.prevrank, r.matches, r.gid, r.pid FROM uts_rank AS r, uts_games AS g WHERE r.gid = g.id AND r.pid = '$pid';";
-$q_rank = mysql_query($sql_rank) or die(mysql_error());
+$q_rank = mysqli_query($GLOBALS["___mysqli_link"], $sql_rank) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_rank = mysql_fetch_array($q_rank)) {
+while ($r_rank = mysqli_fetch_array($q_rank)) {
$r_no = small_query("SELECT (COUNT(*) + 1) AS no FROM uts_rank WHERE gid= '${r_rank['gid']}' and rank > ". get_dp($r_rank['rank']) ."9");
echo'<tr>
@@ -466,9 +471,9 @@ if ($r_pings and $r_pings['lowping']) { <th class="smheading" align="center" width="80">Max</th>
</tr>
<tr>
- <td align="center">'.ceil($r_pings['lowping']).'</td>
- <td align="center">'.ceil($r_pings['avgping']).'</td>
- <td align="center">'.ceil($r_pings['highping']).'</td>
+ <td align="center">'.ceil($r_pings['lowping']).'</td>
+ <td align="center">'.ceil($r_pings['avgping']).'</td>
+ <td align="center">'.ceil($r_pings['highping']).'</td>
</tr>
</tbody></table>';
}
@@ -485,7 +490,7 @@ $fpage = 0; if ($ecount < 1) { $lpage = 0; }
else { $lpage = $ecount2-1; }
-$cpage = mysql_real_escape_string(preg_replace('/\D/', '', $_REQUEST["page"]));
+$cpage = mysqli_real_escape_string($GLOBALS["___mysqli_link"], preg_replace('/\D/', '', $_REQUEST["page"]));
if ($cpage == "") { $cpage = "0"; }
$qpage = $cpage*50;
@@ -508,18 +513,18 @@ echo'</tr>'; $sql_recent = "SELECT m.id, m.time, g.name AS gamename, m.mapfile, INET_NTOA(p.ip) AS ip FROM uts_match m, uts_player p, uts_games g
WHERE p.pid = '$pid' AND m.id = p.matchid AND m.gid = g.id ORDER BY time DESC LIMIT $qpage,50";
-$q_recent = mysql_query($sql_recent) or die(mysql_error());
+$q_recent = mysqli_query($GLOBALS["___mysqli_link"], $sql_recent) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_recent = mysql_fetch_array($q_recent)) {
+while ($r_recent = mysqli_fetch_array($q_recent)) {
$r_time = mdate($r_recent[time]);
$r_mapfile = un_ut($r_recent[mapfile]);
echo'
<tr class="clickableRow" href="./?p=match&mid='.$r_recent[id].'">
- <td align="center">'.$r_recent[id].'</td>
- <td align="center"><a href="./?p=match&mid='.$r_recent[id].'">'.$r_time.'</a></td>
- <td align="center">'.$r_recent[gamename].'</td>
- <td align="center">'.$r_mapfile.'</td>';
+ <td align="center">'.$r_recent[id].'</td>
+ <td align="center"><a href="./?p=match&mid='.$r_recent[id].'">'.$r_time.'</a></td>
+ <td align="center">'.$r_recent[gamename].'</td>
+ <td align="center">'.$r_mapfile.'</td>';
if (isset($is_admin) and $is_admin) echo '<td align="center">'. $r_recent[ip].'</td>';
echo '</tr>';
diff --git a/html/pages/players_search.php b/html/pages/players_search.php index 133f46c..f40bfde 100644 --- a/html/pages/players_search.php +++ b/html/pages/players_search.php @@ -61,8 +61,8 @@ $sql_plist = "SELECT pi.name AS name, pi.country AS country, p.pid, COUNT(p.id) 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.name LIKE '%".$playersearch."%' AND pi.banned <> 'Y' GROUP BY name ORDER BY $filter $sort";
-$q_plist = mysql_query($sql_plist) or die(mysql_error());
-while ($r_plist = mysql_fetch_array($q_plist)) {
+$q_plist = mysqli_query($GLOBALS["___mysqli_link"], $sql_plist) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+while ($r_plist = mysqli_fetch_array($q_plist)) {
$gametime = sec2hour($r_plist[gametime]);
$eff = get_dp($r_plist[eff]);
diff --git a/html/pages/rank.php b/html/pages/rank.php index 4be751e..10d1409 100755 --- a/html/pages/rank.php +++ b/html/pages/rank.php @@ -1,8 +1,8 @@ <?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());
+$q_rgame = mysqli_query($GLOBALS["___mysqli_link"], $sql_rgame) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_rgame = mysql_fetch_array($q_rgame)) {
+while ($r_rgame = mysqli_fetch_array($q_rgame)) {
echo'
<table class="box zebra" border="0" cellpadding="0" cellspacing="0" width="700">
@@ -21,9 +21,9 @@ while ($r_rgame = mysql_fetch_array($q_rgame)) { $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());
+ $q_rplayer = mysqli_query($GLOBALS["___mysqli_link"], $sql_rplayer) or die(mysqli_error($GLOBALS["___mysqli_link"]));
- if (mysql_num_rows($q_rplayer) == 0) {
+ if (mysqli_num_rows($q_rplayer) == 0) {
echo '
<tr>
<th align="center" colspan = "4">No players entered the rankings yet.</th>
@@ -35,7 +35,7 @@ while ($r_rgame = mysql_fetch_array($q_rgame)) { <br>';
}
else {
- while ($r_rplayer = mysql_fetch_array($q_rplayer)) {
+ while ($r_rplayer = mysqli_fetch_array($q_rplayer)) {
$ranking++;
$myurl = urlencode($r_rplayer[name]);
diff --git a/html/pages/rank_extended.php b/html/pages/rank_extended.php index bd9c60e..6782469 100644 --- a/html/pages/rank_extended.php +++ b/html/pages/rank_extended.php @@ -56,8 +56,8 @@ echo' $ranking = $qpage;
$sql_rplayer = "SELECT pi.name, pi.country, r.rank, r.prevrank, r.matches, r.pid FROM uts_rank AS r, uts_pinfo AS pi WHERE r.pid = pi.id AND r.gid = '$gid' AND pi.banned <> 'Y' ORDER BY rank DESC LIMIT $qpage,25";
- $q_rplayer = mysql_query($sql_rplayer) or die(mysql_error());
- while ($r_rplayer = mysql_fetch_array($q_rplayer)) {
+ $q_rplayer = mysqli_query($GLOBALS["___mysqli_link"], $sql_rplayer) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_rplayer = mysqli_fetch_array($q_rplayer)) {
$ranking++;
echo'
diff --git a/html/pages/recent.php b/html/pages/recent.php index e95b195..29d9297 100755 --- a/html/pages/recent.php +++ b/html/pages/recent.php @@ -25,7 +25,7 @@ $fpage = 0; if ($ecount < 1) { $lpage = 0; }
else { $lpage = $ecount2-1; }
-$cpage = mysql_real_escape_string(preg_replace('/\D/', '', $_REQUEST["page"]));
+$cpage = mysqli_real_escape_string($GLOBALS["___mysqli_link"], preg_replace('/\D/', '', $_REQUEST["page"]));
if ($cpage == "") { $cpage = "0"; }
$qpage = $cpage*25;
@@ -95,9 +95,9 @@ 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());
+$q_game = mysqli_query($GLOBALS["___mysqli_link"], $sql_game) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_game = mysql_fetch_array($q_game)) {
+while ($r_game = mysqli_fetch_array($q_game)) {
$selected = ($r_game['gid'] == $gid) ? 'selected' : '';
echo '<option '.$selected.' value="'.$r_game['gid'].'">'. $r_game['name'] .'</option>';
}
@@ -115,10 +115,10 @@ echo ' <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, 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());
+$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 ".mysqli_real_escape_string($GLOBALS["___mysqli_link"], $qpage).",50";
+$q_recent = mysqli_query($GLOBALS["___mysqli_link"], $sql_recent) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_recent = mysql_fetch_array($q_recent)) {
+while ($r_recent = mysqli_fetch_array($q_recent)) {
$r_time = mdate($r_recent[time]);
$r_mapfile = un_ut($r_recent[mapfile]);
$r_gametime = GetMinutes($r_recent[gametime]);
diff --git a/html/pages/report/bbcode.php b/html/pages/report/bbcode.php index 09c65a7..b6475ff 100644 --- a/html/pages/report/bbcode.php +++ b/html/pages/report/bbcode.php @@ -220,8 +220,8 @@ echo'[b]'.$teama.' Lineup[/b] ';
$sql_rplayer = "SELECT p.id, pi.name FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $id AND team = 0 ORDER BY pi.name ASC";
-$q_rplayer = mysql_query($sql_rplayer);
-while ($r_rplayer = mysql_fetch_array($q_rplayer)) {
+$q_rplayer = mysqli_query($GLOBALS["___mysqli_link"], $sql_rplayer);
+while ($r_rplayer = mysqli_fetch_array($q_rplayer)) {
echo''.$r_rplayer[name].'
';
@@ -234,8 +234,8 @@ echo' ';
$sql_bplayer = "SELECT p.id, pi.name FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $id AND team = 1 ORDER BY pi.name ASC";
-$q_bplayer = mysql_query($sql_bplayer);
-while ($r_bplayer = mysql_fetch_array($q_bplayer)) {
+$q_bplayer = mysqli_query($GLOBALS["___mysqli_link"], $sql_bplayer);
+while ($r_bplayer = mysqli_fetch_array($q_bplayer)) {
echo''.$r_bplayer[name].'
';
diff --git a/html/pages/report/clanbase.php b/html/pages/report/clanbase.php index 2eb8cde..54ba998 100644 --- a/html/pages/report/clanbase.php +++ b/html/pages/report/clanbase.php @@ -261,8 +261,8 @@ echo'_______________________________________________________________________<br ';
$sql_rplayer = "SELECT p.id, pi.name FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $id AND team = 0 ORDER BY pi.name ASC";
-$q_rplayer = mysql_query($sql_rplayer);
-while ($r_rplayer = mysql_fetch_array($q_rplayer)) {
+$q_rplayer = mysqli_query($GLOBALS["___mysqli_link"], $sql_rplayer);
+while ($r_rplayer = mysqli_fetch_array($q_rplayer)) {
echo'[pl]'.$cbid($r_rplayer[id]).','.$cbnick($r_rplayer[name]).'[/pl] ';
}
@@ -274,8 +274,8 @@ echo'<br />_____________________________________________________________________ ';
$sql_bplayer = "SELECT p.id, pi.name FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $id AND team = 1 ORDER BY pi.name ASC";
-$q_bplayer = mysql_query($sql_bplayer);
-while ($r_bplayer = mysql_fetch_array($q_bplayer)) {
+$q_bplayer = mysqli_query($GLOBALS["___mysqli_link"], $sql_bplayer);
+while ($r_bplayer = mysqli_fetch_array($q_bplayer)) {
echo'[pl]'.$cbid($r_bplayer[id]).','.$cbnick($r_bplayer[name]).'[/pl] ';
}
diff --git a/html/pages/report_cb.php b/html/pages/report_cb.php index 50eb5d4..97493eb 100644 --- a/html/pages/report_cb.php +++ b/html/pages/report_cb.php @@ -28,16 +28,16 @@ echo'<table> <td width="50%" class="grey">';
$sql_rteam = "SELECT p.id, pi.name FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $id AND team = 0 ORDER BY pi.name ASC";
-$q_rteam = mysql_query($sql_rteam);
-while ($r_rteam = mysql_fetch_array($q_rteam)) {
+$q_rteam = mysqli_query($GLOBALS["___mysqli_link"], $sql_rteam);
+while ($r_rteam = mysqli_fetch_array($q_rteam)) {
echo''.$r_rteam[name].'<br />';
}
echo'</td>
<td width="50%" class="grey">';
$sql_bteam = "SELECT p.id, pi.name FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $id AND team = 1 ORDER BY pi.name ASC";
-$q_bteam = mysql_query($sql_bteam);
-while ($r_bteam = mysql_fetch_array($q_bteam)) {
+$q_bteam = mysqli_query($GLOBALS["___mysqli_link"], $sql_bteam);
+while ($r_bteam = mysqli_fetch_array($q_bteam)) {
echo''.$r_bteam[name].'<br />';
}
echo'</td></tr></table><br>';
@@ -120,8 +120,8 @@ IF ($stage == "2") { $sql_rteam = "SELECT p.id, pi.name FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $id AND team = 0 ORDER BY pi.name ASC";
- $q_rteam = mysql_query($sql_rteam);
- while($r_rteam = mysql_fetch_array($q_rteam)) {
+ $q_rteam = mysqli_query($GLOBALS["___mysqli_link"], $sql_rteam);
+ while($r_rteam = mysqli_fetch_array($q_rteam)) {
echo'<tr>
<td class="grey">'.$r_rteam[name].'</td>
@@ -142,8 +142,8 @@ IF ($stage == "2") { $sql_bteam = "SELECT p.id, pi.name FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND matchid = $id AND team = 1 ORDER BY pi.name ASC";
- $q_bteam = mysql_query($sql_bteam);
- while($r_bteam = mysql_fetch_array($q_bteam)) {
+ $q_bteam = mysqli_query($GLOBALS["___mysqli_link"], $sql_bteam);
+ while($r_bteam = mysqli_fetch_array($q_bteam)) {
echo'<tr>
<td class="grey">'.$r_bteam[name].'</td>
diff --git a/html/pages/servers.php b/html/pages/servers.php index 65dd06b..e0b4040 100644 --- a/html/pages/servers.php +++ b/html/pages/servers.php @@ -52,9 +52,9 @@ echo ' $sql_servers = "SELECT servername, serverip, COUNT(*) AS matchcount, SUM(frags) AS frags, SUM(t0score+t1score+t2score+t3score) AS matchscore, SUM(gametime) AS gametime
FROM uts_match GROUP BY servername, serverip ORDER BY servername ASC LIMIT $qpage,25";
-$q_servers = mysql_query($sql_servers) or die(mysql_error());
+$q_servers = mysqli_query($GLOBALS["___mysqli_link"], $sql_servers) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_servers = mysql_fetch_array($q_servers)) {
+while ($r_servers = mysqli_fetch_array($q_servers)) {
$r_gametime = sec2hour($r_servers[gametime]);
echo '
diff --git a/html/pages/servers_info.php b/html/pages/servers_info.php index 81f7772..baded2b 100644 --- a/html/pages/servers_info.php +++ b/html/pages/servers_info.php @@ -1,5 +1,5 @@ <?php -$serverip = mysql_real_escape_string($_GET[serverip]); +$serverip = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_GET[serverip]); // Firstly we need to work out First Last Next Prev pages $scount = small_count("SELECT id FROM uts_match WHERE serverip = '$serverip'"); @@ -15,7 +15,7 @@ $fpage = 0; IF($ecount < 1) { $lpage = 0; } else { $lpage = $ecount2-1; } -$cpage = mysql_real_escape_string($_GET["page"]); +$cpage = mysqli_real_escape_string($GLOBALS["___mysqli_link"], $_GET["page"]); IF ($cpage == "") { $cpage = "0"; } $qpage = $cpage*25; @@ -83,8 +83,8 @@ echo'<div class="pages">Page ['.$tfpage.'/'.$tlpage.'] Selection: '.$fpageurl.' </tr>'; $sql_recent = "SELECT m.id, m.time, g.name AS gamename, m.mapfile, m.gametime FROM uts_match AS m, uts_games AS g WHERE g.id = m.gid AND m.serverip = '$serverip' ORDER BY m.time DESC LIMIT $qpage,25"; -$q_recent = mysql_query($sql_recent) or die(mysql_error()); -while ($r_recent = mysql_fetch_array($q_recent)) { +$q_recent = mysqli_query($GLOBALS["___mysqli_link"], $sql_recent) or die(mysqli_error($GLOBALS["___mysqli_link"])); +while ($r_recent = mysqli_fetch_array($q_recent)) { $r_time = mdate($r_recent[time]); $r_mapfile = un_ut($r_recent[mapfile]); diff --git a/html/pages/totals.php b/html/pages/totals.php index 0e81f82..772e0bb 100755 --- a/html/pages/totals.php +++ b/html/pages/totals.php @@ -21,9 +21,9 @@ $sql_totsumm = "SELECT g.name AS gamename, SUM(p.gamescore) AS gamescore, SUM(p. GROUP BY g.name
ORDER BY gamename ASC";
-$q_totsumm = mysql_query($sql_totsumm) or die(mysql_error());
+$q_totsumm = mysqli_query($GLOBALS["___mysqli_link"], $sql_totsumm) or die(mysqli_error($GLOBALS["___mysqli_link"]));
-while ($r_totsumm = zero_out(mysql_fetch_array($q_totsumm))) {
+while ($r_totsumm = zero_out(mysqli_fetch_array($q_totsumm))) {
$gametime = sec2hour($r_totsumm[sumgametime]);
echo'
@@ -78,9 +78,9 @@ echo' <th align="center">Flag Returns</th>
</tr>';
- $q_assgids = mysql_query("SELECT id FROM uts_games WHERE gamename LIKE '%Assault%';") or die(mysql_error());
+ $q_assgids = mysqli_query($GLOBALS["___mysqli_link"], "SELECT id FROM uts_games WHERE gamename LIKE '%Assault%';") or die(mysqli_error($GLOBALS["___mysqli_link"]));
$assgids = array();
- while ($r_assgids = mysql_fetch_array($q_assgids)) {
+ while ($r_assgids = mysqli_fetch_array($q_assgids)) {
$assgids[] = $r_assgids['id'];
}
$assquery = (count($assgids) > 0) ? 'SUM(IF (gid IN ('. implode(',', $assgids) .'), ass_obj, 0)) AS ass_obj' : '0 AS ass_obj';
@@ -175,7 +175,7 @@ $sql_chighttl = small_query("SELECT p.pid, pi.name, p.country, AVG(ttl) AS ttl , $sql_chighflag_capture = small_query("SELECT p.pid, pi.name, p.country, SUM(flag_capture) AS flag_capture , SUM(gametime) AS sumgametime, COUNT(matchid) AS mcount FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' GROUP BY pid, p.country HAVING sumgametime > 1800 ORDER BY flag_capture DESC LIMIT 0,1");
$sql_chighflag_kill = small_query("SELECT p.pid, pi.name, p.country, SUM(flag_kill) AS flag_kill , SUM(gametime) AS sumgametime, COUNT(matchid) AS mcount FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' GROUP BY pid, p.country HAVING sumgametime > 1800 ORDER BY flag_kill DESC LIMIT 0,1");
$sql_chighdom_cp = small_query("SELECT p.pid, pi.name, p.country, SUM(dom_cp) AS dom_cp , SUM(gametime) AS sumgametime, COUNT(matchid) AS mcount FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' GROUP BY pid, p.country HAVING sumgametime > 1800 ORDER BY dom_cp DESC LIMIT 0,1");
-$ass_obj_check = small_query("SELECT COUNT(id) AS idcount FROM uts_games WHERE gamename LIKE '%Assault%';") or die(mysql_error());
+$ass_obj_check = small_query("SELECT COUNT(id) AS idcount FROM uts_games WHERE gamename LIKE '%Assault%';") or die(mysqli_error($GLOBALS["___mysqli_link"]));
if ($ass_obj_check[idcount] > 0 ) {
$sql_chighass_obj = small_query("SELECT p.pid, pi.name, p.country, SUM(ass_obj) AS ass_obj , SUM(gametime) AS sumgametime, COUNT(matchid) AS mcount FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' GROUP BY pid HAVING sumgametime > 1800 ORDER BY ass_obj DESC LIMIT 0,1");
@@ -367,7 +367,7 @@ $sql_mhighflag_capture = small_query("SELECT p.matchid, p.pid, pi.name, p.countr $sql_mhighflag_kill = small_query("SELECT p.matchid, p.pid, pi.name, p.country, SUM(flag_kill) AS flag_kill , SUM(gametime) AS sumgametime FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' AND flag_kill > 0 GROUP BY matchid, pid, country HAVING sumgametime > 600 ORDER BY flag_kill DESC LIMIT 0,1");
$sql_mhighdom_cp = small_query("SELECT p.matchid, p.pid, pi.name, p.country, SUM(dom_cp) AS dom_cp , SUM(gametime) AS sumgametime FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' AND dom_cp > 0 GROUP BY matchid, pid, country HAVING sumgametime > 600 ORDER BY dom_cp DESC LIMIT 0,1");
-$ass_obj_check = small_query("SELECT COUNT(id) AS idcount FROM uts_games WHERE gamename LIKE '%Assault%';") or die(mysql_error());
+$ass_obj_check = small_query("SELECT COUNT(id) AS idcount FROM uts_games WHERE gamename LIKE '%Assault%';") or die(mysqli_error($GLOBALS["___mysqli_link"]));
if ($ass_obj_check[idcount] > 0 ) {
$sql_mhighass_obj = small_query("SELECT p.matchid, p.pid, pi.name, p.country, SUM(ass_obj) AS ass_obj , SUM(gametime) AS sumgametime FROM uts_player AS p, uts_pinfo AS pi WHERE p.pid = pi.id AND pi.banned <> 'Y' AND ass_obj > 0 GROUP BY matchid, pid, country HAVING sumgametime > 600 ORDER BY ass_obj DESC LIMIT 0,1");
} else {
@@ -541,13 +541,13 @@ echo ' </tr>';
$sql_mweapons = "SELECT id, name, image FROM uts_weapons WHERE hide <> 'Y' ORDER BY sequence, id ASC";
-$q_mweapons = mysql_query($sql_mweapons) or die(mysql_error());
-while ($r_mweapons = mysql_fetch_array($q_mweapons)) {
+$q_mweapons = mysqli_query($GLOBALS["___mysqli_link"], $sql_mweapons) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+while ($r_mweapons = mysqli_fetch_array($q_mweapons)) {
$wid = $r_mweapons[id];
$sql_mweaponsl = "SELECT w.pid AS playerid, pi.name AS name, pi.country AS country, SUM(w.kills) as kills, COUNT(DISTINCT w.matchid) AS mcount FROM uts_weaponstats AS w LEFT JOIN uts_pinfo AS pi ON w.pid = pi.id WHERE w.weapon = '$wid' AND w.pid > 0 AND w.matchid <> 0 AND pi.banned <> 'Y' GROUP BY w.pid ORDER BY kills DESC LIMIT 0,1";
- $q_mweaponsl = mysql_query($sql_mweaponsl) or die(mysql_error());
- while ($r_mweaponsl = mysql_fetch_array($q_mweaponsl)) {
+ $q_mweaponsl = mysqli_query($GLOBALS["___mysqli_link"], $sql_mweaponsl) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_mweaponsl = mysqli_fetch_array($q_mweaponsl)) {
echo '<tr>
<td align="center">'.$r_mweapons[name].'</td>
@@ -578,13 +578,13 @@ echo '<table class = "zebra box" border="0" cellpadding="0" cellspacing="0" widt ';
$sql_mweapons = "SELECT id, name, image FROM uts_weapons WHERE hide <> 'Y' ORDER BY sequence, id ASC";
-$q_mweapons = mysql_query($sql_mweapons) or die(mysql_error());
-while ($r_mweapons = mysql_fetch_array($q_mweapons)) {
+$q_mweapons = mysqli_query($GLOBALS["___mysqli_link"], $sql_mweapons) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+while ($r_mweapons = mysqli_fetch_array($q_mweapons)) {
$wid = $r_mweapons[id];
$sql_mweaponsl = "SELECT w.matchid, w.pid AS playerid, pi.name AS name, pi.country AS country, w.kills FROM uts_weaponstats AS w LEFT JOIN uts_pinfo AS pi ON w.pid = pi.id WHERE w.weapon = '$wid' AND w.pid > 0 AND w.matchid > 0 AND pi.banned <> 'Y' ORDER BY w.kills DESC LIMIT 0,1";
- $q_mweaponsl = mysql_query($sql_mweaponsl) or die(mysql_error());
- while ($r_mweaponsl = mysql_fetch_array($q_mweaponsl)) {
+ $q_mweaponsl = mysqli_query($GLOBALS["___mysqli_link"], $sql_mweaponsl) or die(mysqli_error($GLOBALS["___mysqli_link"]));
+ while ($r_mweaponsl = mysqli_fetch_array($q_mweaponsl)) {
echo '<tr>
<td align="center">'.$r_mweapons[name].'</td>
diff --git a/html/pages/watchlist.php b/html/pages/watchlist.php index 4f4cf1b..0da97eb 100755 --- a/html/pages/watchlist.php +++ b/html/pages/watchlist.php @@ -85,9 +85,9 @@ foreach ($watchlist as $pid) { $r_pinfo = small_query($sql_pinfo);
- $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"]));
- while ($r_players = mysql_fetch_array($q_players)) {
+ while ($r_players = mysqli_fetch_array($q_players)) {
$i++;
$new = (mtimestamp($r_players['time']) > $s_lastvisit) ? true : false;
$class = ($i % 2) ? 'grey' : 'grey2';
|