summaryrefslogtreecommitdiff
path: root/html/pages
diff options
context:
space:
mode:
Diffstat (limited to 'html/pages')
-rwxr-xr-xhtml/pages/admin/check.php81
-rwxr-xr-xhtml/pages/admin/emptydb.php75
-rwxr-xr-xhtml/pages/credits.php4
-rwxr-xr-xhtml/pages/match_info.php17
-rw-r--r--html/pages/match_info_charts.php85
-rwxr-xr-xhtml/pages/match_info_server.php19
6 files changed, 240 insertions, 41 deletions
diff --git a/html/pages/admin/check.php b/html/pages/admin/check.php
index a03bf91..938d036 100755
--- a/html/pages/admin/check.php
+++ b/html/pages/admin/check.php
@@ -299,6 +299,34 @@ CREATE TABLE `uts_weaponstats` (
) ENGINE=MyISAM;
";
+$create_table['uts_chartdata'] = "
+CREATE TABLE `uts_chartdata` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `mid` int(11) NOT NULL,
+ `chartid` mediumint(9) NOT NULL,
+ `title` varchar(50) NOT NULL,
+ `data` blob NOT NULL,
+ `labels` blob NOT NULL,
+ `categories` blob NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `mid` (`mid`),
+ KEY `mid_2` (`mid`)
+) ENGINE=MyISAM;
+";
+
+$create_table['uts_charttypes'] = "
+CREATE TABLE `uts_charttypes` (
+ `id` mediumint(9) NOT NULL,
+ `category` varchar(25) NOT NULL,
+ `type` varchar(50) NOT NULL,
+ `color` varchar(10) NOT NULL,
+ `layout` text NOT NULL,
+ `charttype` varchar(15) NOT NULL,
+ `columns` int(11) NOT NULL DEFAULT '1',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM;
+";
+
foreach ($create_table as $table => $query) {
echo '
<tr>
@@ -321,6 +349,59 @@ 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);";
+$create_charttype['21'] = "INSERT INTO `uts_charttypes` VALUES (21, 'Domination', 'teamDeriv', 'team', ' title : {\n text : ''Score''\n },\n credits : {\n enabled : false\n },\n legend : {\n enabled : true\n },\n xAxis : {\n title : '''',\n min : 0\n },\n yAxis: [{\n \n title: {\n text: ''Dom Score''\n },\n min: 0,\n floor: 0,\n opposite: true\n },{\n title: {\n text: ''net dom points per min''\n },\n min: 0,\n floor: 0\n }],\n plotOptions : {\n column : {\n stacking : ''normal'',\npointPlacement: ''between'', pointPadding : 0,\npointRange: 1, groupPadding : 0.2, borderWidth : 0, shadow : false,\nenableMouseTracking: false\n },line: { stickyTracking: false }\n }', 'linecolumn', 1);";
+$create_charttype['92'] = "INSERT INTO `uts_charttypes` VALUES (92, 'Frags Team', 'teamNormal', 'team', 'title: {\ntext: ''Spread vs #2 team''\n},\ncredits: {\nenabled: false\n}, \nlegend: {\nenabled: false\n}, \nxAxis: {\ntitle: '''',\nmin: 0\n}, \nyAxis: {\ntitle: '''' \n},\nplotOptions : {\n line : {\n stickyTracking : false\n }\n}', 'line', 1);";
+$create_charttype['91'] = "INSERT INTO `uts_charttypes` VALUES (91, 'Frags Team', 'teamDeriv', 'team', ' title : {\n text : ''Battle for #1''\n },\n credits : {\n enabled : false\n },\n legend : {\n enabled : true\n },\n xAxis : {\n title : '''',\n min : 0\n },\n yAxis: [{\n \n title: {\n text: ''score''\n },\n min: 0,\n floor: 0,\n opposite: true\n },{\n title: {\n text: ''frags per min''\n },\n min: 0,\n floor: 0\n }],\n plotOptions : {\n column : {\n stacking : ''normal'',\n pointPadding : 0,\n groupPadding : 0,\n borderWidth : 0,\n shadow : false,\nenableMouseTracking: false\n },line: { stickyTracking: false }\n }', 'linecolumn', 1);";
+$create_charttype['93'] = "INSERT INTO `uts_charttypes` VALUES (93, 'Top fraggers', 'playerScore', 'player', 'title: {\ntext: ''Battle for #1''\n},\ncredits: {\nenabled: false\n}, \nlegend: {\nenabled: true\n}, \nxAxis: {\ntitle: '''',\nmin: 0\n}, \nyAxis: {\ntitle: '''',\nmin: 0\n},\nplotOptions : {\n line : {\n stickyTracking : false\n }\n}', 'line', 1);";
+$create_charttype['95'] = "INSERT INTO `uts_charttypes` VALUES (95, 'Top fraggers', 'playerNormal', 'player', 'title: {\ntext: ''Spread vs #2''\n},\ncredits: {\nenabled: false\n}, \nlegend: {\nenabled: true\n}, \nxAxis: {\ntitle: '''',\nmin: 0\n}, \nyAxis: {\ntitle: '''' \n},\nplotOptions : {\n line : {\n stickyTracking : false\n }\n}', 'line', 1);";
+$create_charttype['94'] = "INSERT INTO `uts_charttypes` VALUES (94, 'Top fraggers', 'playerDeriv', 'player', 'title : {\n text : ''Battle for #1''\n },\n credits : {\n enabled : false\n },\n legend : {\n enabled : true\n },\n xAxis : {\n title : '''',\n min : 0\n },\n yAxis: [{\n \n title: {\n text: ''score''\n },allowDecimals : false,\n tickPositioner: function () {\n\n var maxDeviation = round_up(Math.max(Math.abs(this.dataMax), Math.abs(this.dataMin)),3);\n var thirdMaxDeviation = Math.ceil(maxDeviation / 3);\n\n return [-thirdMaxDeviation , 0, thirdMaxDeviation , 2*thirdMaxDeviation , maxDeviation];\n },\n \n \n opposite: true\n },{\n title: {\n text: ''frags per min''\n },allowDecimals : false, tickPositioner: function () {\n\n\n var maxDeviation = round_up(Math.max(Math.abs(this.dataMax), Math.abs(this.dataMin)),3);\n var thirdMaxDeviation = Math.ceil(maxDeviation / 3);\n\n return [-thirdMaxDeviation , 0, thirdMaxDeviation , 2*thirdMaxDeviation , maxDeviation];\n } \n }],\n plotOptions : {\n column : {\n stacking : ''normal'',\n pointPadding : 0,\n groupPadding : 0,\n borderWidth : 0,\n shadow : false,\nenableMouseTracking: false\n },line: { stickyTracking: false }\n }', 'linecolumn', 1);";
+$create_charttype['96'] = "INSERT INTO `uts_charttypes` VALUES (96, 'Frags #5-8', 'playerScore5', 'player', 'title: {\ntext: ''Battle for #5''\n},\ncredits: {\nenabled: false\n}, \nlegend: {\nenabled: true\n}, \nxAxis: {\ntitle: '''',\nmin: 0\n}, \nyAxis: {\ntitle: '''',\nmin: 0\n},\nplotOptions : {\n line : {\n stickyTracking : false\n }\n}', 'line', 1);";
+$create_charttype['97'] = "INSERT INTO `uts_charttypes` VALUES (97, 'Frags #5-8', 'playerNormal5', 'player', 'title: {\ntext: ''Spread vs #5''\n},\ncredits: {\nenabled: false\n}, \nlegend: {\nenabled: true\n}, \nxAxis: {\ntitle: '''',\nmin: 0\n}, \nyAxis: {\ntitle: '''' \n}', 'line', 1);";
+$create_charttype['10'] = "INSERT INTO `uts_charttypes` VALUES (10, 'CTF Score', 'teamScore', 'team', 'title : {\n text : ''CTF Team Score''\n },\n\ntooltip: {\n\n positioner: function () {\n return { x: 10, y: 10 };\n },\nformatter:function() {\n\nif(this.point.tooltipdata === ''undefined'' || this.point.tooltipdata == null ) {\n return Math.floor(this.x)+''min ''+Math.round((this.x-Math.floor(this.x))*60)+''sec<br><span style=\"color: '' + this.series.color + ''\"></span> ''+this.series.name+'' : ''+this.y;\n} else {\nreturn Math.floor(this.x)+''min ''+Math.round((this.x-Math.floor(this.x))*60)+''sec<br><span style=\"color: '' + this.series.color + ''\"></span> ''+this.series.name+'' : ''+this.y+''<br>''+this.point.tooltipdata;\n}\n}\n\n},\n credits : {\n enabled : false\n },\n legend : {\n enabled : false\n },\n xAxis : {\n title : '''',\n min : 0\n },\n yAxis: [{\n \n title: {\n text: ''score''\n },\n min: 0,\n floor: 0,\n allowDecimals: false,\n opposite: true\n }, {\n title: {\n text: ''grabs per min''\n },\n min: 0,\n allowDecimals: false,\n floor: 0\n }],\n plotOptions : {\n column : {\n pointPlacement: ''between'',\n pointPadding : 0,\npointRange: 1, groupPadding : 0.2,\n borderWidth : 0,\n shadow : false,\nenableMouseTracking: false\n },line: { stickyTracking: false }\n }', 'linestepcolumn', 2);";
+$create_charttype['11'] = "INSERT INTO `uts_charttypes` VALUES (11, 'CTF Grabs', 'teamBreakdown', 'player', '\n title : {\n text : ''Grab conversion''\n },\n credits : {\n enabled : false\n },\n legend : {\n enabled : true\n },\n xAxis : {\n title : '''',\ncategories: [''Red'',''Blue'']\n },\n yAxis: {\n \n title: '''',allowDecimals: false,\n reversedStacks: false,stackLabels: {\n enabled: true }\n },\n plotOptions : {\n bar : { \n stacking : ''normal'', borderWidth : 0\n }\n }', 'bar', 2);";
+$create_charttype['100'] = "INSERT INTO `uts_charttypes` VALUES (100, 'Items', 'Team Pickups', 'team', '\n credits : {\n enabled : false\n },\n title: {\n text: ''''\n },\n \n pane: {\n size: ''100%''\n },\n\n plotOptions: {\n series: {\n fillOpacity: 0.4\n }\n },\nxAxis: {\n tickmarkPlacement: ''on'',\n lineWidth: 0\n },\n\n yAxis: {\n labels: {enabled:false},\n tickPixelInterval: 25,\n tickPositions: [0,25,50,75,100],\n gridLineInterpolation: ''polygon'',lineWidth: 0\n },\ntooltip: { \nvalueSuffix: '' %'' }', 'radar', 1);";
+$create_charttype['101'] = "INSERT INTO `uts_charttypes` VALUES (101, 'Items', 'Player Pickups', 'player', ' credits : {\n enabled : false\n },\n title: {\n text: ''''\n },\n \n pane: {\n size: ''100%''\n },\n\n plotOptions: {\n series: {\n fillOpacity: 0.4\n }\n },\nxAxis: {\n tickmarkPlacement: ''on'',\n lineWidth: 0\n },\n\n yAxis: {\n labels: {enabled:false},\n tickPixelInterval: 25,\n ickPositions: [0,25,50,75,100],\n gridLineInterpolation: ''polygon'',lineWidth: 0\n },\ntooltip: { \nvalueSuffix: '' %'' }', 'radar', 1);";
+$create_charttype['102'] = "INSERT INTO `uts_charttypes` VALUES (102, 'Items', 'ampRuns', 'team', 'title : {\n text : ''Amp runs net points''\n },\n credits : {\n enabled : false\n },\n legend : {\n enabled : false\n },\n xAxis : {\n title : '''',\n tickPosition: ''inside'',\n labels: {\n align: ''left'',\n overflow: false,\n x:5,\n y:3,\n style: { whiteSpace: ''nowrap'' }\n }\n },\n yAxis : {\n\n title : '''',\n allowDecimals : false,\n reversedStacks : false,\n tickPositioner: function () {\nvar maxDeviation = round_up(Math.max(Math.abs(this.dataMax), Math.abs(this.dataMin)),6);\n var thirdMaxDeviation = Math.ceil(maxDeviation / 3);\n\n return [-maxDeviation,-2*thirdMaxDeviation,-thirdMaxDeviation , 0, thirdMaxDeviation , 2*thirdMaxDeviation , maxDeviation];\n },\n stackLabels : {\n enabled : false\n }\n },\n plotOptions : {\n bar : {\n stacking : ''normal'',\n borderWidth : 0,\n pointPadding: 0.1,\n groupPadding: 0.1\n }\n },\n\ntooltip: {\nformatter:function() {\n return this.x+''<br><span style=\"color: '' + this.point.color + ''\">●</span>''+this.series.name+ '' : ''+this.y;}\n\n}', 'bar', 1);";
+
+
+echo '
+ <table class="box" border="0" cellpadding="1" cellspacing="2">
+ <tr>
+ <td class="smheading" align="center" height="25" width="550" colspan="2">Checking all graphs types are in database</td>
+ </tr>';
+if (small_count("SHOW TABLES LIKE 'uts_charttypes'") != 1) {
+ // database exists, check columns
+ echo '
+ <td class="warn" align="left" width="550" colspan = "2">Table uts_charttypes does not exist!</td></tr>';
+}
+else {
+ foreach ($create_charttype as $charttype => $query) {
+ echo '
+ <tr>
+ <td class="smheading" align="left" width="350">', $charttype, '</td>';
+ if (small_count("SELECT id FROM uts_charttypes WHERE id = '$charttype' LIMIT 0,1") == 1) {
+ // database exists, check columns
+ echo '
+ <td class="grey" align="left" width="200">OK</td></tr>';
+ }
+ else {
+ if (mysql_query($query)) {
+ echo '
+ <td class="grey" align="left" width="200">Added</td></tr>';
+ }
+ else {
+ echo '
+ <td class="warn" align="left" width="200">Not found!</td></tr>';
+ }
+ }
+ }
+}
+echo '
+ </tbody></table><br>';
// Check the weapons
$create_weapon['Translocator'] = "INSERT INTO `uts_weapons` VALUES (1, 'Translocator', 'trans.jpg', 1, 'N');";
diff --git a/html/pages/admin/emptydb.php b/html/pages/admin/emptydb.php
index 9eee7d2..63599fc 100755
--- a/html/pages/admin/emptydb.php
+++ b/html/pages/admin/emptydb.php
@@ -20,43 +20,48 @@ $i++;
$results = adminselect($options);
-
IF ($results['sure'] == "Yes" and $results['really'] == "Yes") {
- echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">
- <tr>
- <td class="smheading" align="center" colspan="2">Empty Database</td>
- </tr>
- <tr>
- <td class="smheading" align="left" width="300">Emptying All Tables but uts_ip2country and uts_weaponstats</td>';
- 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());
- echo'<td class="grey" align="left" width="300">Done</td>
- </tr>
- <tr>
- <td class="smheading" align="center" colspan="2">Database Emptied - <a href="./admin.php?key='.$_REQUEST[key].'">Go Back To Admin Page</a></td>
- </tr></table>';
+ echo '<br><table border="0" cellpadding="1" cellspacing="2" width="600">
+ <tr>
+ <td class="smheading" align="center" colspan="2">Empty Database</td>
+ </tr>
+ <tr>
+ <td class="smheading" align="left" width="300">
+ 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());
+
+ echo '<td class="grey" align="left" width="300">Done</td>
+ </tr>
+ <tr>
+ <td class="smheading" align="center" colspan="2">
+ Database Emptied - <a href="./admin.php?key='.$_REQUEST[key].'">Go Back To Admin Page</a>
+ </td>
+ </tr></table>';
} else {
- echo'<br><table border="0" cellpadding="1" cellspacing="2" width="600">
- <tr>
- <td class="smheading" align="center" colspan="2">Empty Database</td>
- </tr>
- <tr>
- <td class="smheading" align="left" width="300">Database Not Emptied</td>
- <td class="grey" align="left" width="300">Answer Was No</td>
- </tr>
- <tr>
- <td class="smheading" align="center" colspan="2">Database Not Emptied - <a href="./admin.php?key='.$_REQUEST[key].'">Go Back To Admin Page</a></td>
- </tr></table>';
+ echo '<br><table border="0" cellpadding="1" cellspacing="2" width="600">
+ <tr>
+ <td class="smheading" align="center" colspan="2">Empty Database</td>
+ </tr>
+ <tr>
+ <td class="smheading" align="left" width="300">Database Not Emptied</td>
+ <td class="grey" align="left" width="300">Answer Was No</td>
+ </tr>
+ <tr>
+ <td class="smheading" align="center" colspan="2">Database Not Emptied - <a href="./admin.php?key='.$_REQUEST[key].'">Go Back To Admin Page</a></td>
+ </tr></table>';
}
-
?>
diff --git a/html/pages/credits.php b/html/pages/credits.php
index a123ac4..4f8f4c2 100755
--- a/html/pages/credits.php
+++ b/html/pages/credits.php
@@ -19,6 +19,10 @@ All original pages are W3C <a href="http://validator.w3.org/check?uri=referer" t
<p><a name="changelog"></a><b>Change Log</b></p>
<blockquote><p>
<dl>
+ <dt>4.3.0 (4/1/2018 by killerEye, imported by Monk)</dt>
+ <dd>Added:<br>
+ Graphs of specific stats for CTF, DOM and DM game types.<br><br></dd>
+
<dt>beta 4.2.8 (23/7/2011 by Rork)</dt>
<dd>Bug Fixes:<br>
Fixed explain rankings (reported by Letylove49)<br>
diff --git a/html/pages/match_info.php b/html/pages/match_info.php
index 7645077..31edc2d 100755
--- a/html/pages/match_info.php
+++ b/html/pages/match_info.php
@@ -11,6 +11,7 @@ echo '
</tbody></table>
<br>';
include("pages/match_info_server.php");
+include("pages/match_info_charts.php");
$GLOBALS['gid'] = $gid;
$_GLOBALS['gid'] = $gid;
@@ -23,18 +24,18 @@ switch($real_gamename) {
case "Assault (insta)":
include("pages/match_info_ass.php");
break;
-
+
case "Capture the Flag":
case "Capture the Flag (insta)":
include("pages/match_info_ctf.php");
teamstats($mid, 'Match Summary');
break;
-
+
case "Domination":
case "Domination (insta)":
teamstats($mid, 'Match Summary', 'dom_cp', 'Dom Pts');
break;
-
+
case "JailBreak":
case "JailBreak (insta)":
teamstats($mid, 'Match Summary', 'ass_obj', 'Team Releases');
@@ -43,6 +44,13 @@ switch($real_gamename) {
case "Bunny Track":
include("pages/match_info_bt.php");
break;
+
+ case "Tournament DeathMatch":
+ case "Tournament Team Game":
+ case "Tournament DeathMatch (insta)":
+ case "Tournament Team Game (insta)":
+ teamstats($mid, 'Match Summary');
+ break;
case "Extended Last Man Standing":
case "Extended Last Man Standing (insta)":
@@ -62,6 +70,7 @@ switch($real_gamename) {
teamstats($mid, 'Player Summary');
}
}
+
if ($real_gamename == "Assault" or $real_gamename== "Assault (insta)") {
include("pages/match_info_other2.php");
@@ -74,4 +83,4 @@ if ($real_gamename == "Capture the Flag" or $real_gamename== "Capture the Flag (
include("pages/match_report.php");
}
-?>
+?> \ No newline at end of file
diff --git a/html/pages/match_info_charts.php b/html/pages/match_info_charts.php
new file mode 100644
index 0000000..a6170e7
--- /dev/null
+++ b/html/pages/match_info_charts.php
@@ -0,0 +1,85 @@
+<?php
+
+include_once 'includes/renderer-general-output.php';
+
+global $renderer_heigth;
+global $renderer_width;
+
+$mid = mysql_real_escape_string($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
+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());
+
+$chartCount = mysql_num_rows($charts);
+
+if($chartCount >0) {
+ $i = 0;
+
+ // cycle over charts
+ while ($chart = mysql_fetch_array($charts)) {
+
+ // retrieve both generic as the specific data
+ $category = $chart['category'];
+ $type = $chart['type'];
+ $color = $chart['color'];
+ $layout = $chart['layout'];
+ $charttype = $chart['charttype'];
+ $columns = $chart['columns'];
+ $title = $chart['title'];
+ $data = unserialize(gzdecode($chart['data']));
+ $labels = unserialize(gzdecode($chart['labels']));
+ $categories = unserialize(gzdecode($chart['categories']));
+
+ // append previous chart - this is done to ensure proper outlining (can only know in +1 round)
+ $chartOutput .= $prevRenderedChart;
+
+ // print a new section if we're now in a different category
+ if($category != $prevCategory) {
+
+ if(strlen($prevCategory)>0)
+ $chartOutput .= renderFootBlock();
+
+ $chartOutput .= renderHeaderBlock($category);
+ $prevCategory = $category;
+
+ } else {
+ if($i>1 && $i%2 == 0)
+ $chartOutput .= "</td></tr><tr><td>";
+ else
+ $chartOutput .= "</td><td>";
+ }
+
+ $prevRenderedChart = renderChart($mid."-".$i,$layout,$color,$title,$data,$labels,$categories,$renderer_width*$columns,$renderer_heigth,$charttype);
+
+ $i++;
+ }
+
+ // finishing up
+ $chartOutput .= $prevRenderedChart;
+ $chartOutput .= renderFootBlock();
+
+ echo "
+ <script type='text/javascript'>
+ function toggle_visibility(id) {
+ var e = document.getElementById(id);
+ if(e.style.display != 'none')
+ e.style.display = 'none';
+ else
+ e.style.display = '';
+ }
+ </script>
+ ";
+
+ echo $chartOutput;
+}
+
+
+
+?> \ No newline at end of file
diff --git a/html/pages/match_info_server.php b/html/pages/match_info_server.php
index fb92456..b3c6f40 100755
--- a/html/pages/match_info_server.php
+++ b/html/pages/match_info_server.php
@@ -81,7 +81,11 @@ if (file_exists($mappic)) {
$mappic = ("images/maps/blank.jpg");
}
- $myurl = urlencode($mapname);
+$myurl = urlencode($mapname);
+
+$mapnameToPrint = $matchinfo['mapname'];
+if($mapnameToPrint == "Untitled")
+ $mapnameToPrint = $mapname;
echo'
<tr>
@@ -94,7 +98,7 @@ if (file_exists($mappic)) {
<td class="dark" align="center">Match Type</td>
<td class="grey" align="center">'.$gamename.'</td>
<td class="dark" align="center">Map Name</td>
- <td class="greyhuman" align="center"><a class="grey" href="./?p=minfo&amp;map='.$myurl.'">'.$matchinfo[mapname].'</a></td>
+ <td class="greyhuman" align="center"><a class="grey" href="./?p=minfo&amp;map='.$myurl.'">'.$mapnameToPrint.'</a></td>
</tr>
<tr>
<td class="dark" align="center">Server Info</td>
@@ -111,4 +115,15 @@ if (file_exists($mappic)) {
</tr>
</tbody></table>
<br>';
+
+
+// Get Summary Info
+$teamscore = small_query("SELECT SUM(t0score + t1score + t2score + t3score) AS result FROM uts_match WHERE id = $mid");
+$playerscore = small_query("SELECT SUM(gamescore) AS result FROM uts_player WHERE matchid = $mid");
+$fragcount = small_query("SELECT SUM(frags) AS result FROM uts_match WHERE id = $mid");
+$killcount = small_query("SELECT SUM(kills) AS result FROM uts_match WHERE id = $mid");
+$deathcount = small_query("SELECT SUM(deaths) AS result FROM uts_match WHERE id = $mid");
+$suicidecount = small_query("SELECT SUM(suicides) AS result FROM uts_match WHERE id = $mid");
+
+
?>