From: <lu...@us...> - 2009-02-23 01:15:53
|
Revision: 9028 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9028&view=rev Author: luke-jr Date: 2009-02-23 01:15:30 +0000 (Mon, 23 Feb 2009) Log Message: ----------- use wrtls PHP client for server list Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 00:56:37 UTC (rev 9027) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:15:30 UTC (rev 9028) @@ -114,8 +114,7 @@ } } -require_once('aap_master.php'); -require_once('aap_serverinfo.php'); +require_once('armagetron-php-client.php'); if (!@include('player_name_links.php')) { function link_name($s) { return false; @@ -181,27 +180,25 @@ function serverlist_main($extraClasses = false) { serverlist_gpl($extraClasses); -$master = new aap_master(); -$servers = $master->getlist(); -unset($master); +$servers = getMasterInfo(); $sortkey = $_GET['sort']; $sortflip = $_GET['sortflip']; if ($sortkey) { $serverinfo = array(); foreach ($servers as $i) { - $si = new aap_serverinfo(); - if ($si->load($i)) + $si = new serverinfo($i['host'], $i['port']); + if (false !== $si->name) $serverinfo[] = $si; } function cmp_numplayers($a, $b) { global $serverinfo; - return $serverinfo[$b]->numplayers - $serverinfo[$a]->numplayers; + return $serverinfo[$b]->num_players_by_server - $serverinfo[$a]->num_players_by_server; } function cmp_version($a, $b) { global $serverinfo; - return strnatcasecmp($serverinfo[$b]->version, $serverinfo[$a]->version); + return version_compare($serverinfo[$b]->version, $serverinfo[$a]->version); } function cmp_name($a, $b) { global $serverinfo; @@ -209,7 +206,7 @@ } function cmp_address($a, $b) { global $serverinfo; - if ($hc = strnatcasecmp($serverinfo[$a]->ip, $serverinfo[$b]->ip)) + if ($hc = strnatcasecmp($serverinfo[$a]->host, $serverinfo[$b]->host)) return $hc; return $serverinfo[$a]->port - $serverinfo[$b]->port; } @@ -252,40 +249,40 @@ if ($sortkey) $si = $i; else { - $si = new aap_serverinfo(); - if (!$si->load($i)) - continue; + $si = new serverinfo($i['host'], $i['port']); + if (false === $si->name) + continue 2; } echo '<tr> <td class="name">'; - if ($si->url) - echo '<!-- lit uri: ' . htmlspecialchars($si->url) . ' -->'; - $uri = safelink($si->url); + if ($si->uri) + echo '<!-- lit uri: ' . htmlspecialchars($si->uri) . ' -->'; + $uri = safelink($si->uri); if ($uri) echo '<a target="_new" href="'.htmlspecialchars($uri).'">'; echo convert_string($si->name); - if ($si->url) echo '</a>'; + if ($si->uri) echo '</a>'; echo '</td> <td class="version">'; echo $si->version; echo '</td> <td class="address">'; - echo '<a href="armagetronad://'.htmlspecialchars(trim($si->ip).':'.trim($si->port)).'">'; - echo $si->ip.':'.$si->port; + echo '<a href="armagetronad://'.htmlspecialchars(trim($si->host).':'.trim($si->port)).'">'; + echo $si->host.':'.$si->port; echo '</a>'; echo '</td> <td class="numplayers">'; - echo $si->numplayers; + echo $si->num_players_by_server; echo '</td>'; - if ($si->numplayers) { + if ($si->num_players_by_server) { echo ' <td class="players">'; - for ($d = 0; $d < $si->numplayers; $d++) + for ($d = 0; $d < $si->num_players_by_server; $d++) { if ($d != 0) { echo ', '; - if ($d == $si->numplayers - 1) + if ($d == $si->num_players_by_server - 1) echo 'and '; } $pn = $si->players[$d]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-02-23 01:16:49
|
Revision: 9029 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9029&view=rev Author: luke-jr Date: 2009-02-23 01:16:46 +0000 (Mon, 23 Feb 2009) Log Message: ----------- use wrtls PHP client for server list Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:15:30 UTC (rev 9028) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:16:46 UTC (rev 9029) @@ -180,7 +180,7 @@ function serverlist_main($extraClasses = false) { serverlist_gpl($extraClasses); -$servers = getMasterInfo(); +$servers = getMasterInfo('master3.armagetronad.net'); $sortkey = $_GET['sort']; $sortflip = $_GET['sortflip']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-02-23 01:17:39
|
Revision: 9030 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9030&view=rev Author: luke-jr Date: 2009-02-23 01:17:34 +0000 (Mon, 23 Feb 2009) Log Message: ----------- use wrtls PHP client for server list Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:16:46 UTC (rev 9029) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:17:34 UTC (rev 9030) @@ -251,7 +251,7 @@ else { $si = new serverinfo($i['host'], $i['port']); if (false === $si->name) - continue 2; + continue; } echo '<tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-02-23 01:19:44
|
Revision: 9031 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9031&view=rev Author: luke-jr Date: 2009-02-23 01:19:39 +0000 (Mon, 23 Feb 2009) Log Message: ----------- flip num player default sort Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:17:34 UTC (rev 9030) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:19:39 UTC (rev 9031) @@ -194,7 +194,7 @@ function cmp_numplayers($a, $b) { global $serverinfo; - return $serverinfo[$b]->num_players_by_server - $serverinfo[$a]->num_players_by_server; + return $serverinfo[$a]->num_players_by_server - $serverinfo[$b]->num_players_by_server; } function cmp_version($a, $b) { global $serverinfo; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-02-23 01:26:19
|
Revision: 9032 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9032&view=rev Author: luke-jr Date: 2009-02-23 01:26:09 +0000 (Mon, 23 Feb 2009) Log Message: ----------- fix </font> algo Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:19:39 UTC (rev 9031) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:26:09 UTC (rev 9032) @@ -128,12 +128,10 @@ $fc = 0; while (($i = strpos($s, '0x')) !== false) { $r .= substr($s, 0, $i); + for (; $fc > 0; --$fc) + $r .= '</font>'; if (!strcasecmp(substr($s, $i + 2, 6), 'RESETT')) { - for (; $fc > 0; --$fc) - $r .= '</font>'; } else { - if ($fc--) - $r .= '</font>'; $Cr = hexdec(substr($s, $i + 2, 2)); $Cg = hexdec(substr($s, $i + 4, 2)); $Cb = hexdec(substr($s, $i + 6, 2)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-02-23 02:22:12
|
Revision: 9035 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9035&view=rev Author: luke-jr Date: 2009-02-23 01:42:59 +0000 (Mon, 23 Feb 2009) Log Message: ----------- flip num player default sort Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:39:51 UTC (rev 9034) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:42:59 UTC (rev 9035) @@ -196,7 +196,7 @@ function cmp_numplayers($a, $b) { global $serverinfo; - return $serverinfo[$a]->num_players_by_server - $serverinfo[$b]->num_players_by_server; + return $serverinfo[$b]->num_players_by_server - $serverinfo[$a]->num_players_by_server; } function cmp_version($a, $b) { global $serverinfo; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-02-23 02:22:25
|
Revision: 9034 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9034&view=rev Author: luke-jr Date: 2009-02-23 01:39:51 +0000 (Mon, 23 Feb 2009) Log Message: ----------- fix various sorting issues Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:35:52 UTC (rev 9033) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:39:51 UTC (rev 9034) @@ -187,8 +187,11 @@ $serverinfo = array(); foreach ($servers as $i) { $si = new serverinfo($i['host'], $i['port']); - if (false !== $si->name) + if (false === $si->name) + continue; + $serverinfo[] = $si; + $si->fname = trim(filtercolors($si->name)); } function cmp_numplayers($a, $b) { @@ -197,11 +200,11 @@ } function cmp_version($a, $b) { global $serverinfo; - return version_compare($serverinfo[$b]->version, $serverinfo[$a]->version); + return version_compare($serverinfo[$a]->version, $serverinfo[$b]->version); } function cmp_name($a, $b) { global $serverinfo; - return strnatcasecmp($serverinfo[$b]->name, $serverinfo[$a]->name); + return strnatcasecmp($serverinfo[$a]->fname, $serverinfo[$b]->fname); } function cmp_address($a, $b) { global $serverinfo; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-02-23 02:22:28
|
Revision: 9033 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9033&view=rev Author: luke-jr Date: 2009-02-23 01:35:52 +0000 (Mon, 23 Feb 2009) Log Message: ----------- PHP is stupid Modified Paths: -------------- www/beta/trunk/www-aabeta/serverlist-common.php Modified: www/beta/trunk/www-aabeta/serverlist-common.php =================================================================== --- www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:26:09 UTC (rev 9032) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2009-02-23 01:35:52 UTC (rev 9033) @@ -183,6 +183,7 @@ $sortkey = $_GET['sort']; $sortflip = $_GET['sortflip']; if ($sortkey) { + global $serverinfo; $serverinfo = array(); foreach ($servers as $i) { $si = new serverinfo($i['host'], $i['port']); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |