[zi-cvs] packages/com.zzoss.installer.lib Registry.php,1.3,1.4

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

Modified Files:
	Registry.php 
Log Message:
fixed bug in ZZOSS_InstallerRegistry::refreshApplications() which caused installer to always switch to first application during installation process, see http://sourceforge.net/tracker/index.php?func=detail&aid=867719&group_id=95735&atid=612476

Index: Registry.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib/Registry.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Registry.php	4 Jan 2004 18:45:29 -0000	1.3
--- Registry.php	4 Jan 2004 19:24:53 -0000	1.4
***************
*** 604,607 ****
--- 604,608 ----
          }
          */
+         
          $applications = array();
          $applications_resolve = array();
***************
*** 616,619 ****
--- 617,624 ----
                  ZZOSS_Debug::log('ZZOSS_Registry', 'Scanning directory '.$this->distribution_path.'applications', __FILE__, __LINE__, __FUNCTION__, __CLASS__);
              }
+             
+             // remember the current application
+             $application = $this->application;
+             
              while (false !== ($entry = readdir($dp))) { 
                  $dir = $this->distribution_path.'applications'.DIRECTORY_SEPARATOR.$entry;
***************
*** 627,630 ****
--- 632,636 ----
                      // is this application installed ?
                      if($config_installed = $this->isInstalledApplication($entry)){
+                         
                          $xml["installed"] = $config_installed["release"]["version"];
                      }
***************
*** 645,648 ****
--- 651,657 ----
              closedir($dp);
              
+             // Set back application
+             $this->setApplication($application);
+             
              // sort array
              if(is_array($applications)) {
***************
*** 704,708 ****
      function isInstalledApplication($application = NULL, $distribution = NULL)
      {
-         /*
          if(!is_null($distribution)){
              $this->setDistribution($distribution);
--- 713,716 ----
***************
*** 711,715 ****
              $this->setApplication($application);
          }
!         */
          $file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'application_installed.reg';
          //if(file_exists($file)) {
--- 719,723 ----
              $this->setApplication($application);
          }
!         
          $file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'application_installed.reg';
          //if(file_exists($file)) {
***************
*** 745,749 ****
      function isHiddenApplication($application = NULL, $distribution = NULL)
      {
-         /*
          if(!is_null($distribution)){
              $this->setDistribution($distribution);
--- 753,756 ----
***************
*** 752,756 ****
              $this->setApplication($application);
          }
!         */
          $file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'application_hidden.reg';
          return ZZOSS_InstallerUtils::unserializeFromFile($file);
--- 759,763 ----
              $this->setApplication($application);
          }
!         
          $file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'application_hidden.reg';
          return ZZOSS_InstallerUtils::unserializeFromFile($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