Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions html/import.php
Original file line number Diff line number Diff line change
Expand Up @@ -278,16 +278,16 @@ function add_info($name, $value) {
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;

Expand Down Expand Up @@ -327,8 +327,8 @@ function add_info($name, $value) {

$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]);
Expand All @@ -342,7 +342,7 @@ function add_info($name, $value) {
$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);
Expand Down Expand Up @@ -432,8 +432,8 @@ function add_info($name, $value) {
} 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].", ";
}

Expand Down Expand Up @@ -486,8 +486,8 @@ function add_info($name, $value) {
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
Expand All @@ -498,8 +498,8 @@ function add_info($name, $value) {
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'];
Expand Down Expand Up @@ -544,14 +544,14 @@ function add_info($name, $value) {

// 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; }
Expand All @@ -560,14 +560,14 @@ function add_info($name, $value) {

// 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'];
Expand All @@ -581,8 +581,8 @@ function add_info($name, $value) {
'$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>';
Expand All @@ -598,9 +598,9 @@ function add_info($name, $value) {

// 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
Expand All @@ -614,7 +614,7 @@ function add_info($name, $value) {
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>";
Expand All @@ -640,12 +640,12 @@ function add_info($name, $value) {

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>";
Expand Down Expand Up @@ -688,8 +688,8 @@ function add_info($name, $value) {
</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];
Expand All @@ -702,16 +702,16 @@ function add_info($name, $value) {
$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";
Expand All @@ -738,9 +738,9 @@ function add_info($name, $value) {
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) {
Expand All @@ -755,30 +755,30 @@ function add_info($name, $value) {
}
}
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>';
}
else if ($gamename == "Capture the Flag" || $gamename == "Capture the Flag (insta)" ) {
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>';
}
Expand All @@ -787,7 +787,7 @@ function add_info($name, $value) {

// 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: ";
Expand Down Expand Up @@ -862,7 +862,7 @@ function add_info($name, $value) {
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>';
}
Expand All @@ -871,7 +871,7 @@ function add_info($name, $value) {
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>';
}
Expand Down
12 changes: 6 additions & 6 deletions html/import/import_ass.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"]));
?>
8 changes: 4 additions & 4 deletions html/import/import_bt.php
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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"]));
}
?>
6 changes: 3 additions & 3 deletions html/import/import_ctf.php
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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

Expand All @@ -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"]));
?>
8 changes: 4 additions & 4 deletions html/import/import_dom.php
Original file line number Diff line number Diff line change
@@ -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"]));

?>
4 changes: 2 additions & 2 deletions html/import/import_jailbreak.php
Original file line number Diff line number Diff line change
Expand Up @@ -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"]));

?>
Loading