[zi-cvs] packages/com.zzoss.zic applications_download.php,1.4,1.5 distribution_download.php,1.4,1.5 info.php,1.2,1.3 info_changelog.php,1.2,1.3 packages_download.php,1.2,1.3 packages_sources.php,1.2,1.3 setup.php,1.6,1.7
[email protected] Wed, 28 Jan 2004 03:41:38 -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-serv27119/com.zzoss.zic
Modified Files:
applications_download.php distribution_download.php info.php
info_changelog.php packages_download.php packages_sources.php
setup.php
Log Message:
progress bar shows download process
Index: applications_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications_download.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** applications_download.php 21 Jan 2004 18:16:14 -0000 1.4
--- applications_download.php 28 Jan 2004 11:41:35 -0000 1.5
***************
*** 91,106 ****
// download application.xml and packages.xml
if(is_array($remote_application["filelist"]["descriptor"])) {
foreach($remote_application["filelist"]["descriptor"] as $descriptor) {
if($descriptor["@"]["role"] == 'application') {
! ZZOSS_InstallerUtils::downloadFile(
! $descriptor["#"],
! $file_application
! );
}
if($descriptor["@"]["role"] == 'packages') {
! ZZOSS_InstallerUtils::downloadFile(
! $descriptor["#"],
! $file_packages
! );
}
}
--- 91,102 ----
// download application.xml and packages.xml
if(is_array($remote_application["filelist"]["descriptor"])) {
+ include_once 'ZZOSS_File/Download.php';
+ $download = new ZZOSS_FileDownload();
foreach($remote_application["filelist"]["descriptor"] as $descriptor) {
if($descriptor["@"]["role"] == 'application') {
! $download->download($descriptor["#"], $file_application);
}
if($descriptor["@"]["role"] == 'packages') {
! $download->download($descriptor["#"], $file_packages);
}
}
***************
*** 131,149 ****
$distribution_xml->setFile($file);
$distribution = $distribution_xml->query('/distribution');
!
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_applications.xml';
! ZZOSS_InstallerUtils::downloadFile(
! $distribution["filelist"]["descriptor"]["#"],
! $file
! );
! if(!file_exists($file)) {
! // error, since file does not exist
! $screen = 'error';
! } else {
! $remote_applications_xml = new ZZOSS_Config(array('numeric' => array('application')));
! $remote_applications_xml->setFile($file);
! $remote_applications = $remote_applications_xml->query('/applications/application');
! }
!
/***************************************************************************
* PAGE CONTENT *
--- 127,131 ----
$distribution_xml->setFile($file);
$distribution = $distribution_xml->query('/distribution');
!
/***************************************************************************
* PAGE CONTENT *
***************
*** 153,157 ****
?>
<h1>Download Applications</h1>
! <?php
if(is_array($remote_applications) && count($remote_applications)) {
?>
--- 135,165 ----
?>
<h1>Download Applications</h1>
! <?php
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_applications.xml';
!
! $items = array('Applications XML');
! $label = 'Downloading';
!
! require_once 'ZZOSS_Html/Progress.php';
! $bar = new ZZOSS_HtmlProgress();
! $bar->prepareListHorizontal($items, 'Downloading');
!
! require_once 'ZZOSS_File/Download.php';
! $download = new ZZOSS_FileDownload();
! $download->setCallback(array(&$bar, '_downloadCallback'));
!
! $download->download($distribution["filelist"]["descriptor"]["#"], $file);
! ?>
! <br clear="all"/>
! <?php
! if(!file_exists($file)) {
! // error, since file does not exist
! $screen = 'error';
! } else {
! $remote_applications_xml = new ZZOSS_Config(array('numeric' => array('application')));
! $remote_applications_xml->setFile($file);
! $remote_applications = $remote_applications_xml->query('/applications/application');
! }
!
if(is_array($remote_applications) && count($remote_applications)) {
?>
***************
*** 190,194 ****
}
// activate next button
! $zi_buttons['next'] = "online_update_confirm.php";
?>
</table>
--- 198,202 ----
}
// activate next button
! $zi_buttons['next'] = "applications.php";
?>
</table>
Index: distribution_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/distribution_download.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** distribution_download.php 21 Jan 2004 18:16:14 -0000 1.4
--- distribution_download.php 28 Jan 2004 11:41:35 -0000 1.5
***************
*** 44,51 ****
}
if(is_array($distribution["filelist"]["descriptor"])) {
! ZZOSS_InstallerUtils::downloadFile(
! $distribution["filelist"]["descriptor"]["#"],
! $file
! );
} else {
PEAR::raiseError('No XML descriptor available for distribution.');
--- 44,50 ----
}
if(is_array($distribution["filelist"]["descriptor"])) {
! include_once 'ZZOSS_File/Download.php';
! $download = new ZZOSS_FileDownload();
! $download->download($distribution["filelist"]["descriptor"]["#"], $file);
} else {
PEAR::raiseError('No XML descriptor available for distribution.');
***************
*** 54,75 ****
/***************************************************************************
- * STARTUP *
- ***************************************************************************/
-
- $file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distributions.xml';
- ZZOSS_InstallerUtils::downloadFile(
- $GLOBALS['ZI']['distributions_url'],
- $file
- );
- if(!file_exists($file)) {
- // error, since file does not exist
- $screen = 'error';
- } else {
- $distributions_xml = new ZZOSS_Config(array('numeric' => array('distribution')));
- $distributions_xml->setFile($file);
- $distributions = $distributions_xml->query('/distributions/distribution');
- }
-
- /***************************************************************************
* PAGE CONTENT *
***************************************************************************/
--- 53,56 ----
***************
*** 79,82 ****
--- 60,90 ----
<h1>Select Distribution</h1>
<?php
+ $file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distributions.xml';
+
+ $items = array('Distributions XML');
+ $label = 'Downloading';
+
+ require_once 'ZZOSS_Html/Progress.php';
+ $bar = new ZZOSS_HtmlProgress();
+ $bar->prepareListHorizontal($items, 'Downloading');
+
+ require_once 'ZZOSS_File/Download.php';
+ $download = new ZZOSS_FileDownload();
+ $download->setCallback(array(&$bar, '_downloadCallback'));
+
+ $download->download($GLOBALS['ZI']['distributions_url'], $file);
+ ?>
+ <br clear="all"/>
+ <?php
+ if(!file_exists($file)) {
+ // error, since file does not exist
+ $screen = 'error';
+ break;
+ } else {
+ $distributions_xml = new ZZOSS_Config(array('numeric' => array('distribution')));
+ $distributions_xml->setFile($file);
+ $distributions = $distributions_xml->query('/distributions/distribution');
+ }
+
if(is_array($distributions) && count($distributions)) {
?>
Index: info.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** info.php 14 Jan 2004 15:41:27 -0000 1.2
--- info.php 28 Jan 2004 11:41:35 -0000 1.3
***************
*** 28,34 ****
include 'inc/info.php';
! /***************************************************************************
! * STARTUP *
! ***************************************************************************/
switch($_REQUEST['type']){
--- 28,35 ----
include 'inc/info.php';
! include 'themes/'.$GLOBALS['ZI']['theme'].'/header_popup.php';
! ?>
! <h1>Information</h1>
! <?php
switch($_REQUEST['type']){
***************
*** 46,53 ****
unlink($file);
}
! ZZOSS_InstallerUtils::downloadFile(
! $distribution["filelist"]["descriptor"]["#"],
! $file
! );
if(file_exists($file)) {
$distribution_config = new ZZOSS_Config(array('cache' => true, 'numeric' => array('license','maintainer','holder')));
--- 47,63 ----
unlink($file);
}
! $items = array('Distribution XML');
! $label = 'Downloading';
!
! require_once 'ZZOSS_Html/Progress.php';
! $bar = new ZZOSS_HtmlProgress();
! $bar->prepareListHorizontal($items, 'Downloading');
!
! require_once 'ZZOSS_File/Download.php';
! $download = new ZZOSS_FileDownload();
! $download->setCallback(array(&$bar, '_downloadCallback'));
!
! $download->download($distribution["filelist"]["descriptor"]["#"], $file);
!
if(file_exists($file)) {
$distribution_config = new ZZOSS_Config(array('cache' => true, 'numeric' => array('license','maintainer','holder')));
***************
*** 78,92 ****
$remote_applications = $remote_applications_xml->query('/applications/application');
$remote_application = $remote_applications[$_REQUEST["id"]];
// download application.xml and packages.xml
if(is_array($remote_application["filelist"]["descriptor"])) {
foreach($remote_application["filelist"]["descriptor"] as $descriptor) {
if($descriptor["@"]["role"] == 'application') {
! ZZOSS_InstallerUtils::downloadFile(
! $descriptor["#"],
! $file_application
! );
}
}
}
if(file_exists($file_application)) {
$application_config = new ZZOSS_Config(array('numeric' => array('license','maintainer','holder')));
--- 88,112 ----
$remote_applications = $remote_applications_xml->query('/applications/application');
$remote_application = $remote_applications[$_REQUEST["id"]];
+
+ $items = array('Application XML');
+ $label = 'Downloading';
+
+ require_once 'ZZOSS_Html/Progress.php';
+ $bar = new ZZOSS_HtmlProgress();
+ $bar->prepareListHorizontal($items, 'Downloading');
+
+ require_once 'ZZOSS_File/Download.php';
+ $download = new ZZOSS_FileDownload();
+ $download->setCallback(array(&$bar, '_downloadCallback'));
+
// download application.xml and packages.xml
if(is_array($remote_application["filelist"]["descriptor"])) {
foreach($remote_application["filelist"]["descriptor"] as $descriptor) {
if($descriptor["@"]["role"] == 'application') {
! $download->download($descriptor["#"], $file_application);
}
}
}
+
if(file_exists($file_application)) {
$application_config = new ZZOSS_Config(array('numeric' => array('license','maintainer','holder')));
***************
*** 108,120 ****
$info = $zi_registry->getPackageById($_REQUEST["id"]);
if($info["install"]["type"] == 'remote') {
! $info = $zi_registry->getPackageRemoteInfoById($_REQUEST['id']);
}
$info = ZZOSS_Config::prepareNumeric($info, array('license','maintainer','holder'));
break;
}
-
- /***************************************************************************
- * PAGE CONTENT *
- ***************************************************************************/
if(is_array($info["changelog"])) {
--- 128,153 ----
$info = $zi_registry->getPackageById($_REQUEST["id"]);
if($info["install"]["type"] == 'remote') {
! $zi_registry->unsetPackageRemoteInfo();
!
! $items = array('Package XML');
! $label = 'Downloading';
!
! require_once 'ZZOSS_Html/Progress.php';
! $bar = new ZZOSS_HtmlProgress();
! $bar->prepareListHorizontal($items, 'Downloading');
!
! require_once 'ZZOSS_File/Download.php';
! $download = new ZZOSS_FileDownload();
! $download->setCallback(array(&$bar, '_downloadCallback'));
!
! $file = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'remote_package.xml';
! $package = $zi_registry->getPackageById($_REQUEST['id']);
! $download->download($package["filelist"]["descriptor"]["#"], $file);
!
! $info = $zi_registry->getPackageRemoteInfo();
}
$info = ZZOSS_Config::prepareNumeric($info, array('license','maintainer','holder'));
break;
}
if(is_array($info["changelog"])) {
***************
*** 122,129 ****
}
- include 'themes/'.$GLOBALS['ZI']['theme'].'/header_popup.php';
- ?>
- <h1><?php echo $header; ?> Information</h1>
- <?php
$content = '';
// Show the installation paths if it is an installed application
--- 155,158 ----
Index: info_changelog.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info_changelog.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** info_changelog.php 11 Jan 2004 16:25:58 -0000 1.2
--- info_changelog.php 28 Jan 2004 11:41:35 -0000 1.3
***************
*** 28,31 ****
--- 28,41 ----
include 'inc/info.php';
+ /***************************************************************************
+ * PAGE CONTENT *
+ ***************************************************************************/
+
+ $zi_buttons['back'] = 'info.php'.zi_form_querystr();
+
+ include 'themes/'.$GLOBALS['ZI']['theme'].'/header_popup.php';
+ ?>
+ <h1><?php echo $header; ?> Information</h1>
+ <?php
switch($_REQUEST['type']){
case 'distribution_remote':
***************
*** 42,49 ****
unlink($file);
}
! ZZOSS_InstallerUtils::downloadFile(
! $distribution["filelist"]["descriptor"]["#"],
! $file
! );
if(file_exists($file)) {
$distribution_config = new ZZOSS_Config(array('cache' => true, 'numeric' => array('release')));
--- 52,69 ----
unlink($file);
}
!
! $items = array('Distribution XML');
! $label = 'Downloading';
!
! require_once 'ZZOSS_Html/Progress.php';
! $bar = new ZZOSS_HtmlProgress();
! $bar->prepareListHorizontal($items, 'Downloading');
!
! require_once 'ZZOSS_File/Download.php';
! $download = new ZZOSS_FileDownload();
! $download->setCallback(array(&$bar, '_downloadCallback'));
!
! $download->download($distribution["filelist"]["descriptor"]["#"], $file);
!
if(file_exists($file)) {
$distribution_config = new ZZOSS_Config(array('cache' => true, 'numeric' => array('release')));
***************
*** 64,75 ****
$remote_applications = $remote_applications_xml->query('/applications/application');
$remote_application = $remote_applications[$_REQUEST["id"]];
// download application.xml and packages.xml
if(is_array($remote_application["filelist"]["descriptor"])) {
foreach($remote_application["filelist"]["descriptor"] as $descriptor) {
if($descriptor["@"]["role"] == 'application') {
! ZZOSS_InstallerUtils::downloadFile(
! $descriptor["#"],
! $file_application
! );
}
}
--- 84,104 ----
$remote_applications = $remote_applications_xml->query('/applications/application');
$remote_application = $remote_applications[$_REQUEST["id"]];
+
+ $items = array('Application XML');
+ $label = 'Downloading';
+
+ require_once 'ZZOSS_Html/Progress.php';
+ $bar = new ZZOSS_HtmlProgress();
+ $bar->prepareListHorizontal($items, 'Downloading');
+
+ require_once 'ZZOSS_File/Download.php';
+ $download = new ZZOSS_FileDownload();
+ $download->setCallback(array(&$bar, '_downloadCallback'));
+
// download application.xml and packages.xml
if(is_array($remote_application["filelist"]["descriptor"])) {
foreach($remote_application["filelist"]["descriptor"] as $descriptor) {
if($descriptor["@"]["role"] == 'application') {
! $download->download($descriptor["#"], $file_application);
}
}
***************
*** 104,108 ****
$info = $zi_registry->getPackageById($_REQUEST["id"]);
if($info["install"]["type"] == 'remote') {
! $info = $zi_registry->getPackageRemoteInfoById($_REQUEST['id']);
}
$info = ZZOSS_Config::prepareNumeric($info, array('release'));
--- 133,154 ----
$info = $zi_registry->getPackageById($_REQUEST["id"]);
if($info["install"]["type"] == 'remote') {
! $zi_registry->unsetPackageRemoteInfo();
!
! $items = array('Package XML');
! $label = 'Downloading';
!
! require_once 'ZZOSS_Html/Progress.php';
! $bar = new ZZOSS_HtmlProgress();
! $bar->prepareListHorizontal($items, 'Downloading');
!
! require_once 'ZZOSS_File/Download.php';
! $download = new ZZOSS_FileDownload();
! $download->setCallback(array(&$bar, '_downloadCallback'));
!
! $file = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'remote_package.xml';
! $package = $zi_registry->getPackageById($_REQUEST['id']);
! $download->download($package["filelist"]["descriptor"]["#"], $file);
!
! $info = $zi_registry->getPackageRemoteInfo();
}
$info = ZZOSS_Config::prepareNumeric($info, array('release'));
***************
*** 110,124 ****
}
$releases = $info['changelog']['release'];
-
- /***************************************************************************
- * PAGE CONTENT *
- ***************************************************************************/
-
- $zi_buttons['back'] = 'info.php'.zi_form_querystr();
-
- include 'themes/'.$GLOBALS['ZI']['theme'].'/header_popup.php';
?>
- <h1><?php echo $header; ?> Information</h1>
-
<table class="list">
<tr>
--- 156,160 ----
Index: packages_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_download.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** packages_download.php 21 Jan 2004 18:16:14 -0000 1.2
--- packages_download.php 28 Jan 2004 11:41:35 -0000 1.3
***************
*** 39,44 ****
$packages = $zi_registry->getPackages();
$error = false;
!
if(is_array($packages_selection)) {
foreach($packages_selection as $key=>$val) {
if(!$error) {
--- 39,72 ----
$packages = $zi_registry->getPackages();
$error = false;
! /*
! do {
! if(!$bar->executeListHorizontal()){
! break;
! }
! } while(1);
! */
!
!
if(is_array($packages_selection)) {
+ foreach($packages_selection as $key => $val) {
+ $name = $packages_resolve[$key];
+ $package = $packages[$name];
+ if( ($val=='I') && ($package["install"]["type"] == 'remote') ) {
+ $items[] = $package['name'].'-'.$package['release']['version'];
+ // Do we also download the remote package XML ?
+ if(strlen($package['filelist']['descriptor']['#'])>2) {
+ $items[] = 'Package XML of '.$package['name'].'-'.$package['release']['version'];
+ }
+ }
+ }
+
+ require_once 'ZZOSS_Html/Progress.php';
+ $bar = new ZZOSS_HtmlProgress();
+ $bar->prepareListHorizontal($items, 'Downloading');
+
+ require_once 'ZZOSS_File/Download.php';
+ $download = new ZZOSS_FileDownload();
+ $download->setCallback(array(&$bar, '_downloadCallback'));
+
foreach($packages_selection as $key=>$val) {
if(!$error) {
***************
*** 47,61 ****
if( ($val=='I') && ($package["install"]["type"] == 'remote') ) {
// create directory
! $dir_packages = $zi_registry->getApplicationPath().'packages/';
! $dir_package = $zi_registry->getApplicationPath().'packages/'.$name.'/';
// download archive and extract it
$file = $dir_packages.'_tmp.tgz';
if(strlen($package['filelist']['file']['#'])>2) {
! ZZOSS_InstallerUtils::downloadFile(
! $package['filelist']['file']['#'],
! $file
! );
if(file_exists($file)) {
! $log .= 'downloaded package '.$package['name'].'-'.$package['release']['version']."\n";
$tar = new Archive_Tar($file);
if (!@$tar->extractModify($dir_packages)) {
--- 75,93 ----
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)) {
***************
*** 63,69 ****
}
unlink($file);
- } else {
- $log .= 'error downloading '.$package['filelist']['file']['#']."\n";
- $error = true;
}
}
--- 95,98 ----
***************
*** 74,91 ****
@unlink($file);
}
! /*
if(strlen($package['filelist']['descriptor']['#'])>2) {
// download package xml file
if(file_exists($file_dest)) {
unlink($file_dest);
}
! ZZOSS_InstallerUtils::downloadFile(
! $package['filelist']['descriptor']['#'],
! $file_dest
! );
! }*/
// register new package
if(file_exists($file_dest)) {
! $zi_registry->replacePackage( $package['id'], $file_dest, $dir_package );
$log .= 'registered new package '.$package['name']."-".$package['release']['version']."\n";
} else {
--- 103,122 ----
@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();
! }
! /*
// register new package
if(file_exists($file_dest)) {
! $zi_registry->replacePackage($package['id'], $file_dest, $dir_package);
$log .= 'registered new package '.$package['name']."-".$package['release']['version']."\n";
} else {
***************
*** 93,96 ****
--- 124,128 ----
$error = true;
}
+ */
}
}
***************
*** 131,144 ****
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
- // show packages
- $result = downloadPackages($a);
$application = $zi_registry->getApplication();
?>
! <h1>Download Protocol</h1>
<h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $_REQUEST['id']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $_REQUEST['id']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>', '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>
!
! <textarea readonly style='width:450px;height:100px'>
! <?php echo $result['log']; ?>
! </textarea>
<br clear="all"/>
<?php
--- 163,173 ----
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
$application = $zi_registry->getApplication();
?>
! <h1>Download Packages</h1>
<h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $_REQUEST['id']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $_REQUEST['id']; ?>&distribution=<?php echo $_REQUEST['distribution']; ?>', '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
! $result = downloadPackages($a);
! ?>
<br clear="all"/>
<?php
Index: packages_sources.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_sources.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** packages_sources.php 21 Jan 2004 18:16:14 -0000 1.2
--- packages_sources.php 28 Jan 2004 11:41:35 -0000 1.3
***************
*** 45,54 ****
$log = 'Destination: '.$bundle_dir."\n\n";
foreach($downloads as $package => $url){
! /*
! include_once 'PEAR/Common.php';
! $saved = PEAR_Common::downloadHttp($url, &$ui, $bundle_dir);
! */
! $saved = ZZOSS_InstallerUtils::downloadFile($url, $bundle_dir);
if(!PEAR::isError($saved)) {
$fname = basename($saved);
--- 45,53 ----
$log = 'Destination: '.$bundle_dir."\n\n";
+ include_once 'ZZOSS_File/Download.php';
+ $download = new ZZOSS_FileDownload();
+
foreach($downloads as $package => $url){
! $saved = $download->download($url, $bundle_dir);
if(!PEAR::isError($saved)) {
$fname = basename($saved);
Index: setup.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** setup.php 21 Jan 2004 09:46:58 -0000 1.6
--- setup.php 28 Jan 2004 11:41:35 -0000 1.7
***************
*** 89,92 ****
--- 89,95 ----
<p>In general, two icons in the top left corner constantly let you know if encryption is <img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/encrypted.png" border="0" alt="Encrypted" title="Encrypted"/> available or <img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/decrypted.png" border="0" alt="Decrypted" title="Decrypted"/> not.</p>
+ <h2>JavaScript</h2>
+ <p>Please turn JavaScript on in your browser for better usability.</p>
+
<h2>Warranty</h2>
<p>You have obtained ZZ/OSS Installer under the terms of the LGPL open source license displayed below. The license states that this software comes without any warranty. If you want to be able to claim warranty, ZZ/OSS sells commercial licenses stating liability by ZZ/OSS for the installer.</p>
-------------------------------------------------------
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