From: <lu...@us...> - 2007-09-12 09:54:33
|
Revision: 7331 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7331&view=rev Author: luke-jr Date: 2007-09-12 02:54:34 -0700 (Wed, 12 Sep 2007) Log Message: ----------- refactor serverlist code 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 2007-09-12 09:53:16 UTC (rev 7330) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:54:34 UTC (rev 7331) @@ -86,7 +86,7 @@ <? } -serverlist_gpl() { +function serverlist_gpl() { if ($_GET['source'] != '') { $srcreq = $_GET['source']; switch ($srcreq) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 09:55:03
|
Revision: 7332 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7332&view=rev Author: luke-jr Date: 2007-09-12 02:55:04 -0700 (Wed, 12 Sep 2007) Log Message: ----------- refactor serverlist code 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 2007-09-12 09:54:34 UTC (rev 7331) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:55:04 UTC (rev 7332) @@ -80,7 +80,7 @@ font.darktext { background-color: white; } <? } -function serverlist_beta() { +function serverlist_betanotice() { ?> Reminder: This is still <strong>beta</strong> and has issues on occasion. Mainly because it is slow and polls all the servers every time the page is loaded...<br /><br /> <? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 09:56:40
|
Revision: 7333 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7333&view=rev Author: luke-jr Date: 2007-09-12 02:56:42 -0700 (Wed, 12 Sep 2007) Log Message: ----------- dont link to nullstring 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 2007-09-12 09:55:04 UTC (rev 7332) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:56:42 UTC (rev 7333) @@ -149,7 +149,7 @@ // Give it a chance as HTTP if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?,i', $s)) return 'http://' . $s; - return ''; + return false; } $scheme = $matches[1]; switch($scheme) { @@ -162,7 +162,7 @@ break; default: } - return ''; + return false; } function serverlist_main($extraClasses = false) { @@ -244,7 +244,9 @@ echo '<tr> <td class="name">'; - if ($si->url) echo '<a target="_new" href="'.htmlspecialchars(safelink($si->url)).'">'; + $uri = safelink($si->url); + if ($uri) + echo '<a target="_new" href="'.htmlspecialchars($uri).'">'; echo convert_string($si->name); if ($si->url) echo '</a>'; echo '</td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 09:58:53
|
Revision: 7334 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7334&view=rev Author: luke-jr Date: 2007-09-12 02:58:55 -0700 (Wed, 12 Sep 2007) Log Message: ----------- if no path, we need EOL 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 2007-09-12 09:56:42 UTC (rev 7333) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 09:58:55 UTC (rev 7334) @@ -147,7 +147,7 @@ if (!preg_match(',^([a-z0-9-]+):,i', $s, $matches)) { // Give it a chance as HTTP - if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?,i', $s)) + if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?$,i', $s)) return 'http://' . $s; return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:02:32
|
Revision: 7335 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7335&view=rev Author: luke-jr Date: 2007-09-12 03:02:32 -0700 (Wed, 12 Sep 2007) Log Message: ----------- find substring URIs 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 2007-09-12 09:58:55 UTC (rev 7334) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:02:32 UTC (rev 7335) @@ -144,21 +144,22 @@ function safelink($s) { $s = trim(preg_replace('/0x.{6}/i', '', $s)); - if (!preg_match(',^([a-z0-9-]+):,i', $s, $matches)) + if (!preg_match(',(([a-z0-9-]+):[^ ]*),i', $s, $matches)) { // Give it a chance as HTTP - if (preg_match(',(?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/.*)?$,i', $s)) - return 'http://' . $s; + if (preg_match(',((?:[a-z0-9.-]+)\.(?:com|org|net|info|biz|name|[a-z]{2})(?:/[^ ]*)?)(?: .*)?$,i', $s, $matches)) + return 'http://' . $matches[1]; return false; } - $scheme = $matches[1]; + $uri = $matches[1]; + $scheme = $matches[2]; switch($scheme) { case 'http': case 'mailto': case 'xmpp': case 'tel': case 'pots': - return $s; + return $uri; break; default: } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:03:28
|
Revision: 7336 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7336&view=rev Author: luke-jr Date: 2007-09-12 03:03:21 -0700 (Wed, 12 Sep 2007) Log Message: ----------- debug info 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 2007-09-12 10:02:32 UTC (rev 7335) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:03:21 UTC (rev 7336) @@ -245,6 +245,8 @@ echo '<tr> <td class="name">'; + if ($si->url) + echo '<!-- lit uri: ' . htmlspecialchars($si->url) . ' -->'; $uri = safelink($si->url); if ($uri) echo '<a target="_new" href="'.htmlspecialchars($uri).'">'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:19:22
|
Revision: 7337 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7337&view=rev Author: luke-jr Date: 2007-09-12 03:19:19 -0700 (Wed, 12 Sep 2007) Log Message: ----------- preg for rcsid 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 2007-09-12 10:03:21 UTC (rev 7336) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:19:19 UTC (rev 7337) @@ -92,15 +92,20 @@ switch ($srcreq) { case '_top': $srcreq = $_SERVER['SCRIPT_FILENAME']; + break; + case '_self': + $srcreq = __FILE__; + break; case 'aap_master.php': case 'aap_serverinfo.php': + break; + default: + die('I don\'t show that source!'); + } echo '<div class="src">'; - highlight_file($srcreq); + highlight_file($srcreq); echo '</div>'; exit; - default: - die('I don\'t show that source!'); - } } } @@ -294,16 +299,18 @@ <table class="rcsid"> <?php $serverlist_common_rcsid = '$Id$'; -$rcsexpr = '^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$'; +$rcsexpr = '%^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$%'; foreach (array( array( 'rcsid' => $top_rcsid, 'page' => preg_replace(',^.*/,', '', $_SERVER['PHP_SELF']), + 'Spage' => '_top', 'action' => 'modified', ), array( 'rcsid' => $serverlist_common_rcsid, 'page' => preg_replace(',^.*/,', '', __FILE__), + 'Spage' => '_self', 'action' => 'modified', ), array( @@ -322,24 +329,28 @@ 'action' => 'updated', ), ) as $data) { - $outs = '<tr> - <td class="src">'; + if (!preg_match($rcsexpr, $data['rcsid'])) + continue; + ?> + <tr> + <td class="src"> + <? if ($data['action'] == 'modified') { - $outs .= '<a href="?source='.$data['page'].'">(View Source)</a>'; + $outs .= '<a href="?source='.($data['Spage'] || $data['page']).'">(View Source)</a>'; } - $outs .= ' + ?> </td> - <td class="page">' . $data['page'] . '</td> - <td class="lastmodstr">last ' . $data['action'] . '</td> - <td class="date">\2</td> + <td class="page"><?=$data['page']?></td> + <td class="lastmodstr">last <?=$data['action']?></td> + <td class="date"><?=$matches[2]?></td> <td>at</td> - <td class="time">\3</td> + <td class="time"><?=$matches[3]?></td> <td>by</td> - <td class="who">\4</td> + <td class="who"><?=$matches[4]?></td> <td>(revision:</td> - <td class="version">\1)</td> -</tr>'; - echo ereg_replace($rcsexpr, $outs, $data['rcsid']); + <td class="version"><?=$matches[1]?>)</td> +</tr> + <? } ?> </table> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:21:21
|
Revision: 7338 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7338&view=rev Author: luke-jr Date: 2007-09-12 03:21:13 -0700 (Wed, 12 Sep 2007) Log Message: ----------- preg for rcsid 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 2007-09-12 10:19:19 UTC (rev 7337) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:21:13 UTC (rev 7338) @@ -329,7 +329,7 @@ 'action' => 'updated', ), ) as $data) { - if (!preg_match($rcsexpr, $data['rcsid'])) + if (!preg_match($rcsexpr, $data['rcsid'], $matches)) continue; ?> <tr> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:22:58
|
Revision: 7339 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7339&view=rev Author: luke-jr Date: 2007-09-12 03:23:00 -0700 (Wed, 12 Sep 2007) Log Message: ----------- preg for rcsid 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 2007-09-12 10:21:13 UTC (rev 7338) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:23:00 UTC (rev 7339) @@ -329,6 +329,7 @@ 'action' => 'updated', ), ) as $data) { + echo '<!-- rcsid: ' . $data['rcsid'] . ' -->'; if (!preg_match($rcsexpr, $data['rcsid'], $matches)) continue; ?> @@ -336,7 +337,7 @@ <td class="src"> <? if ($data['action'] == 'modified') { - $outs .= '<a href="?source='.($data['Spage'] || $data['page']).'">(View Source)</a>'; + echo '<a href="?source='.($data['Spage'] || $data['page']).'">(View Source)</a>'; } ?> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:26:36
|
Revision: 7340 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7340&view=rev Author: luke-jr Date: 2007-09-12 03:26:40 -0700 (Wed, 12 Sep 2007) Log Message: ----------- debug info 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 2007-09-12 10:23:00 UTC (rev 7339) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:26:40 UTC (rev 7340) @@ -329,7 +329,7 @@ 'action' => 'updated', ), ) as $data) { - echo '<!-- rcsid: ' . $data['rcsid'] . ' -->'; + echo '<!-- ' . $data['page'] . ' rcsid: ' . $data['rcsid'] . ' -->'; if (!preg_match($rcsexpr, $data['rcsid'], $matches)) continue; ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:29:51
|
Revision: 7341 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7341&view=rev Author: luke-jr Date: 2007-09-12 03:29:51 -0700 (Wed, 12 Sep 2007) Log Message: ----------- pull outside rcsid from global 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 2007-09-12 10:26:40 UTC (rev 7340) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:29:51 UTC (rev 7341) @@ -298,6 +298,7 @@ <br /> <table class="rcsid"> <?php +global $top_rcsid, $aap_master_rcsid, $aap_serverinfo_rcsid; $serverlist_common_rcsid = '$Id$'; $rcsexpr = '%^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$%'; foreach (array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:30:51
|
Revision: 7342 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7342&view=rev Author: luke-jr Date: 2007-09-12 03:30:52 -0700 (Wed, 12 Sep 2007) Log Message: ----------- PHPs || sucks 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 2007-09-12 10:29:51 UTC (rev 7341) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:30:52 UTC (rev 7342) @@ -338,7 +338,7 @@ <td class="src"> <? if ($data['action'] == 'modified') { - echo '<a href="?source='.($data['Spage'] || $data['page']).'">(View Source)</a>'; + echo '<a href="?source='.($data['Spage']?$data['Spage']:$data['page']).'">(View Source)</a>'; } ?> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:41:35
|
Revision: 7343 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7343&view=rev Author: luke-jr Date: 2007-09-12 03:41:36 -0700 (Wed, 12 Sep 2007) Log Message: ----------- portable syntax color changing? 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 2007-09-12 10:30:52 UTC (rev 7342) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:41:36 UTC (rev 7343) @@ -58,11 +58,6 @@ color: #f3a9a9; } - .src font[color="#000000"] { color: #d0d0d0 !important; } - .src font[color="#0000BB"] { color: #00d0d0 !important; } - .src font[color="#007700"] { color: #00d000 !important; } - .src font[color="#DD0000"] { color: #ff5050 !important; } - table.rcsid { border: 0; margin-top: 1em; @@ -88,6 +83,13 @@ function serverlist_gpl() { if ($_GET['source'] != '') { + ini_set('highlight.bg', '#0b170b'); + ini_set('highlight.comment', '#FF8000'); + ini_set('highlight.default', '#00d0d0'); + ini_set('highlight.html', '#d0d0d0'); + ini_set('highlight.keyword', '#00d000'); + ini_set('highlight.string', '#ff5050'); + $srcreq = $_GET['source']; switch ($srcreq) { case '_top': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2007-09-12 10:46:21
|
Revision: 7344 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7344&view=rev Author: luke-jr Date: 2007-09-12 03:46:24 -0700 (Wed, 12 Sep 2007) Log Message: ----------- pull outside rcsid from global 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 2007-09-12 10:41:36 UTC (rev 7343) +++ www/beta/trunk/www-aabeta/serverlist-common.php 2007-09-12 10:46:24 UTC (rev 7344) @@ -300,7 +300,7 @@ <br /> <table class="rcsid"> <?php -global $top_rcsid, $aap_master_rcsid, $aap_serverinfo_rcsid; +global $top_rcsid, $aap_master_rcsid, $aap_serverinfo_rcsid, $player_name_links_rcsid; $serverlist_common_rcsid = '$Id$'; $rcsexpr = '%^\$'.'I'.'d: [^ ]+ ([0-9]+) ([0-9/-]+) ([0-9:]+)Z ([^ ]+) \$$%'; foreach (array( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |