[zi-cvs] packages/com.zzoss.zic/inc authentication.php,1.1,1.2 config.php,1.2,1.3 registry.php,1.1,1.2

Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc
In directory sc8-pr-cvs1:/tmp/cvs-serv23220/com.zzoss.zic/inc

Modified Files:
	authentication.php config.php 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
- added ZZOSS_InstallerRegistry::getApplicationPathRel();

Index: authentication.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/authentication.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** authentication.php	22 Dec 2003 17:24:28 -0000	1.1
--- authentication.php	14 Jan 2004 15:41:27 -0000	1.2
***************
*** 25,29 ****
  
  	// check if the password file exists
! 	if(!file_exists($GLOBALS['ZI']['data_dir'].'.htpasswd')){
          if(
              basename(getenv('SCRIPT_FILENAME')) != 'authentication.php' &&
--- 25,29 ----
  
  	// check if the password file exists
! 	if(!file_exists($GLOBALS['ZI']['installer_data_dir'].'.htpasswd')){
          if(
              basename(getenv('SCRIPT_FILENAME')) != 'authentication.php' &&
***************
*** 38,42 ****
          require_once 'Auth/Auth_HTTP.php';
          
!         $zi_auth = new Auth_HTTP("File", $GLOBALS['ZI']['data_dir'].".htpasswd");
          $zi_auth->setRealm('ZZ/OSS Installer');
          $zi_auth->setCancelText(cancelText());
--- 38,42 ----
          require_once 'Auth/Auth_HTTP.php';
          
!         $zi_auth = new Auth_HTTP("File", $GLOBALS['ZI']['installer_data_dir'].".htpasswd");
          $zi_auth->setRealm('ZZ/OSS Installer');
          $zi_auth->setCancelText(cancelText());

Index: config.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/config.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.php	1 Jan 2004 15:41:20 -0000	1.2
--- config.php	14 Jan 2004 15:41:27 -0000	1.3
***************
*** 25,38 ****
      
      // Pass init params to global config array.
!     $GLOBALS['ZI']['init_dir'] = $zi_setup->getInitDir();
      $GLOBALS['ZI']['init_file'] = $zi_setup->getInitFile();
      // Get the path to data directory.
!     $GLOBALS['ZI']['data_dir'] = $zi_setup->getDataDir();
!     $GLOBALS['ZI']['data_dir_dev'] = $GLOBALS['ZI']['data_dir'].'dev'.DIRECTORY_SEPARATOR;
      /*
      // parse configuration
      require_once 'ZZOSS_Config/Config.php'; 
      $config = new ZZOSS_Config(array('numeric' => true, 'cache' => true));
!     $config->parseConfig($GLOBALS['ZI']['data_dir'].'config.xml', $GLOBALS['ZI']['data_dir'].'config.reg'); 
      $GLOBALS['ZI'] = $config->query('/application');
          var_dump($GLOBALS['ZI']);
--- 25,38 ----
      
      // Pass init params to global config array.
!     $GLOBALS['ZI']['data_dir'] = $zi_setup->getDataDir();
      $GLOBALS['ZI']['init_file'] = $zi_setup->getInitFile();
      // Get the path to data directory.
!     $GLOBALS['ZI']['installer_data_dir'] = $zi_setup->getInstallerDataDir();
!     $GLOBALS['ZI']['installer_data_dir_dev'] = $GLOBALS['ZI']['installer_data_dir'].'dev'.DIRECTORY_SEPARATOR;
      /*
      // parse configuration
      require_once 'ZZOSS_Config/Config.php'; 
      $config = new ZZOSS_Config(array('numeric' => true, 'cache' => true));
!     $config->parseConfig($GLOBALS['ZI']['installer_data_dir'].'config.xml', $GLOBALS['ZI']['installer_data_dir'].'config.reg'); 
      $GLOBALS['ZI'] = $config->query('/application');
          var_dump($GLOBALS['ZI']);

Index: registry.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/registry.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** registry.php	22 Dec 2003 17:24:28 -0000	1.1
--- registry.php	14 Jan 2004 15:41:27 -0000	1.2
***************
*** 27,36 ****
      // are we in development?
      if($_REQUEST['mode'] == 'dev'){
!         $data_dir = $GLOBALS['ZI']['data_dir_dev'];
      } else {
!         $data_dir = $GLOBALS['ZI']['data_dir'];
      }
      $zi_registry = new ZZOSS_InstallerRegistry($data_dir);
!     $zi_registry->setInitDir($GLOBALS['ZI']['init_dir']);
      $zi_registry->refreshDistributions();
      
--- 27,36 ----
      // are we in development?
      if($_REQUEST['mode'] == 'dev'){
!         $data_dir = $GLOBALS['ZI']['installer_data_dir_dev'];
      } else {
!         $data_dir = $GLOBALS['ZI']['installer_data_dir'];
      }
      $zi_registry = new ZZOSS_InstallerRegistry($data_dir);
!     $zi_registry->setInitDir($GLOBALS['ZI']['data_dir']);
      $zi_registry->refreshDistributions();
      




-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html