[zi-cvs] packages/com.zzoss.zic packages_dependencies.php,1.15,1.16

Sandro Zic <[email protected]> Thu, 06 May 2004 08:19:08 +0000
Newsgroups gmane.comp.php.zzoss.installer.cvs
Message-ID <[email protected]>
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32564/com.zzoss.zic

Modified Files:
	packages_dependencies.php 
Log Message:
show "Plugins" or "Packages" depending on type

Index: packages_dependencies.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_dependencies.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** packages_dependencies.php	13 Apr 2004 10:18:16 -0000	1.15
--- packages_dependencies.php	6 May 2004 08:19:06 -0000	1.16
***************
*** 1,3 ****
! <?php   
      /*
      Copyright (C) 2001-2004 ZZOSS GbR, http://www.zzoss.com
--- 1,3 ----
! <?php
      /*
      Copyright (C) 2001-2004 ZZOSS GbR, http://www.zzoss.com
***************
*** 17,21 ****
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      */
!     
      /**
      @version $Id$
--- 17,21 ----
      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
      */
! 
      /**
      @version $Id$
***************
*** 23,38 ****
      @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
      */
! 	  
  	// execute init file
  	require_once 'inc/init.php';
! 	
!     /***************************************************************************   
!     * SCRIPT SPECIFIC FUNCTIONS                                       	   	   *   
!     ***************************************************************************/   
! 	
      function zi_process()
      {
          global $zi_registry;
!         
          $pkg_type = 'package';
          if(isset($_REQUEST['type'])){
--- 23,38 ----
      @license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
      */
! 
  	// execute init file
  	require_once 'inc/init.php';
! 
!     /***************************************************************************
!     * SCRIPT SPECIFIC FUNCTIONS                                       	   	   *
!     ***************************************************************************/
! 
      function zi_process()
      {
          global $zi_registry;
! 
          $pkg_type = 'package';
          if(isset($_REQUEST['type'])){
***************
*** 40,62 ****
          }
          $zi_registry->setPackageType($pkg_type);
!         
          $action_deps = $zi_registry->getPackagesActionsDeps();
          $zi_registry->updatePackagesActions($action_deps);
      }
! 	
! 	/***************************************************************************   
!     * STARTUP                                                             	   *   
!     ***************************************************************************/   
! 	
      // compose actions if full or minimum installation
      $app_settings = $zi_registry->getApplicationSettings();
!     
      if(!$zi_registry->isInstalledApplication() && $app_settings["application_profile"] != 'custom') {
          $zi_registry->setPkgsActionsPreselect($app_settings["application_profile"]);
      }
!     
  	// default next link
  	$link_next = 'packages_process.php'.zi_form_querystr();
! 	
      $pkg_type = 'package';
      if(isset($_REQUEST['type'])){
--- 40,62 ----
          }
          $zi_registry->setPackageType($pkg_type);
! 
          $action_deps = $zi_registry->getPackagesActionsDeps();
          $zi_registry->updatePackagesActions($action_deps);
      }
! 
! 	/***************************************************************************
!     * STARTUP                                                             	   *
!     ***************************************************************************/
! 
      // compose actions if full or minimum installation
      $app_settings = $zi_registry->getApplicationSettings();
! 
      if(!$zi_registry->isInstalledApplication() && $app_settings["application_profile"] != 'custom') {
          $zi_registry->setPkgsActionsPreselect($app_settings["application_profile"]);
      }
! 
  	// default next link
  	$link_next = 'packages_process.php'.zi_form_querystr();
! 
      $pkg_type = 'package';
      if(isset($_REQUEST['type'])){
***************
*** 64,68 ****
      }
      $zi_registry->setPackageType($pkg_type);
!     
      $packages = $zi_registry->getPackages();
      // no packages?
--- 64,68 ----
      }
      $zi_registry->setPackageType($pkg_type);
! 
      $packages = $zi_registry->getPackages();
      // no packages?
***************
*** 76,83 ****
          }
      }
!     
      $packages_resolve = $zi_registry->getPackagesResolve();
      $packages_versions = $zi_registry->getPackagesVersions();
!     
      // check if we should install already installed packages
      if(
--- 76,83 ----
          }
      }
! 
      $packages_resolve = $zi_registry->getPackagesResolve();
      $packages_versions = $zi_registry->getPackagesVersions();
! 
      // check if we should install already installed packages
      if(
***************
*** 92,96 ****
              }
          }
!         
          // if no packages are supposed to be installed,
          // we redirect.
--- 92,96 ----
              }
          }
! 
          // if no packages are supposed to be installed,
          // we redirect.
***************
*** 102,106 ****
              exit;
          }
!         
          $zi_registry->setPackagesActions($actions);
      } else {
--- 102,106 ----
              exit;
          }
! 
          $zi_registry->setPackagesActions($actions);
      } else {
***************
*** 114,118 ****
      echo '</pre>';
      */
!     
      /*
      echo '<h3>Actions</h3>';
--- 114,118 ----
      echo '</pre>';
      */
! 
      /*
      echo '<h3>Actions</h3>';
***************
*** 124,128 ****
      require_once 'ZZOSS_Package/Dependency.php';
      $zi_deps = new ZZOSS_PackageDependency;
!     
      $queue = $zi_deps->run($packages, $packages_resolve, $packages_versions, $actions);
      if($zi_deps->isError()){
--- 124,128 ----
      require_once 'ZZOSS_Package/Dependency.php';
      $zi_deps = new ZZOSS_PackageDependency;
! 
      $queue = $zi_deps->run($packages, $packages_resolve, $packages_versions, $actions);
      if($zi_deps->isError()){
***************
*** 142,149 ****
      echo '</pre>';
      */
!     
      // default next link
  	$link_next = 'packages_download.php'.zi_form_querystr();
!     
  	// save process queue
  	$zi_registry->updatePackagesQueue($queue);
--- 142,149 ----
      echo '</pre>';
      */
! 
      // default next link
  	$link_next = 'packages_download.php'.zi_form_querystr();
! 
  	// save process queue
  	$zi_registry->updatePackagesQueue($queue);
***************
*** 153,167 ****
          exit;
  	}
! 	
! 	
!     /***************************************************************************   
!     * PAGE CONTENT                                                             *   
!     ***************************************************************************/   
! 	
  	include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
!     
      $application = $zi_registry->getApplication();
  ?>
! 	<h1>Packages Dependencies</h1>
      <h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>', 'ApplicationInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="<?php echo $application["summary"].' '.$application['release']['version']; ?>"><?php echo $application["summary"].' '.$application['release']['version']; ?></a></h2>
  <?php
--- 153,167 ----
          exit;
  	}
! 
! 
!     /***************************************************************************
!     * PAGE CONTENT                                                             *
!     ***************************************************************************/
! 
  	include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
! 
      $application = $zi_registry->getApplication();
  ?>
! 	<h1><?php echo ucfirst($pkg_type); ?>s Dependencies</h1>
      <h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>', 'ApplicationInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="<?php echo $application["summary"].' '.$application['release']['version']; ?>"><?php echo $application["summary"].' '.$application['release']['version']; ?></a></h2>
  <?php
***************
*** 185,189 ****
      */
  if(is_array($pkgs_pending) && count($pkgs_pending)){
!     
      // translation table for dependency relations
      $pkg_rels_transl = array(
--- 185,189 ----
      */
  if(is_array($pkgs_pending) && count($pkgs_pending)){
! 
      // translation table for dependency relations
      $pkg_rels_transl = array(
***************
*** 193,208 ****
          'has ' => 'has'
          );
!     
      /*
      echo '<pre>';
!     echo '<h3>getDeps()</h3>'; 
      echo print_r($zi_deps->getDeps());
      echo '</pre>';
!     
      echo '<pre>';
      echo '<h3>getCheckedNames()</h3>';
      echo print_r($zi_deps->getCheckedNames());
      echo '</pre>';
!     
      echo '<pre>';
      echo '<h3>getDepsByName()</h3>';
--- 193,208 ----
          'has ' => 'has'
          );
! 
      /*
      echo '<pre>';
!     echo '<h3>getDeps()</h3>';
      echo print_r($zi_deps->getDeps());
      echo '</pre>';
! 
      echo '<pre>';
      echo '<h3>getCheckedNames()</h3>';
      echo print_r($zi_deps->getCheckedNames());
      echo '</pre>';
! 
      echo '<pre>';
      echo '<h3>getDepsByName()</h3>';
***************
*** 215,219 ****
      <table class="list">
          <tr>
!             <th align="left">Package</th>
              <th align="center">Version</th>
              <th align="center">Needed By</th>
--- 215,219 ----
      <table class="list">
          <tr>
!             <th align="left"><?php echo ucfirst($pkg_type); ?></th>
              <th align="center">Version</th>
              <th align="center">Needed By</th>
***************
*** 231,235 ****
              //$pkgs_needed_by = $pkgs_needed_by['needed_by'];
          }
!         
          $package_needed_name_full = $package_needed['name'];
          if(strlen($package_needed_name_full) > 32){
--- 231,235 ----
              //$pkgs_needed_by = $pkgs_needed_by['needed_by'];
          }
! 
          $package_needed_name_full = $package_needed['name'];
          if(strlen($package_needed_name_full) > 32){
***************
*** 238,242 ****
              $package_needed_name_short = $package_needed_name_full;
          }
!         
              $pkgs_needed = $pkgs_needed_by['needed_by'];
              foreach($pkgs_needed as $pkg_needed => $pkg_rel){
--- 238,242 ----
              $package_needed_name_short = $package_needed_name_full;
          }
! 
              $pkgs_needed = $pkgs_needed_by['needed_by'];
              foreach($pkgs_needed as $pkg_needed => $pkg_rel){
***************
*** 249,255 ****
                      <?php
                      }
!                     
                      echo $package_needed_name_short;
!                     
                      if(!$zi_deps->hasUndefinedPackages()){
                      ?></a><br/><?php echo $package_needed['summary'];
--- 249,255 ----
                      <?php
                      }
! 
                      echo $package_needed_name_short;
! 
                      if(!$zi_deps->hasUndefinedPackages()){
                      ?></a><br/><?php echo $package_needed['summary'];
***************
*** 262,266 ****
                              echo $pkg_rels_transl[$pkg_rel].' ';
                          }
!                         
                          echo $package_needed["release"]["version"];
                          if($package_needed["release"]["version"]=="") {
--- 262,266 ----
                              echo $pkg_rels_transl[$pkg_rel].' ';
                          }
! 
                          echo $package_needed["release"]["version"];
                          if($package_needed["release"]["version"]=="") {
***************
*** 311,315 ****
          }
      }
!     
  	$zi_buttons['back'] = $link_back;
  	include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
--- 311,315 ----
          }
      }
! 
  	$zi_buttons['back'] = $link_back;
  	include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';



-------------------------------------------------------
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson & Lucent use to deliver
higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3