[zi-cvs] packages/com.zzoss.zic.plugin.filerole role_php.php,1.5,1.6

Christian Zonsius <[email protected]> Mon, 22 Mar 2004 20:45:47 +0000
Newsgroups gmane.comp.php.zzoss.installer.cvs
Message-ID <[email protected]>
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic.plugin.filerole
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20706

Modified Files:
	role_php.php 
Log Message:
mkdir() bugfix

Index: role_php.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic.plugin.filerole/role_php.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** role_php.php	22 Mar 2004 20:13:38 -0000	1.5
--- role_php.php	22 Mar 2004 20:45:45 -0000	1.6
***************
*** 29,33 ****
  			$path = str_replace('\\', DIRECTORY_SEPARATOR, $path);
  			$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
! 			return $path;
  		}
  	}
--- 29,37 ----
  			$path = str_replace('\\', DIRECTORY_SEPARATOR, $path);
  			$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
! 			if(($path==".")||($path==".".DIRECTORY_SEPARATOR)) {
! 				return '';
! 			} else {
! 				return $path;
! 			}
  		}
  	}
***************
*** 58,63 ****
                                  );
      }
!     $file_dest = ZZOSS_fixPath($fileroles_dirs[$GLOBALS['ZI']['file_role']]).DIRECTORY_SEPARATOR.ZZOSS_fixPath($GLOBALS['ZI']['file_baseinstalldir']).$GLOBALS['ZI']['file_name_dest'];
!     
      switch($GLOBALS['ZI']['package_action']){
          case 'remove':
--- 62,67 ----
                                  );
      }
!     $file_dest = ZZOSS_fixPath($fileroles_dirs[$GLOBALS['ZI']['file_role']].DIRECTORY_SEPARATOR).ZZOSS_fixPath($GLOBALS['ZI']['file_baseinstalldir']).$GLOBALS['ZI']['file_name_dest'];
! 
      switch($GLOBALS['ZI']['package_action']){
          case 'remove':
***************
*** 70,73 ****
--- 74,81 ----
                  break;
              } else {
+ 				//echo dirname($file_dest).'<br/>';
+ 				//echo $GLOBALS['ZI']['file_baseinstalldir'].'<br/>';
+ 				//echo $GLOBALS['ZI']['file_name_dest'].'<br/>';
+ 				//echo '<br/>';
                  if(!is_dir(dirname($file_dest))){
                      System::mkDir(array("-p",dirname($file_dest)));
***************
*** 76,81 ****
                  //ZZOSS_InstallerUtils::mkdir($pathinfo["dirname"]);
                  //$log .= 'src: '.$src. 'dest: '.$dest."\n";
!                 //echo 'src: '.$src. 'dest: '.$dest."\n<br>";
!                 if(!copy($GLOBALS['ZI']['file_src'],$file_dest)) {
                      $GLOBALS['ZI']['plugin_log'] .=
                      'Cannot copy '.$GLOBALS['ZI']['file_src']."\n".
--- 84,89 ----
                  //ZZOSS_InstallerUtils::mkdir($pathinfo["dirname"]);
                  //$log .= 'src: '.$src. 'dest: '.$dest."\n";
!                 //echo 'src: '.$GLOBALS['ZI']['file_src']. 'dest: '.$file_dest."\n<br>";
!                 if(!copy(ZZOSS_fixPath($GLOBALS['ZI']['file_src']),$file_dest)) {
                      $GLOBALS['ZI']['plugin_log'] .=
                      'Cannot copy '.$GLOBALS['ZI']['file_src']."\n".



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click