[zi-cvs] packages/com.zzoss.zic packages_dependencies.php,1.12,1.13 packages_download.php,1.10,1.11

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

Modified Files:
	packages_dependencies.php packages_download.php 
Log Message:
also show download in full/minimum install mode if there are remote packages

Index: packages_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_download.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** packages_download.php	7 Apr 2004 09:38:41 -0000	1.10
--- packages_download.php	7 Apr 2004 10:01:00 -0000	1.11
***************
*** 26,34 ****
  	// execute init file
  	require_once 'inc/init.php';
! 	
! 	/***************************************************************************   
!     * SCRIPT SPECIFIC FUNCTIONS                                       	   	   *   
!     ***************************************************************************/   
! 	
  	function downloadPackages($packages_selection)
      {    
--- 26,30 ----
  	// execute init file
  	require_once 'inc/init.php';
!     
  	function downloadPackages($packages_selection)
      {    
***************
*** 181,184 ****
--- 177,201 ----
  	// load previous selection
  	$a =  $zi_registry->getPackagesActions();
+     
+     $packages_resolve = $zi_registry->getPackagesResolve();
+     $packages = $zi_registry->getPackages();
+     
+     // check if there are packages for downlaod, otherwise we procede
+     $has_downloads = false;
+     
+    foreach($a as $key => $val) {
+         $name = $packages_resolve[$key];
+         $package = $packages[$name];
+         if( ($val=='I') && ($package["install"]["type"] == 'remote') ) {
+             $has_downloads = true;
+             break;
+         }
+     }
+     
+     if(!$has_downloads){
+         header('Location: packages_process.php'.zi_form_querystr());
+         exit;
+     }
+     
      /*
      echo '<h3>Actions</h3>';

Index: packages_dependencies.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_dependencies.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** packages_dependencies.php	6 Apr 2004 19:51:09 -0000	1.12
--- packages_dependencies.php	7 Apr 2004 10:01:00 -0000	1.13
***************
*** 143,146 ****
--- 143,149 ----
      */
      
+     // default next link
+ 	$link_next = 'packages_download.php'.zi_form_querystr();
+     
  	// save process queue
  	$zi_registry->updatePackagesQueue($queue);



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