[zi-cvs] packages/com.zzoss.zic/inc authentication.php,1.3,1.4 config.php,1.3,1.4 init.php,1.6,1.7 toolbar.php,1.1,1.2

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

Modified Files:
	authentication.php config.php init.php toolbar.php 
Log Message:
quick install

Index: init.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/init.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** init.php	29 Jan 2004 14:09:16 -0000	1.6
--- init.php	19 Mar 2004 12:18:16 -0000	1.7
***************
*** 75,79 ****
         $_COOKIE = array_map("stripslashes_recursive", $_COOKIE);
      }
! 
      // Debugging
      define('ZI_DEBUG', false);
--- 75,79 ----
         $_COOKIE = array_map("stripslashes_recursive", $_COOKIE);
      }
!       
      // Debugging
      define('ZI_DEBUG', false);
***************
*** 121,128 ****
      }
      
      // The root directory where the installer resides.
      require_once 'ZZOSS_Installer/Setup.php';
!     $zi_setup = new ZZOSS_InstallerSetup;
      
      // Check if path to data dir has been defined.
      if(!$zi_setup->isInitiated()){
--- 121,139 ----
      }
      
+     
+     // get general configuration
+     require_once 'inc/config.php';
+     
      // The root directory where the installer resides.
      require_once 'ZZOSS_Installer/Setup.php';
!     $zi_setup = new ZZOSS_InstallerSetup($GLOBALS['ZI']['data']);
      
+     // 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;
+ 
      // Check if path to data dir has been defined.
      if(!$zi_setup->isInitiated()){
***************
*** 133,140 ****
              // we trigger the installation process and first ask for the
              // data directory.
!             header('Location: setup.php');
              exit;
          }
-         require_once 'inc/config.php';
      } else {
          if(basename(getenv('SCRIPT_FILENAME')) == 'setup.php') {
--- 144,150 ----
              // we trigger the installation process and first ask for the
              // data directory.
!             header('Location: setup.php?mode=setup');
              exit;
          }
      } else {
          if(basename(getenv('SCRIPT_FILENAME')) == 'setup.php') {
***************
*** 148,153 ****
          @set_time_limit(0);
          
-         require_once 'inc/config.php';
-         
          require_once 'inc/registry.php';
          if(ZI_DEBUG){
--- 158,161 ----

Index: config.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/config.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config.php	14 Jan 2004 15:41:27 -0000	1.3
--- config.php	19 Mar 2004 12:18:16 -0000	1.4
***************
*** 24,46 ****
      */
      
-     // 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']);
-     unset($config);*/
-     
      include 'config_params.php';
-     
-     if(!isset($GLOBALS['ZI']['theme'])){
-         $GLOBALS['ZI']['theme'] = 'zzoss';
-     }
  ?>
\ No newline at end of file
--- 24,27 ----

Index: toolbar.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/toolbar.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** toolbar.php	5 Mar 2004 14:25:25 -0000	1.1
--- toolbar.php	19 Mar 2004 12:18:16 -0000	1.2
***************
*** 32,36 ****
                  break;
              default:
!                 require_once 'inc/toolbar_apps.php';
                  break;
          }
--- 32,38 ----
                  break;
              default:
!                 if($_REQUEST['mode'] != 'setup'){
!                     require_once 'inc/toolbar_apps.php';
!                 }
                  break;
          }

Index: authentication.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/authentication.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** authentication.php	29 Jan 2004 14:09:16 -0000	1.3
--- authentication.php	19 Mar 2004 12:18:16 -0000	1.4
***************
*** 30,34 ****
              basename(getenv('SCRIPT_FILENAME')) != 'about.php'){
              // redirect to create a new login
!             header('Location: '.$chdir.'authentication.php');
              exit;
          }
--- 30,34 ----
              basename(getenv('SCRIPT_FILENAME')) != 'about.php'){
              // redirect to create a new login
!             header('Location: '.$chdir.'authentication.php?mode=setup');
              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