[zi-cvs] packages/com.zzoss.zic application_settings.php,1.15,1.16

Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12029

Modified Files:
	application_settings.php 
Log Message:
fix bug: installer installed with instant installer could not detect the installer it was installed with because of double ending slash in application root

Index: application_settings.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_settings.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** application_settings.php	6 Apr 2004 14:45:17 -0000	1.15
--- application_settings.php	18 May 2004 16:45:01 -0000	1.16
***************
*** 35,38 ****
--- 35,42 ----
  	function zi_process()
  	{
+         include_once 'ZZOSS_File/File.php';
+         
+         $_REQUEST['ZI_VALUES']['application_root'] = ZZOSS_File::fixPath($_REQUEST['ZI_VALUES']['application_root']);
+         
          if(!isset($_REQUEST['dev']) || $_REQUEST['dev'] != 'bundle'){
              // should we create the install root?
***************
*** 74,77 ****
--- 78,83 ----
      function default_paths($dev_mode = false)
      {
+         include_once 'ZZOSS_File/File.php';
+         
          if($GLOBALS['ZI']['mode'] != 'setup'){
              $application = $_REQUEST['application'];
***************
*** 85,89 ****
          // absolute root
          $split[0] = substr(dirname($_SERVER['PATH_TRANSLATED']), 0, strrpos(dirname($_SERVER['PATH_TRANSLATED']), '/')).'/';
!         $_REQUEST['ZI_VALUES']['application_root'] = ZZOSS_InstallerUtils::fixSlashes($split[0].$application.DIRECTORY_SEPARATOR);
          $split[0] = substr(dirname($_SERVER['PHP_SELF']), 0, strrpos(dirname($_SERVER['PHP_SELF']), '/')).'/';
          $_REQUEST['ZI_VALUES']['application_url_rel'] = $split[0];
--- 91,95 ----
          // absolute root
          $split[0] = substr(dirname($_SERVER['PATH_TRANSLATED']), 0, strrpos(dirname($_SERVER['PATH_TRANSLATED']), '/')).'/';
!         $_REQUEST['ZI_VALUES']['application_root'] = ZZOSS_File::fixPath($split[0].$application.DIRECTORY_SEPARATOR);
          $split[0] = substr(dirname($_SERVER['PHP_SELF']), 0, strrpos(dirname($_SERVER['PHP_SELF']), '/')).'/';
          $_REQUEST['ZI_VALUES']['application_url_rel'] = $split[0];



-------------------------------------------------------
This SF.Net email is sponsored by: SourceForge.net Broadband
Sign-up now for SourceForge Broadband and get the fastest
6.0/768 connection for only $19.95/mo for the first 3 months!
http://ads.osdn.com/?ad_id=2562&alloc_id=6184&op=click