[Xoops-cvs2] xoops-current/html/class xoopslists.php,1.5,1.6

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/class
In directory usw-pr-cvs1:/tmp/cvs-serv22806

Modified Files:
	xoopslists.php 
Log Message:
no message

Index: xoopslists.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/class/xoopslists.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xoopslists.php	26 Sep 2002 09:58:47 -0000	1.5
--- xoopslists.php	27 Sep 2002 12:58:24 -0000	1.6
***************
*** 45,59 ****
  		function &getDirListAsArray($dirname) {
  			$dirlist = array();
! 			$handle=@opendir($dirname);
! 			while ( ($file = readdir($handle)) ) {
! 				if ( !preg_match("/^[.]{1,2}$/",$file) ) {
! 					if ( is_dir($dirname.$file) ) {
! 						$dirlist[$file]=$file;
  					}
  				}
  			}
- 			closedir($handle);
- 			asort($dirlist);
- 			reset($dirlist);
  			return $dirlist;
  		}
--- 45,60 ----
  		function &getDirListAsArray($dirname) {
  			$dirlist = array();
! 			if ($handle = opendir($dirname)) {
! 				while (false !== ($file = readdir($handle))) {
! 					if ( !preg_match("/^[.]{1,2}$/",$file) ) {
! 						if ( is_dir($dirname.$file) ) {
! 							$dirlist[$file]=$file;
! 						}
  					}
  				}
+ 				closedir($handle);
+ 				asort($dirlist);
+ 				reset($dirlist);
  			}
  			return $dirlist;
  		}
***************
*** 64,77 ****
  		function &getFileListAsArray($dirname, $prefix="") {
  			$filelist = array();
! 			$handle=@opendir($dirname);
! 			while ( ($file = readdir($handle)) ) {
! 				if (!preg_match("/^[.]{1,2}$/",$file) && !is_dir($file)) {
! 					$file = $prefix.$file;
! 					$filelist[$file]=$file;
  				}
  			}
- 			closedir($handle);
- 			asort($filelist);
- 			reset($filelist);
  			return $filelist;
  		}
--- 65,79 ----
  		function &getFileListAsArray($dirname, $prefix="") {
  			$filelist = array();
! 			if ($handle = opendir($dirname)) {
! 				while (false !== ($file = readdir($handle))) {
! 					if (!preg_match("/^[.]{1,2}$/",$file) && !is_dir($file)) {
! 						$file = $prefix.$file;
! 						$filelist[$file]=$file;
! 					}
  				}
+ 				closedir($handle);
+ 				asort($filelist);
+ 				reset($filelist);
  			}
  			return $filelist;
  		}
***************
*** 82,95 ****
  		function &getImgListAsArray($dirname, $prefix="") {
  			$filelist = array();
! 			$handle=@opendir($dirname);
! 			while ( ($file = readdir($handle)) ) {
! 				if ( !preg_match("/^[.]{1,2}$/",$file) && preg_match("/[.gif|.jpg|.png]$/i",$file) ) {
! 					$file = $prefix.$file;
! 					$filelist[$file]=$file;
  				}
  			}
- 			closedir($handle);
- 			asort($filelist);
- 			reset($filelist);
  			return $filelist;
  		}
--- 84,98 ----
  		function &getImgListAsArray($dirname, $prefix="") {
  			$filelist = array();
! 			if ($handle = opendir($dirname)) {
! 				while (false !== ($file = readdir($handle))) {
! 					if ( !preg_match("/^[.]{1,2}$/",$file) && preg_match("/[.gif|.jpg|.png]$/i",$file) ) {
! 						$file = $prefix.$file;
! 						$filelist[$file]=$file;
! 					}
  				}
+ 				closedir($handle);
+ 				asort($filelist);
+ 				reset($filelist);
  			}
  			return $filelist;
  		}