[zi-cvs] packages/com.zzoss.zic application_delete.php,1.2,1.3 application_done.php,1.5,1.6 application_profile.php,1.3,1.4 application_settings.php,1.5,1.6 applications.php,1.7,1.8 config_components.php,1.2,1.3 config_global_connector.php,1.1,1.2 config_network_community.php,1.1,1.2 dev_application_import.php,1.3,1.4 dev_bundle_instant.php,1.4,1.5 dev_package_xml.php,1.2,1.3 distribution_download.php,1.5,1.6 info_changelog.php,1.4,1.5 packages.php,1.4,1.5 packages_confirm.php,1.2,1.3 packages_download.php,1.3,1.4 packages_sources.php,1.4,1.5 plugins_process.php,1.3,1.4

[email protected] Mon, 09 Feb 2004 10:16:13 -0800
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-serv3059/com.zzoss.zic

Modified Files:
	application_delete.php application_done.php 
	application_profile.php application_settings.php 
	applications.php config_components.php 
	config_global_connector.php config_network_community.php 
	dev_application_import.php dev_bundle_instant.php 
	dev_package_xml.php distribution_download.php 
	info_changelog.php packages.php packages_confirm.php 
	packages_download.php packages_sources.php plugins_process.php 
Log Message:
E_ALL support

Index: application_delete.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_delete.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** application_delete.php	29 Jan 2004 14:09:16 -0000	1.2
--- application_delete.php	9 Feb 2004 18:16:10 -0000	1.3
***************
*** 39,43 ****
                  $application_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
                  
!                 if(strlen($application_settings["application_root"])){
                      // First we delete the application root.
                      if(is_dir($application_settings["application_root"])){
--- 39,43 ----
                  $application_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
                  
!                 if(isset($application_settings["application_root"]) && strlen($application_settings["application_root"])){
                      // First we delete the application root.
                      if(is_dir($application_settings["application_root"])){

Index: application_done.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_done.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** application_done.php	29 Jan 2004 14:09:16 -0000	1.5
--- application_done.php	9 Feb 2004 18:16:10 -0000	1.6
***************
*** 78,82 ****
          require_once 'ZZOSS_Installer/Widget.php';
          $zi_widget = new ZZOSS_InstallerWidget;
!         $zi_widget->setErrors($zi_errors);
          echo $zi_widget->add('checkbox', 'Remove Setup Wizard', 'remove_setup');
          ?>
--- 78,84 ----
          require_once 'ZZOSS_Installer/Widget.php';
          $zi_widget = new ZZOSS_InstallerWidget;
!         if(isset($zi_errors)){
!             $zi_widget->setErrors($zi_errors);
!         }
          echo $zi_widget->add('checkbox', 'Remove Setup Wizard', 'remove_setup');
          ?>

Index: application_profile.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_profile.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** application_profile.php	21 Jan 2004 18:16:14 -0000	1.3
--- application_profile.php	9 Feb 2004 18:16:10 -0000	1.4
***************
*** 61,65 ****
          
          // set default profile
!         if(!strlen($_REQUEST['ZI_VALUES']["application_profile"])) {
              $_REQUEST['ZI_VALUES']["application_profile"] = 'full';
          }
--- 61,65 ----
          
          // set default profile
!         if(!isset($_REQUEST['ZI_VALUES']["application_profile"])) {
              $_REQUEST['ZI_VALUES']["application_profile"] = 'full';
          }
***************
*** 79,83 ****
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
  ?>
  	<h1>Installation Profile</h1>
--- 79,85 ----
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
  ?>
  	<h1>Installation Profile</h1>

Index: application_settings.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_settings.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** application_settings.php	29 Jan 2004 14:09:16 -0000	1.5
--- application_settings.php	9 Feb 2004 18:16:10 -0000	1.6
***************
*** 126,130 ****
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
  
      /***************************************************************************   
--- 126,132 ----
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
!     if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
  
      /***************************************************************************   
***************
*** 135,139 ****
  	include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
  
! if(strlen($_REQUEST['error'])){
      ?>
      <div class="warning">Application root is not writeable.</div>
--- 137,141 ----
  	include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
  
! if(isset($_REQUEST['error'])){
      ?>
      <div class="warning">Application root is not writeable.</div>
***************
*** 156,160 ****
  <?php
      // show only if dev mode allows it
!     if($_REQUEST['dev'] != 'bundle'){
          ?>
  <h2>Application Paths</h2>
--- 158,162 ----
  <?php
      // show only if dev mode allows it
!     if(!isset($_REQUEST['dev']) || $_REQUEST['dev'] != 'bundle'){
          ?>
  <h2>Application Paths</h2>
***************
*** 185,193 ****
          ?>
          </table>
!         <input type="hidden" name="dev" value="<?php echo $_REQUEST['dev']; ?>"/>
          <?php
      }
  	$zi_buttons['back'] = 'applications.php'.zi_form_querystr();
!     if($_REQUEST['dev'] == 'bundle'){
          $zi_buttons['next'] = 'packages_sources.php'.zi_form_querystr();
      } else {
--- 187,195 ----
          ?>
          </table>
!         <input type="hidden" name="dev" value="<?php if(isset($_REQUEST['dev'])) echo $_REQUEST['dev']; ?>"/>
          <?php
      }
  	$zi_buttons['back'] = 'applications.php'.zi_form_querystr();
!     if(isset($_REQUEST['dev']) && $_REQUEST['dev'] == 'bundle'){
          $zi_buttons['next'] = 'packages_sources.php'.zi_form_querystr();
      } else {

Index: applications.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** applications.php	29 Jan 2004 14:09:16 -0000	1.7
--- applications.php	9 Feb 2004 18:16:10 -0000	1.8
***************
*** 219,226 ****
                                  $options["blank"] = ' checked ';
                              }
!                             $modified = false;
                          } else {
                              if($application["installed"] == $application["release"]["version"]) {
!                                 $modified = false;
                                  /*$options["update"] = ' disabled';
                                  $options["update_prefix"] = '_disabled';*/
--- 219,226 ----
                                  $options["blank"] = ' checked ';
                              }
!                             $installed = false;
                          } else {
                              if($application["installed"] == $application["release"]["version"]) {
!                                 $installed = true;
                                  /*$options["update"] = ' disabled';
                                  $options["update_prefix"] = '_disabled';*/
***************
*** 231,235 ****
                                  }
                              } else {
!                                 $modified = true;
                                  $options["install"] = ' disabled';
                                  $options["install_prefix"] = '_disabled';
--- 231,235 ----
                                  }
                              } else {
!                                 $installed = false;
                                  $options["install"] = ' disabled';
                                  $options["install_prefix"] = '_disabled';
***************
*** 239,243 ****
                              }
                          }
!                         if($modified){
                              $highlight = ' class="highlight"';
                          }
--- 239,243 ----
                              }
                          }
!                         if($installed){
                              $highlight = ' class="highlight"';
                          }
***************
*** 271,275 ****
                              }
                              
!                             if($modified){
                                  $app_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
                                  ?> <a href="<?php echo $app_settings['application_url']; ?>" title="View Application" target="_blank"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/window_new.png" border="0" alt="View Application" title="View Application" align="absmiddle"></a><?php
--- 271,275 ----
                              }
                              
!                             if($installed){
                                  $app_settings = $zi_registry->getApplicationSettings($application['name'].'-'.$application['release']['version']);
                                  ?> <a href="<?php echo $app_settings['application_url']; ?>" title="View Application" target="_blank"><img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/window_new.png" border="0" alt="View Application" title="View Application" align="absmiddle"></a><?php

Index: config_components.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/config_components.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config_components.php	4 Jan 2004 13:26:55 -0000	1.2
--- config_components.php	9 Feb 2004 18:16:10 -0000	1.3
***************
*** 194,198 ****
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
  	
  	$components = $GLOBALS['ZI_CONFIG']['component'];
--- 194,200 ----
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
  	
  	$components = $GLOBALS['ZI_CONFIG']['component'];

Index: config_global_connector.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/config_global_connector.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config_global_connector.php	22 Dec 2003 17:19:58 -0000	1.1
--- config_global_connector.php	9 Feb 2004 18:16:10 -0000	1.2
***************
*** 61,65 ****
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
  ?>
  <h1>Global Connector</h1>
--- 61,67 ----
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
  ?>
  <h1>Global Connector</h1>

Index: config_network_community.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/config_network_community.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config_network_community.php	22 Dec 2003 17:19:58 -0000	1.1
--- config_network_community.php	9 Feb 2004 18:16:10 -0000	1.2
***************
*** 66,70 ****
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
  ?>
  <h1>Network + Community</h1>
--- 66,72 ----
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
  ?>
  <h1>Network + Community</h1>

Index: dev_application_import.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_application_import.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dev_application_import.php	21 Jan 2004 18:16:14 -0000	1.3
--- dev_application_import.php	9 Feb 2004 18:16:10 -0000	1.4
***************
*** 113,117 ****
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
  ?>
  <h1>Add Application</h1>
--- 113,119 ----
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
  ?>
  <h1>Add Application</h1>

Index: dev_bundle_instant.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_bundle_instant.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dev_bundle_instant.php	29 Jan 2004 14:09:16 -0000	1.4
--- dev_bundle_instant.php	9 Feb 2004 18:16:10 -0000	1.5
***************
*** 162,166 ****
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
      ?>
      <table class="form">
--- 162,168 ----
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
      ?>
      <table class="form">

Index: dev_package_xml.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_package_xml.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dev_package_xml.php	23 Dec 2003 12:37:11 -0000	1.2
--- dev_package_xml.php	9 Feb 2004 18:16:10 -0000	1.3
***************
*** 63,67 ****
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
      ?>
      <table class="form">
--- 63,69 ----
  	require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
      ?>
      <table class="form">

Index: distribution_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/distribution_download.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** distribution_download.php	28 Jan 2004 11:41:35 -0000	1.5
--- distribution_download.php	9 Feb 2004 18:16:10 -0000	1.6
***************
*** 32,36 ****
  
  	function zi_process() {
!         print_r($_REQUEST);
  		// download distribution.xml
  		$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distributions.xml';
--- 32,36 ----
  
  	function zi_process() {
!         
  		// download distribution.xml
  		$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distributions.xml';

Index: info_changelog.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info_changelog.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** info_changelog.php	29 Jan 2004 14:09:16 -0000	1.4
--- info_changelog.php	9 Feb 2004 18:16:10 -0000	1.5
***************
*** 36,40 ****
  	include 'themes/'.$GLOBALS['ZI']['theme'].'/header_popup.php';
  ?>
! <h1><?php echo $header; ?> Information</h1>
  <?php
      switch($_REQUEST['type']){
--- 36,40 ----
  	include 'themes/'.$GLOBALS['ZI']['theme'].'/header_popup.php';
  ?>
! <h1>Information</h1>
  <?php
      switch($_REQUEST['type']){
***************
*** 176,180 ****
          // show application information table
          foreach($releases as $release){
!             if(strlen($release['version'])){
              ?>
              <tr>
--- 176,180 ----
          // show application information table
          foreach($releases as $release){
!             if(isset($release['version'])){
              ?>
              <tr>

Index: packages.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** packages.php	21 Jan 2004 18:16:14 -0000	1.4
--- packages.php	9 Feb 2004 18:16:10 -0000	1.5
***************
*** 119,123 ****
  		}
  		
! 		if($package["installed"] == "") {
  			$package["installed"] = '-';
  			$options["update"] = ' disabled';
--- 119,133 ----
  		}
  		
!         $options["install"] = '';
!         $options["update"] = '';
!         $options["reconfigure"] = '';
!         $options["remove"] = '';
!         $options["install_prefix"] = '';
!         $options["update_prefix"] = '';
!         $options["reconfigure_prefix"] = '';
!         $options["remove_prefix"] = '';
!         $options["blank_prefix"] = '';
!         
! 		if(!isset($package["installed"]) || !strlen($package["installed"])) {
  			$package["installed"] = '-';
  			$options["update"] = ' disabled';
***************
*** 172,176 ****
                  <?php
                  
!                 $package_name_full = $package["name"].$package["name_suffix"];
                  if(strlen($package_name_full) > 32){
                      $package_name_short = substr($package_name_full, 0, 29).'...';
--- 182,186 ----
                  <?php
                  
!                 $package_name_full = $package["name"];
                  if(strlen($package_name_full) > 32){
                      $package_name_short = substr($package_name_full, 0, 29).'...';

Index: packages_confirm.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_confirm.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** packages_confirm.php	21 Jan 2004 18:16:14 -0000	1.2
--- packages_confirm.php	9 Feb 2004 18:16:10 -0000	1.3
***************
*** 92,96 ****
      require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
  	
  	// default next link
--- 92,98 ----
      require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
  	
  	// default next link
***************
*** 99,108 ****
  	$process = false;
  	
- 	// remove old install log
- 	$file = $ZZOSS_INSTALLER["application_path"]."installer/packages_log";
- 	if(file_exists($file)) {
- 		unlink($file);
- 	}
- 	
      $application = $zi_registry->getApplication();
      $application_settings = $zi_registry->getApplicationSettings();
--- 101,104 ----
***************
*** 121,125 ****
      <span class="label">URL:</span> <?php echo $application_settings['application_url']; ?><br/>
      <span class="label">Relative:</span> <?php echo $application_settings['application_url_rel']; ?><br/>
!     <span class="label">Demo Mode:</span> <?php if($application_settings['application_demo'] == 'on'){ echo 'yes'; } else { echo 'no'; } ?>
  </p>
  
--- 117,121 ----
      <span class="label">URL:</span> <?php echo $application_settings['application_url']; ?><br/>
      <span class="label">Relative:</span> <?php echo $application_settings['application_url_rel']; ?><br/>
!     <span class="label">Demo Mode:</span> <?php if(isset($application_settings['application_demo']) && $application_settings['application_demo'] == 'on'){ echo 'yes'; } else { echo 'no'; } ?>
  </p>
  

Index: packages_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_download.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** packages_download.php	28 Jan 2004 11:41:35 -0000	1.3
--- packages_download.php	9 Feb 2004 18:16:10 -0000	1.4
***************
*** 39,51 ****
          $packages = $zi_registry->getPackages();
  		$error = false;
! /*
!     do {
!         if(!$bar->executeListHorizontal()){
!             break;
!         }
!     } while(1);
!   */  
!     
!     
  		if(is_array($packages_selection)) {
              foreach($packages_selection as $key => $val) {
--- 39,43 ----
          $packages = $zi_registry->getPackages();
  		$error = false;
!    
  		if(is_array($packages_selection)) {
              foreach($packages_selection as $key => $val) {
***************
*** 69,117 ****
              $download->setCallback(array(&$bar, '_downloadCallback'));
              
  			foreach($packages_selection as $key=>$val) {
  				if(!$error) {
  					$name = $packages_resolve[$key];
  					$package = $packages[$name];
! 					if( ($val=='I') && ($package["install"]["type"] == 'remote') ) {
  						// create directory
  						$dir_packages = $zi_registry->getApplicationPath().'packages'.DIRECTORY_SEPARATOR;
! 						$dir_package = $zi_registry->getApplicationPath().'packages'.DIRECTORY_SEPARATOR.$name.DIRECTORY_SEPARATOR;
! 						// download archive and extract it
! 						$file = $dir_packages.'_tmp.tgz';
                          $log .= "[".$package['name'].'-'.$package['release']['version']."]\n";
  						if(strlen($package['filelist']['file']['#'])>2) {
                              $log .= "Downloading remote package archive ...\n";
                              
!                             $download->download($package['filelist']['file']['#'], $file);
                              //$bar->executeListHorizontal();
                                  
                              $log .= $download->getLog();
  
! 							if(file_exists($file)) {
  								//$log .= 'downloaded package '.$package['name'].'-'.$package['release']['version']."\n";
!                                 $tar = new Archive_Tar($file);
!                                 if (!@$tar->extractModify($dir_packages)) {
!                                     return PEAR::raiseError("unable to unpack $file");
                                  }
! 								unlink($file);
  							}
  						}
- 						$file = $dir_packages.'package.xml';
- 						$file_dest = $dir_package.'package.xml';
- 						if(file_exists($file)) {
- 							ZZOSS_InstallerUtils::copy($file, $file_dest);
- 							@unlink($file);
- 						}
                          
  						//echo $package['filelist']['descriptor']['#'];
  						if(strlen($package['filelist']['descriptor']['#'])>2) {
!                             $log .= "\nDownloading remote package XML ...\n";
! 							// download package xml file
! 							if(file_exists($file_dest)) {
! 								unlink($file_dest);
! 							}
                              
!                             $download->download($package['filelist']['descriptor']['#'], $file_dest);
                              $log .= $download->getLog();
  						}
                          /*
--- 61,117 ----
              $download->setCallback(array(&$bar, '_downloadCallback'));
              
+             $log = '';
+             
  			foreach($packages_selection as $key=>$val) {
  				if(!$error) {
  					$name = $packages_resolve[$key];
  					$package = $packages[$name];
! 					if($val == 'I' && $package["install"]["type"] == 'remote') {
  						// create directory
  						$dir_packages = $zi_registry->getApplicationPath().'packages'.DIRECTORY_SEPARATOR;
!                         $dir_downloads = $zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR;
! 						$dir_package = $dir_packages.$package['name'].'-'.$package['release']['version'].DIRECTORY_SEPARATOR;
! 						
                          $log .= "[".$package['name'].'-'.$package['release']['version']."]\n";
  						if(strlen($package['filelist']['file']['#'])>2) {
+                             // download archive and extract it
+                             $pkg_dl = $dir_downloads.basename($package['filelist']['file']['#']);
+                             
                              $log .= "Downloading remote package archive ...\n";
                              
!                             $download->download($package['filelist']['file']['#'], $pkg_dl);
                              //$bar->executeListHorizontal();
                                  
                              $log .= $download->getLog();
  
! 							if(file_exists($pkg_dl)) {
  								//$log .= 'downloaded package '.$package['name'].'-'.$package['release']['version']."\n";
!                                 $tar = new Archive_Tar($pkg_dl);
!                                 if (!$tar->extract($dir_packages)) {
!                                     return PEAR::raiseError("unable to unpack $pkg_dl");
                                  }
! 								//unlink($pkg_dl);
  							}
  						}
                          
+                         $xml_dest = $dir_package.'package.xml';
+                         $xml_dl = $dir_packages.'package.xml';
+                         // move package XML included in package
+                         if(file_exists($xml_dl)) {
+                             copy($xml_dl, $xml_dest);
+                             unlink($xml_dl);
+                         }                        
  						//echo $package['filelist']['descriptor']['#'];
  						if(strlen($package['filelist']['descriptor']['#'])>2) {
!                             $xml_dl = $dir_downloads.$package['name'].'-'.$package['release']['version'].'.xml';
                              
!                             // download specified remote package XML
!                             $log .= "\nDownloading remote package XML ...\n";
!                             $download->download($package['filelist']['descriptor']['#'], $xml_dl);
                              $log .= $download->getLog();
+                             if(file_exists($xml_dl)) {
+ 								copy($xml_dl, $xml_dest);
+                                 unlink($xml_dl);
+ 							}
  						}
                          /*
***************
*** 151,160 ****
  	$process = false;
  	
- 	// remove old install log
- 	$file = $ZZOSS_INSTALLER["application_path"]."installer/packages_log";
- 	if(file_exists($file)) {
- 		unlink($file);
- 	}
- 	
      /***************************************************************************   
      * PAGE CONTENT                                                             *   
--- 151,154 ----

Index: packages_sources.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_sources.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** packages_sources.php	29 Jan 2004 14:09:16 -0000	1.4
--- packages_sources.php	9 Feb 2004 18:16:10 -0000	1.5
***************
*** 135,139 ****
              require_once 'ZZOSS_Installer/Widget.php';
              $zi_widget = new ZZOSS_InstallerWidget;
!             $zi_widget->setErrors($zi_errors);
              ?>
              <h2>Remote Packages</h2>
--- 135,141 ----
              require_once 'ZZOSS_Installer/Widget.php';
              $zi_widget = new ZZOSS_InstallerWidget;
!             if(isset($zi_errors)){
!                 $zi_widget->setErrors($zi_errors);
!             }
              ?>
              <h2>Remote Packages</h2>

Index: plugins_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/plugins_process.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** plugins_process.php	21 Jan 2004 18:16:14 -0000	1.3
--- plugins_process.php	9 Feb 2004 18:16:10 -0000	1.4
***************
*** 96,100 ****
      require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	$zi_widget->setErrors($zi_errors);
  	*/
      $app_settings = $zi_registry->getApplicationSettings();
--- 96,102 ----
      require_once 'ZZOSS_Installer/Widget.php';
  	$zi_widget = new ZZOSS_InstallerWidget;
! 	if(isset($zi_errors)){
!         $zi_widget->setErrors($zi_errors);
!     }
  	*/
      $app_settings = $zi_registry->getApplicationSettings();



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn