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

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

Modified Files:
	Registry.php 
Log Message:
store plugins in root installer data dir ($ZIC_DATA_DIR/installer/plugins.reg)

Index: Registry.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib/Registry.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Registry.php	4 Jan 2004 13:26:55 -0000	1.2
--- Registry.php	4 Jan 2004 18:45:29 -0000	1.3
***************
*** 541,552 ****
              ZZOSS_Debug::log('ZZOSS_Registry', 'Application: '.$this->application, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
          }
!         if(strlen($this->application) && isset($applications[$this->application])) {
!                 //$this->saveApplicationCurrent($application);
!                 if(ZZOSS_INSTALLER_REGISTRY_DEBUG){
!                     ZZOSS_Debug::log('ZZOSS_Registry', 'Returning '.var_export($applications[$this->application], true), __FILE__, __LINE__, __FUNCTION__, __CLASS__);
!                 }
!                 return  $applications[$this->application];
!         }
!         
          if($application = ZZOSS_InstallerUtils::unserializeFromFile($this->reg_current_application)) {
              //$this->saveApplicationCurrent($application);
--- 541,552 ----
              ZZOSS_Debug::log('ZZOSS_Registry', 'Application: '.$this->application, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
          }
!         //if(strlen($this->application) && isset($applications[$this->application])) {
!             //$this->saveApplicationCurrent($application);
!             if(ZZOSS_INSTALLER_REGISTRY_DEBUG){
!                 ZZOSS_Debug::log('ZZOSS_Registry', 'Returning '.var_export($applications[$this->application], true), __FILE__, __LINE__, __FUNCTION__, __CLASS__);
!             }
!             return  $applications[$this->application];
!         //}
!         /*
          if($application = ZZOSS_InstallerUtils::unserializeFromFile($this->reg_current_application)) {
              //$this->saveApplicationCurrent($application);
***************
*** 570,574 ****
              }
          }
!         
          return false;
      }
--- 570,574 ----
              }
          }
!         */
          return false;
      }
***************
*** 704,707 ****
--- 704,708 ----
      function isInstalledApplication($application = NULL, $distribution = NULL)
      {
+         /*
          if(!is_null($distribution)){
              $this->setDistribution($distribution);
***************
*** 710,714 ****
              $this->setApplication($application);
          }
!         
          $file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'application_installed.reg';
          //if(file_exists($file)) {
--- 711,715 ----
              $this->setApplication($application);
          }
!         */
          $file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'application_installed.reg';
          //if(file_exists($file)) {
***************
*** 744,747 ****
--- 745,749 ----
      function isHiddenApplication($application = NULL, $distribution = NULL)
      {
+         /*
          if(!is_null($distribution)){
              $this->setDistribution($distribution);
***************
*** 750,754 ****
              $this->setApplication($application);
          }
!         
          $file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'application_hidden.reg';
          return ZZOSS_InstallerUtils::unserializeFromFile($file);
--- 752,756 ----
              $this->setApplication($application);
          }
!         */
          $file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'application_hidden.reg';
          return ZZOSS_InstallerUtils::unserializeFromFile($file);
***************
*** 1580,1594 ****
      function isRegPlugins()
      {
!         return file_exists($this->application_path.'installer'.DIRECTORY_SEPARATOR.'plugins.reg');
      }
      
      function isLockedPlugins()
      {
!         return file_exists($this->application_path.'installer'.DIRECTORY_SEPARATOR.'plugins.lock');
      }
      
      function getPlugins()
      {
!         $this->plugins = ZZOSS_InstallerUtils::unserializeFromFile($this->application_path.'installer'.DIRECTORY_SEPARATOR.'plugins.reg');
          //print_r($this->plugins);
          return $this->plugins;
--- 1582,1596 ----
      function isRegPlugins()
      {
!         return file_exists($this->dir_installer.'plugins.reg');
      }
      
      function isLockedPlugins()
      {
!         return file_exists($this->dir_installer.'plugins.lock');
      }
      
      function getPlugins()
      {
!         $this->plugins = ZZOSS_InstallerUtils::unserializeFromFile($this->dir_installer.'plugins.reg');
          //print_r($this->plugins);
          return $this->plugins;
***************
*** 1598,1602 ****
      {
          // get previously registered plugins
!         $plugins_old = ZZOSS_InstallerUtils::unserializeFromFile( $this->application_path.'installer'.DIRECTORY_SEPARATOR.'plugins.reg');
          
          // cope with removed plugins
--- 1600,1604 ----
      {
          // get previously registered plugins
!         $plugins_old = ZZOSS_InstallerUtils::unserializeFromFile( $this->dir_installer.'plugins.reg');
          
          // cope with removed plugins
***************
*** 1681,1690 ****
          }
          
!         ZZOSS_InstallerUtils::serializeToFile( $this->application_path.'installer'.DIRECTORY_SEPARATOR.'plugins.reg', $plugins );
      }
      
      function unlockPlugins()
      {
!         @unlink($this->application_path.'installer'.DIRECTORY_SEPARATOR.'plugins.lock');
      }
  
--- 1683,1692 ----
          }
          
!         ZZOSS_InstallerUtils::serializeToFile( $this->dir_installer.'plugins.reg', $plugins );
      }
      
      function unlockPlugins()
      {
!         @unlink($this->dir_installer.'plugins.lock');
      }
  




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