[zi-cvs] packages/com.zzoss.zic packages_dependencies.php,1.13,1.14 packages_download.php,1.11,1.12 plugins_process.php,1.11,1.12 plugins_re.php,1.2,1.3

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

Modified Files:
	packages_dependencies.php packages_download.php 
	plugins_process.php plugins_re.php 
Log Message:
make installation of single packages installed via packages manager work

Index: packages_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_download.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** packages_download.php	7 Apr 2004 10:01:00 -0000	1.11
--- packages_download.php	7 Apr 2004 14:21:54 -0000	1.12
***************
*** 78,83 ****
                  foreach($packages_selection as $key=>$val) {
                      if(!$error) {
!                         $name = $packages_resolve[$key];
!                         $package = $packages[$name];
                          if($val == 'I' && $package["install"]["type"] == 'remote') {
                              // create directory
--- 78,83 ----
                  foreach($packages_selection as $key=>$val) {
                      if(!$error) {
!                         $pkg_name = $packages_resolve[$key];
!                         $package = $packages[$pkg_name];
                          if($val == 'I' && $package["install"]["type"] == 'remote') {
                              // create directory
***************
*** 187,191 ****
          $name = $packages_resolve[$key];
          $package = $packages[$name];
!         if( ($val=='I') && ($package["install"]["type"] == 'remote') ) {
              $has_downloads = true;
              break;
--- 187,195 ----
          $name = $packages_resolve[$key];
          $package = $packages[$name];
!         if(
!             $val=='I' &&
!             $package["install"]["type"] == 'remote' && 
!             !file_exists($zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR.$name.'.tgz')
!             ) {
              $has_downloads = true;
              break;

Index: packages_dependencies.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_dependencies.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** packages_dependencies.php	7 Apr 2004 10:01:00 -0000	1.13
--- packages_dependencies.php	7 Apr 2004 14:21:53 -0000	1.14
***************
*** 52,56 ****
      $app_settings = $zi_registry->getApplicationSettings();
      
!     if($app_settings["application_profile"] != 'custom') {
          $zi_registry->setPkgsActionsPreselect($app_settings["application_profile"]);
      }
--- 52,56 ----
      $app_settings = $zi_registry->getApplicationSettings();
      
!     if(!$zi_registry->isInstalledApplication() && $app_settings["application_profile"] != 'custom') {
          $zi_registry->setPkgsActionsPreselect($app_settings["application_profile"]);
      }

Index: plugins_re.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/plugins_re.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** plugins_re.php	7 Apr 2004 06:12:03 -0000	1.2
--- plugins_re.php	7 Apr 2004 14:21:54 -0000	1.3
***************
*** 71,80 ****
  	function zi_process()
  	{
          if(isset($_REQUEST['re_type']) && $_REQUEST['re_type'] == 'filerole'){
              return true;
          }
          
-         global $zi_registry;
-         
          $pkg_type = 'package';
          if(isset($_REQUEST['type'])){
--- 71,80 ----
  	function zi_process()
  	{
+         global $zi_registry;
+         
          if(isset($_REQUEST['re_type']) && $_REQUEST['re_type'] == 'filerole'){
              return true;
          }
          
          $pkg_type = 'package';
          if(isset($_REQUEST['type'])){
***************
*** 148,152 ****
          
          // Display errors.
!         echo $plugin->getOutput();
          /*
          $queue = $zi_registry->getPackagesQueue();
--- 148,155 ----
          
          // Display errors.
!         $output = $plugin->getOutput();
!         if(strlen($output)){
!             echo $output;
!         }
          /*
          $queue = $zi_registry->getPackagesQueue();
***************
*** 333,336 ****
--- 336,342 ----
                  $url_next = 'application_done.php'.zi_form_querystr();
              }
+             if(isset($_REQUEST['type']) && $_REQUEST['type'] == 'package'){
+                 $zi_registry->unsetPackages();
+             }
          }
  	}

Index: plugins_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/plugins_process.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** plugins_process.php	6 Apr 2004 14:45:17 -0000	1.11
--- plugins_process.php	7 Apr 2004 14:21:54 -0000	1.12
***************
*** 66,69 ****
--- 66,79 ----
          }
          
+         if(!$has_step){
+             // clean up packages registry
+             $zi_registry->unsetPackages();
+             if($pkg_type == 'package'){
+                 $zi_registry->unsetPackagesQueue();
+                 $zi_registry->setPackageType('plugin');
+                 $zi_registry->unsetPackagesQueue();
+             }
+         }
+         
          header('Location: '.$url_next);
          exit;



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