From: <lu...@us...> - 2009-03-04 16:30:55
|
Revision: 9115 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9115&view=rev Author: luke-jr Date: 2009-03-04 16:30:40 +0000 (Wed, 04 Mar 2009) Log Message: ----------- support previews on non-maps when available show UNKNOWN_ICON if map preview missing list dtds Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 14:49:51 UTC (rev 9114) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:30:40 UTC (rev 9115) @@ -97,14 +97,14 @@ $name = $file; $version = NULL; } else { - if(!strstr($file, '.xml')) continue; - if(strstr($file, '.aamap.xml')) { - $imagepath = PREVIEWS_PATH_WEB . $path . '/' . $file . THUMBNAIL_POSTFIX; - } else { + if(!(strstr($file, '.xml') || strstr($file, '.dtd'))) + continue; + $imagepath = $path . '/' . $file . THUMBNAIL_POSTFIX; + if (!file_exists(PREVIEWS_PATH . $imagepath)) $imagepath = UNKNOWN_ICON; - } + $imagepath = PREVIEWS_PATH_WEB . $imagepath; list($name, $version) = explode('-', $file, 2); - $version = ereg_replace('\\.aa[^.]*\\.xml$', '', $version); + $version = preg_replace('/(?:\\.aa[^.]*\\.xml|\\.dtd)$/', '', $version); if($version != $latest[$name]['version']) continue; } $linkpath = LINK_PATH . $path . '/' . $file; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:32:20
|
Revision: 9116 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9116&view=rev Author: luke-jr Date: 2009-03-04 16:32:11 +0000 (Wed, 04 Mar 2009) Log Message: ----------- fix UNKNOWN_ICON use Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:30:40 UTC (rev 9115) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:32:11 UTC (rev 9116) @@ -102,6 +102,7 @@ $imagepath = $path . '/' . $file . THUMBNAIL_POSTFIX; if (!file_exists(PREVIEWS_PATH . $imagepath)) $imagepath = UNKNOWN_ICON; + else $imagepath = PREVIEWS_PATH_WEB . $imagepath; list($name, $version) = explode('-', $file, 2); $version = preg_replace('/(?:\\.aa[^.]*\\.xml|\\.dtd)$/', '', $version); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:38:36
|
Revision: 9118 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9118&view=rev Author: luke-jr Date: 2009-03-04 16:38:26 +0000 (Wed, 04 Mar 2009) Log Message: ----------- support for non-XML resources Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:36:32 UTC (rev 9117) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:38:26 UTC (rev 9118) @@ -10,6 +10,7 @@ define('THUMB_WIDTH', '128'); define('THUMB_HEIGHT', '128'); define('LINK_PATH', '/resource-browser/resource/'); + define('RESOURCE_EXT_PREG', '/(?:\\.aa[^.]*\\.xml|\\.dtd)$/'); define('MAPS_PATH_REAL', realpath(MAPS_PATH)); @@ -77,7 +78,7 @@ $latest = array(); foreach($files as $file) { list($name, $version) = explode('-', $file, 2); - $version = ereg_replace('\\.aa[^.]*\\.xml$', '', $version); + $version = preg_replace(RESOURCE_EXT_PREG, '', $version); $mtime = stat(ereg_replace('/+', '/', $searchpath . '/' . $file)); $mtime = $mtime[10]; if(isset($latest[$name]) && $mtime < $latest[$name]['mtime']) @@ -97,7 +98,7 @@ $name = $file; $version = NULL; } else { - if(!(strstr($file, '.xml') || strstr($file, '.dtd'))) + if(!preg_match(RESOURCE_EXT_PREG, $file)) continue; $imagepath = $path . '/' . $file . THUMBNAIL_POSTFIX; if (!file_exists(PREVIEWS_PATH . $imagepath)) @@ -105,7 +106,7 @@ else $imagepath = PREVIEWS_PATH_WEB . $imagepath; list($name, $version) = explode('-', $file, 2); - $version = preg_replace('/(?:\\.aa[^.]*\\.xml|\\.dtd)$/', '', $version); + $version = preg_replace(RESOURCE_EXT_PREG, '', $version); if($version != $latest[$name]['version']) continue; } $linkpath = LINK_PATH . $path . '/' . $file; @@ -175,7 +176,7 @@ $versions = array(); while(($file = readdir($dir)) !== false) { if(substr($file, 0, strlen($resourceInfo['NAME']) + 1) == $resourceInfo['NAME'] . '-') { - $version = ereg_replace('\\.' . $resourceInfo['TYPE'] . '\\.xml', '', substr($file, strlen($resourceInfo['NAME']) + 1)); + $version = preg_replace(RESOURCE_EXT_PREG, '', substr($file, strlen($resourceInfo['NAME']) + 1)); if ($version != $resourceInfo['VERSION']) { $versions[] = $version; } @@ -185,6 +186,7 @@ natcasesort($versions); print('<h2>Other Versions</h2><ul>'); foreach($versions as $version) { + // FIXME xml hardcoding ?> <li><a href="<?=LINK_PATH . simplifypath($resourceInfo['AUTHOR'] . '/' . $resourceInfo['CATEGORY'] . '/' . $resourceInfo['NAME'] . '-' . $version . '.' . $resourceInfo['TYPE'] . '.xml')?>"><?=$version?></a></li> <?php This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:40:39
|
Revision: 9119 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9119&view=rev Author: luke-jr Date: 2009-03-04 16:40:35 +0000 (Wed, 04 Mar 2009) Log Message: ----------- better support for non-XML resources Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:38:26 UTC (rev 9118) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:40:35 UTC (rev 9119) @@ -120,7 +120,7 @@ <?php } print('</ul>'); -} else if (is_file($searchpath)) { +} else if (is_file($searchpath) && preg_match('/\\.xml$/', $searchpath)) { $path = ereg_replace('^.?/', '', $path); $axes = NULL; $xml_parser = xml_parser_create(); @@ -213,6 +213,8 @@ print('<p>Number of axes: ' . $axes . '</p>'); } print('<h2>File contents</h2><pre>' . htmlspecialchars(implode('', file(MAPS_PATH . '/' . $path))) . '</pre>'); +} else if (is_file($searchpath)) { + print('<h1>Preview not supported for this resource</h1>'); } else { print('<h1>Unknown error</h1>'); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:50:49
|
Revision: 9120 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9120&view=rev Author: luke-jr Date: 2009-03-04 16:50:20 +0000 (Wed, 04 Mar 2009) Log Message: ----------- better support for non-XML resources Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:40:35 UTC (rev 9119) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:50:20 UTC (rev 9120) @@ -120,8 +120,12 @@ <?php } print('</ul>'); -} else if (is_file($searchpath) && preg_match('/\\.xml$/', $searchpath)) { +} else if (is_file($searchpath)) { $path = ereg_replace('^.?/', '', $path); + + if (preg_match('/\\.xml$/', $searchpath)) + { + $axes = NULL; $xml_parser = xml_parser_create(); xml_set_element_handler($xml_parser, "startElement", "endElement"); @@ -138,18 +142,35 @@ } xml_parser_free($xml_parser); if($resourceInfo['TYPE'] == '') $resourceInfo['TYPE'] = 'aamap'; + $resourceInfo['USAGE'] = strtoupper(substr($resourceInfo['TYPE'], 2)) . "_FILE \\1"; + + } + else + $resourceInfo['TYPE'] = 'Unknown'; + + if (preg_match('/\\.dtd$/', $searchpath) + { + $resourceInfo['TYPE'] = 'DTD'; + $resourceInfo['USAGE'] = '<!DOCTYPE Resource SYSTEM "\\1">'; + } + ?> <h1>Details of <?=$path?></h1> <?php - if($resourceInfo['TYPE'] == 'aamap') { + if(file_exists(PREVIEWS_PATH . $path . IMAGE_POSTFIX)) { ?> <h2>Preview</h2> <p><img src="<?=PREVIEWS_PATH_WEB . $path . IMAGE_POSTFIX?>" alt="full preview" /></p> <?php } + if ($resourceInfo['USAGE']) + { ?> <h2>To use:</h2> -<pre><?=substr(strtoupper($resourceInfo['TYPE']), 2)?>_FILE <?=$path?></pre> +<pre><?=strtr($resourceInfo['USAGE'], '\\1', $path)?></pre> + <?php + } + ?> <h2>Original file</h2> <p><a href="http://resource.armagetronad.net/resource/<?=$path?>">http://resource.armagetronad.net/resource/<?=$path?></a></p> <h2>Resource attributes</h2> @@ -213,8 +234,6 @@ print('<p>Number of axes: ' . $axes . '</p>'); } print('<h2>File contents</h2><pre>' . htmlspecialchars(implode('', file(MAPS_PATH . '/' . $path))) . '</pre>'); -} else if (is_file($searchpath)) { - print('<h1>Preview not supported for this resource</h1>'); } else { print('<h1>Unknown error</h1>'); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:51:04
|
Revision: 9121 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9121&view=rev Author: luke-jr Date: 2009-03-04 16:50:59 +0000 (Wed, 04 Mar 2009) Log Message: ----------- missing paren Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:50:20 UTC (rev 9120) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:50:59 UTC (rev 9121) @@ -148,7 +148,7 @@ else $resourceInfo['TYPE'] = 'Unknown'; - if (preg_match('/\\.dtd$/', $searchpath) + if (preg_match('/\\.dtd$/', $searchpath)) { $resourceInfo['TYPE'] = 'DTD'; $resourceInfo['USAGE'] = '<!DOCTYPE Resource SYSTEM "\\1">'; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:52:29
|
Revision: 9122 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9122&view=rev Author: luke-jr Date: 2009-03-04 16:52:24 +0000 (Wed, 04 Mar 2009) Log Message: ----------- htmlentities on usage string Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:50:59 UTC (rev 9121) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:52:24 UTC (rev 9122) @@ -167,7 +167,7 @@ { ?> <h2>To use:</h2> -<pre><?=strtr($resourceInfo['USAGE'], '\\1', $path)?></pre> +<pre><?=htmlentities(strtr($resourceInfo['USAGE'], '\\1', $path))?></pre> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:54:49
|
Revision: 9123 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9123&view=rev Author: luke-jr Date: 2009-03-04 16:54:45 +0000 (Wed, 04 Mar 2009) Log Message: ----------- strtr has an odd syntax Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:52:24 UTC (rev 9122) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:54:45 UTC (rev 9123) @@ -167,7 +167,7 @@ { ?> <h2>To use:</h2> -<pre><?=htmlentities(strtr($resourceInfo['USAGE'], '\\1', $path))?></pre> +<pre><?=htmlentities(strtr($resourceInfo['USAGE'], array('\\1', $path)))?></pre> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:56:33
|
Revision: 9124 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9124&view=rev Author: luke-jr Date: 2009-03-04 16:56:28 +0000 (Wed, 04 Mar 2009) Log Message: ----------- clear ambiguity Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:54:45 UTC (rev 9123) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:56:28 UTC (rev 9124) @@ -151,7 +151,7 @@ if (preg_match('/\\.dtd$/', $searchpath)) { $resourceInfo['TYPE'] = 'DTD'; - $resourceInfo['USAGE'] = '<!DOCTYPE Resource SYSTEM "\\1">'; + $resourceInfo['USAGE'] = "<!DOCTYPE Resource SYSTEM \"\\1\">"; } ?> @@ -167,7 +167,7 @@ { ?> <h2>To use:</h2> -<pre><?=htmlentities(strtr($resourceInfo['USAGE'], array('\\1', $path)))?></pre> +<pre><?=htmlentities(strtr($resourceInfo['USAGE'], array("\\1", $path)))?></pre> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 16:59:12
|
Revision: 9126 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9126&view=rev Author: luke-jr Date: 2009-03-04 16:59:02 +0000 (Wed, 04 Mar 2009) Log Message: ----------- more PHP weirdness Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:57:04 UTC (rev 9125) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:59:02 UTC (rev 9126) @@ -167,7 +167,7 @@ { ?> <h2>To use:</h2> -<pre><?=htmlentities(strtr($resourceInfo['USAGE'], array("\\1", $path)))?></pre> +<pre><?=htmlentities(strtr($resourceInfo['USAGE'], array("\\1" => $path)))?></pre> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 17:04:44
|
Revision: 9127 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9127&view=rev Author: luke-jr Date: 2009-03-04 17:04:35 +0000 (Wed, 04 Mar 2009) Log Message: ----------- preg to get resource info from filepaths for non-XML resources Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 16:59:02 UTC (rev 9126) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:04:35 UTC (rev 9127) @@ -10,7 +10,8 @@ define('THUMB_WIDTH', '128'); define('THUMB_HEIGHT', '128'); define('LINK_PATH', '/resource-browser/resource/'); - define('RESOURCE_EXT_PREG', '/(?:\\.aa[^.]*\\.xml|\\.dtd)$/'); + $Resource_Ext_Preg = "(?:\\.aa[^.]*\\.xml|\\.dtd)"; + define('RESOURCE_EXT_PREG', "/$Resource_Ext_Preg\$/"); define('MAPS_PATH_REAL', realpath(MAPS_PATH)); @@ -146,7 +147,14 @@ } else + { $resourceInfo['TYPE'] = 'Unknown'; + preg_match(":([^/]+)/(?:(.*)/)?([^-]+)-(.*?)($Resource_Ext_Preg)\$:", $path, $M); + $resourceInfo['AUTHOR' ] = $M[1]; + $resourceInfo['CATEGORY'] = $M[2]; + $resourceInfo['NAME' ] = $M[3]; + $resourceInfo['VERSION' ] = $M[4]; + } if (preg_match('/\\.dtd$/', $searchpath)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 17:07:39
|
Revision: 9128 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9128&view=rev Author: luke-jr Date: 2009-03-04 17:07:08 +0000 (Wed, 04 Mar 2009) Log Message: ----------- PHP PCRE is annyoing Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:04:35 UTC (rev 9127) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:07:08 UTC (rev 9128) @@ -149,7 +149,7 @@ else { $resourceInfo['TYPE'] = 'Unknown'; - preg_match(":([^/]+)/(?:(.*)/)?([^-]+)-(.*?)($Resource_Ext_Preg)\$:", $path, $M); + preg_match("~([^/]+)/(?:(.*)/)?([^-]+)-(.*?)($Resource_Ext_Preg)\$~", $path, $M); $resourceInfo['AUTHOR' ] = $M[1]; $resourceInfo['CATEGORY'] = $M[2]; $resourceInfo['NAME' ] = $M[3]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 17:12:04
|
Revision: 9129 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9129&view=rev Author: luke-jr Date: 2009-03-04 17:12:03 +0000 (Wed, 04 Mar 2009) Log Message: ----------- fix Other Versions for non-XML Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:07:08 UTC (rev 9128) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:12:03 UTC (rev 9129) @@ -201,23 +201,24 @@ </tr> </table> <?php - $dir = opendir(MAPS_PATH . '/'. $resourceInfo['AUTHOR'] . '/' . $resourceInfo['CATEGORY']); + $rpfx = $resourceInfo['AUTHOR'] . '/' . $resourceInfo['CATEGORY']; + $dir = opendir(MAPS_PATH . '/'. $rpfx); $versions = array(); while(($file = readdir($dir)) !== false) { if(substr($file, 0, strlen($resourceInfo['NAME']) + 1) == $resourceInfo['NAME'] . '-') { $version = preg_replace(RESOURCE_EXT_PREG, '', substr($file, strlen($resourceInfo['NAME']) + 1)); if ($version != $resourceInfo['VERSION']) { - $versions[] = $version; + $versions[$version] = "$rpfx/$file"; } } } if(count($versions) != 0) { natcasesort($versions); print('<h2>Other Versions</h2><ul>'); - foreach($versions as $version) { + foreach($versions as $version => $file) { // FIXME xml hardcoding ?> -<li><a href="<?=LINK_PATH . simplifypath($resourceInfo['AUTHOR'] . '/' . $resourceInfo['CATEGORY'] . '/' . $resourceInfo['NAME'] . '-' . $version . '.' . $resourceInfo['TYPE'] . '.xml')?>"><?=$version?></a></li> +<li><a href="<?=LINK_PATH . simplifypath($file)?>"><?=$version?></a></li> <?php } print('</ul>'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 17:16:08
|
Revision: 9130 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9130&view=rev Author: luke-jr Date: 2009-03-04 17:16:01 +0000 (Wed, 04 Mar 2009) Log Message: ----------- sort Other Versions with version_compare Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:12:03 UTC (rev 9129) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:16:01 UTC (rev 9130) @@ -213,7 +213,7 @@ } } if(count($versions) != 0) { - natcasesort($versions); + uksort($versions, version_compare); print('<h2>Other Versions</h2><ul>'); foreach($versions as $version => $file) { // FIXME xml hardcoding This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 17:19:11
|
Revision: 9131 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9131&view=rev Author: luke-jr Date: 2009-03-04 17:19:05 +0000 (Wed, 04 Mar 2009) Log Message: ----------- find latest version with version_compare instead of mtime (which reflects when the res was added, not made Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:16:01 UTC (rev 9130) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:19:05 UTC (rev 9131) @@ -80,9 +80,12 @@ foreach($files as $file) { list($name, $version) = explode('-', $file, 2); $version = preg_replace(RESOURCE_EXT_PREG, '', $version); +/* $mtime = stat(ereg_replace('/+', '/', $searchpath . '/' . $file)); $mtime = $mtime[10]; if(isset($latest[$name]) && $mtime < $latest[$name]['mtime']) +*/ + if(isset($latest[$name]) && version_compare($version,$latest[$name]['version'], '<')) continue; else $latest[$name] = array('mtime' => $mtime, 'version' => $version); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lu...@us...> - 2009-03-04 17:22:12
|
Revision: 9132 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9132&view=rev Author: luke-jr Date: 2009-03-04 17:22:08 +0000 (Wed, 04 Mar 2009) Log Message: ----------- dont list (invalid) root-level files Modified Paths: -------------- www/beta/trunk/www-aabeta/resource-browser/preview.php Modified: www/beta/trunk/www-aabeta/resource-browser/preview.php =================================================================== --- www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:19:05 UTC (rev 9131) +++ www/beta/trunk/www-aabeta/resource-browser/preview.php 2009-03-04 17:22:08 UTC (rev 9132) @@ -65,6 +65,8 @@ $dir=opendir($searchpath); $files = array(); $dirs = array(); + if ($path != '') + { while(($file = readdir($dir)) !== false) { if(is_dir($searchpath . '/' . $file)) { $dirs[] = $file; @@ -73,6 +75,13 @@ } } natcasesort($files); + } + else + { + while(($file = readdir($dir)) !== false) + if(is_dir($searchpath . '/' . $file)) + $dirs[] = $file; + } natcasesort($dirs); //find the last version of each file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |