[zi-cvs] packages/com.zzoss.installer.lib Utils.php,1.2,1.3

Update of /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib
In directory sc8-pr-cvs1:/tmp/cvs-serv11699/com.zzoss.installer.lib

Modified Files:
	Utils.php 
Log Message:
use DIRECTORY_SEPARATOR

Index: Utils.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib/Utils.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Utils.php	4 Jan 2004 13:26:55 -0000	1.2
--- Utils.php	4 Jan 2004 20:29:15 -0000	1.3
***************
*** 190,199 ****
  			$ignore_list[$key] = strtolower($val);
  		}
! 	  	if (is_dir($src))
! 			if (!ZZOSS_InstallerUtils::copy_rec($src, $dest, $recursive, $overwrite, $ignore_list))
  				return false;
! 			if (is_file($src) && ($overwrite || !file_exists($dest))) // do regular copy
! 				if (!copy($src, $dest))
  					return false;
  		return true;
  	}
--- 190,203 ----
  			$ignore_list[$key] = strtolower($val);
  		}
! 	  	if (is_dir($src)){
! 			if (!ZZOSS_InstallerUtils::copy_rec($src, $dest, $recursive, $overwrite, $ignore_list)){
  				return false;
!             }
! 			if (is_file($src) && ($overwrite || !file_exists($dest))){ // do regular copy
! 				if (!copy($src, $dest)){
  					return false;
+                 }
+             }
+         }
  		return true;
  	}
***************
*** 209,217 ****
  		if(!in_array(strtolower($file), $ignore_list)) {
  			$src_file = $src.$file;
! 			//echo '<br/>';
  			$dest_file = $dest.$file;
  			//echo '<br/>';
  			if ($recursive && is_dir($src_file) && $file !="." && $file != "..")
! 				if (!ZZOSS_InstallerUtils::copy_rec($src_file."/", $dest_file."/",$recursive, $overwrite, $ignore_list))
  					return false;
  			if (is_file($src_file) && ($overwrite || !file_exists($dest_file)))
--- 213,221 ----
  		if(!in_array(strtolower($file), $ignore_list)) {
  			$src_file = $src.$file;
! 			//echo ' -> ';
  			$dest_file = $dest.$file;
  			//echo '<br/>';
  			if ($recursive && is_dir($src_file) && $file !="." && $file != "..")
! 				if (!ZZOSS_InstallerUtils::copy_rec($src_file.DIRECTORY_SEPARATOR, $dest_file.DIRECTORY_SEPARATOR,$recursive, $overwrite, $ignore_list))
  					return false;
  			if (is_file($src_file) && ($overwrite || !file_exists($dest_file)))




-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills.  Sign up for IBM's
Free Linux Tutorials.  Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click