[zi-cvs] packages/com.zzoss.zic application_profile.php,1.9,1.10 packages_dependencies.php,1.10,1.11

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

Modified Files:
	application_profile.php packages_dependencies.php 
Log Message:
make full/minimum install work

Index: packages_dependencies.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_dependencies.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** packages_dependencies.php	4 Apr 2004 15:53:41 -0000	1.10
--- packages_dependencies.php	5 Apr 2004 08:23:12 -0000	1.11
***************
*** 49,52 ****
--- 49,59 ----
      ***************************************************************************/   
  	
+     // compose actions if full or minimum installation
+     $app_settings = $zi_registry->getApplicationSettings();
+     
+     if($app_settings["application_profile"] != 'custom') {
+         $zi_registry->setPkgsActionsPreselect($app_settings["application_profile"]);
+     }
+     
  	// default next link
  	$link_next = 'packages_process.php'.zi_form_querystr();

Index: application_profile.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_profile.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** application_profile.php	5 Apr 2004 06:49:42 -0000	1.9
--- application_profile.php	5 Apr 2004 08:23:12 -0000	1.10
***************
*** 49,85 ****
          // compose actions if full or minimum installation
          if(isset($_REQUEST['profile']) && $_REQUEST["profile"] != 'custom') {
!             // preselect plugins
!             $zi_registry->setPackageType('plugin');
!             $a = array();
!             $zi_registry->registerPackages();
!             $packages = $zi_registry->getPackages();
!         
!             if(is_array($packages) && count($packages)) {
!                 foreach($packages as $package) {
!                     if($_REQUEST["profile"] == 'full') {
!                         $a[$package["id"]] = 'I';
!                     } elseif($_REQUEST["profile"] == 'minimum' && $package["install"]["required"]) {
!                         $a[$package["id"]] = 'I';
!                     }
!                 }
!             }
!             $zi_registry->setPackagesActions($a);
!             
!             // preselect packages
!             $zi_registry->setPackageType('package');
!             $a = array();
!             $zi_registry->registerPackages();
!             $packages = $zi_registry->getPackages();
!         
!             if(is_array($packages) && count($packages)) {
!                 foreach($packages as $package) {
!                     if($_REQUEST["profile"] == 'full') {
!                         $a[$package["id"]] = 'I';
!                     } elseif($_REQUEST["profile"] == 'minimum' && $package["install"]["required"]) {
!                         $a[$package["id"]] = 'I';
!                     }
!                 }
!             }
!             $zi_registry->setPackagesActions($a);
              
              // change procedures, omit the plugins/packages managers
--- 49,53 ----
          // compose actions if full or minimum installation
          if(isset($_REQUEST['profile']) && $_REQUEST["profile"] != 'custom') {
!             //$zi_registry->setPkgsActionsPreselect($_REQUEST['profile']);
              
              // change procedures, omit the plugins/packages managers
***************
*** 101,105 ****
--- 69,81 ----
                              'packages_build' => 'on'
                              );
+             // show register in dev
+             if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
+                 $procedures['plugins_register'] = 'on';
+                 $procedures['packages_register'] = 'on';
+             }
              $zi_registry->setProcedures($procedures);
+             
+             // clean up previous dependency queue
+             //$zi_registry->unsetPackagesQueue();
          }
          



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