[zi-cvs] packages/com.zzoss.zic application_done.php,1.18,1.19 application_update_confirm.php,1.6,1.7

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

Modified Files:
	application_done.php application_update_confirm.php 
Log Message:
undo update sandbox

Index: application_update_confirm.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_update_confirm.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** application_update_confirm.php	17 May 2004 15:55:45 -0000	1.6
--- application_update_confirm.php	18 May 2004 17:24:01 -0000	1.7
***************
*** 42,49 ****
              // get the application settings of the old application.
              $app_settings = $zi_registry->getApplicationSettings();
!             
              // sandbox directory where update is performed
              $dir_sandbox = $zi_registry->getApplicationPath().'update_sandbox'.DIRECTORY_SEPARATOR;
              System::mkdir(array('-p', $dir_sandbox));
              // copy installed app to sandbox
              require_once 'ZZOSS_Dir/Dir.php';
--- 42,54 ----
              // get the application settings of the old application.
              $app_settings = $zi_registry->getApplicationSettings();
!             /*
              // sandbox directory where update is performed
              $dir_sandbox = $zi_registry->getApplicationPath().'update_sandbox'.DIRECTORY_SEPARATOR;
+             // if it already exists, clean it
+             if(is_dir($dir_sandbox)){
+                 System::rm(array('-rf', $dir_sandbox));
+             }
              System::mkdir(array('-p', $dir_sandbox));
+             
              // copy installed app to sandbox
              require_once 'ZZOSS_Dir/Dir.php';
***************
*** 54,58 ****
              $app_setttings_update['application_root'] = $dir_sandbox;
              //$zi_registry->updateApplicationSettings($app_settings_update, 'update');
!             
              ZZOSS_Package::extractDistribution($extract_dir, $zi_registry->getDir());
              
--- 59,63 ----
              $app_setttings_update['application_root'] = $dir_sandbox;
              //$zi_registry->updateApplicationSettings($app_settings_update, 'update');
!             */
              ZZOSS_Package::extractDistribution($extract_dir, $zi_registry->getDir());
              
***************
*** 71,75 ****
              $zi_registry->updateApplicationSettings($app_settings);
              // register sandbox settings for update
!             $zi_registry->updateApplicationSettings($app_settings_update, 'update');
              
              //$_REQUEST['id'] = $application['id'];
--- 76,80 ----
              $zi_registry->updateApplicationSettings($app_settings);
              // register sandbox settings for update
!             //$zi_registry->updateApplicationSettings($app_settings_update, 'update');
              
              //$_REQUEST['id'] = $application['id'];

Index: application_done.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_done.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** application_done.php	17 May 2004 15:55:45 -0000	1.18
--- application_done.php	18 May 2004 17:24:01 -0000	1.19
***************
*** 62,65 ****
--- 62,66 ----
      // if this is an update, remove the old application
      if(isset($_REQUEST['update_distri']) && isset($_REQUEST['update_app'])){
+         /*
          // copy the files from the sandbox to the application root
          $app_settings = $zi_registry->getApplicationSettings('update');
***************
*** 69,73 ****
          require_once 'ZZOSS_Dir/Dir.php';
          ZZOSS_Dir::copy($dir_sandbox, $app_settings['application_root']);
!         
          // delete the old application, including the sandbox files
          $zi_registry->removeApplication($_REQUEST['update_app'], $_REQUEST['update_distri']);
--- 70,74 ----
          require_once 'ZZOSS_Dir/Dir.php';
          ZZOSS_Dir::copy($dir_sandbox, $app_settings['application_root']);
!         */
          // delete the old application, including the sandbox files
          $zi_registry->removeApplication($_REQUEST['update_app'], $_REQUEST['update_distri']);



-------------------------------------------------------
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