From: Hendrik B. <nh...@us...> - 2012-02-05 20:41:45
|
Update of /cvsroot/arianne/website In directory vz-cvs-4.sog:/tmp/cvs-serv15975 Modified Files: renderContent.php Log Message: ignore hidden files in list renderings (e. g. files created by CVS conflicts) Index: renderContent.php =================================================================== RCS file: /cvsroot/arianne/website/renderContent.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** renderContent.php 4 Dec 2011 18:31:27 -0000 1.12 --- renderContent.php 5 Feb 2012 20:41:42 -0000 1.13 *************** *** 21,26 **** } ! /** This function renders the Download section related to games ! $type should be "game_","server_" or "client_" */ function renderDownloads($type) { --- 21,27 ---- } ! /** ! * This function renders the Download section related to games ! * $type should be "game_","server_" or "client_" */ function renderDownloads($type) { *************** *** 29,33 **** while (false !== ($file = readdir($handle))) { ! if ($file=='.'||$file=='..') { continue; } --- 30,34 ---- while (false !== ($file = readdir($handle))) { ! if (strpos($file, '.') === 0) { continue; } *************** *** 56,62 **** $gameList=array(); $handle=opendir("xml/"); ! while (false !== ($file = readdir($handle))) ! { ! if ($file=='.'||$file=='..') { continue; } --- 57,62 ---- $gameList=array(); $handle=opendir("xml/"); ! while (false !== ($file = readdir($handle))) { ! if (strpos($file, '.') === 0) { continue; } *************** *** 89,103 **** function renderGameBriefing($long_briefing=TRUE, $type) { $gameList=array(); ! $handle=opendir("xml/"); while (false !== ($file = readdir($handle))) { ! if ($file=='.'||$file=='..') { continue; } ! if (strpos($file, '~')!==false) { continue; } if (!is_dir("xml/".$file)) { ! if (strpos($file,$type.'_')!==false) { $gameList[]="xml/".$file; } --- 89,103 ---- function renderGameBriefing($long_briefing=TRUE, $type) { $gameList=array(); ! $handle = opendir("xml/"); while (false !== ($file = readdir($handle))) { ! if (strpos($file, '.') === 0) { continue; } ! if (strpos($file, '~') !== false) { continue; } if (!is_dir("xml/".$file)) { ! if (strpos($file,$type.'_') !== false) { $gameList[]="xml/".$file; } *************** *** 121,128 **** while (false !== ($file = readdir($handle))) { ! if ($file=='.'||$file=='..') { continue; } ! if (strpos($file, '~')!==false) { continue; } --- 121,128 ---- while (false !== ($file = readdir($handle))) { ! if (strpos($file, '.') === 0) { continue; } ! if (strpos($file, '~') !== false) { continue; } |