[zi-cvs] packages/com.zzoss.zic applications_download.php,1.7,1.8 distribution_download.php,1.7,1.8 info.php,1.7,1.8 info_changelog.php,1.8,1.9 packages_download.php,1.12,1.13 packages_reset.php,1.9,1.10
Sandro Zic <[email protected]> Thu, 06 May 2004 12:34:21 +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-serv15026/com.zzoss.zic
Modified Files:
applications_download.php distribution_download.php info.php
info_changelog.php packages_download.php packages_reset.php
Log Message:
use com.zzoss.portlet.progress.lib instead of com.zzoss.html.progress.lib
Index: packages_reset.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_reset.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** packages_reset.php 5 Apr 2004 06:49:42 -0000 1.9
--- packages_reset.php 6 May 2004 12:34:19 -0000 1.10
***************
*** 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$
***************
*** 26,41 ****
// execute init file
require_once 'inc/init.php';
!
$pkg_type = 'package';
if(isset($_REQUEST['type'])){
$pkg_type = $_REQUEST['type'];
}
!
$remove_installed_pkgs = true;
$remove_plugins = true;
$buffer_output = false;
!
$application = $zi_registry->getApplication();
!
require_once 'ZZOSS_Config/Config.php';
$application = ZZOSS_Config::prepareNumeric($application, array($pkg_type));
--- 26,41 ----
// execute init file
require_once 'inc/init.php';
!
$pkg_type = 'package';
if(isset($_REQUEST['type'])){
$pkg_type = $_REQUEST['type'];
}
!
$remove_installed_pkgs = true;
$remove_plugins = true;
$buffer_output = false;
!
$application = $zi_registry->getApplication();
!
require_once 'ZZOSS_Config/Config.php';
$application = ZZOSS_Config::prepareNumeric($application, array($pkg_type));
***************
*** 46,50 ****
!isset($application['release'][$pkg_type.'s'][$pkg_type])
){
!
if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
$url_next = 'packages.php'.zi_form_querystr();
--- 46,50 ----
!isset($application['release'][$pkg_type.'s'][$pkg_type])
){
!
if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
$url_next = 'packages.php'.zi_form_querystr();
***************
*** 56,60 ****
exit;
}
!
// check if this script is part of installation procedure
if(/*isset($_REQUEST['mode']) && ($_REQUEST['mode'] == 'dev' || $_REQUEST['mode'] == 'instant') && */!$zi_registry->isProcedure($pkg_type.'s_register')){
--- 56,60 ----
exit;
}
!
// check if this script is part of installation procedure
if(/*isset($_REQUEST['mode']) && ($_REQUEST['mode'] == 'dev' || $_REQUEST['mode'] == 'instant') && */!$zi_registry->isProcedure($pkg_type.'s_register')){
***************
*** 75,105 ****
}
}
!
function zi_default()
{
global $zi_registry;
!
$regfile = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'bundle_downloads.reg';
$_REQUEST['ZI_VALUES'] = ZZOSS_InstallerUtils::unserializeFromFile($regfile);
!
return $_REQUEST;
}
! /***************************************************************************
! * PAGE CONTENT *
***************************************************************************/
!
$is_popup = false;
$widget_type = '';
!
if(isset($_REQUEST['widget_type']) && $_REQUEST['widget_type'] == 'popup'){
$is_popup = true;
$widget_type = '_popup';
}
!
if($buffer_output){
ob_start();
}
!
include 'themes/'.$GLOBALS['ZI']['theme'].'/header'.$widget_type.'.php';
?>
--- 75,105 ----
}
}
!
function zi_default()
{
global $zi_registry;
!
$regfile = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'bundle_downloads.reg';
$_REQUEST['ZI_VALUES'] = ZZOSS_InstallerUtils::unserializeFromFile($regfile);
!
return $_REQUEST;
}
! /***************************************************************************
! * PAGE CONTENT *
***************************************************************************/
!
$is_popup = false;
$widget_type = '';
!
if(isset($_REQUEST['widget_type']) && $_REQUEST['widget_type'] == 'popup'){
$is_popup = true;
$widget_type = '_popup';
}
!
if($buffer_output){
ob_start();
}
!
include 'themes/'.$GLOBALS['ZI']['theme'].'/header'.$widget_type.'.php';
?>
***************
*** 109,119 ****
<?php
$zi_registry->setPackageType($pkg_type);
!
$packages = array();
!
if(isset($application['release'][$pkg_type.'s'][$pkg_type])){
$packages = $application['release'][$pkg_type.'s'][$pkg_type];
}
!
if(!count($packages)){
?>
--- 109,119 ----
<?php
$zi_registry->setPackageType($pkg_type);
!
$packages = array();
!
if(isset($application['release'][$pkg_type.'s'][$pkg_type])){
$packages = $application['release'][$pkg_type.'s'][$pkg_type];
}
!
if(!count($packages)){
?>
***************
*** 130,134 ****
System::mkdir(array('-p', $bundle_dir));
}
!
if($remove_installed_pkgs){
// Remove previously installed packages and their registries
--- 130,134 ----
System::mkdir(array('-p', $bundle_dir));
}
!
if($remove_installed_pkgs){
// Remove previously installed packages and their registries
***************
*** 141,144 ****
--- 141,147 ----
$zi_registry->unsetPackages();
+ // unset dependencies queue
+ $zi_registry->unsetPackagesQueue();
+
if($pkg_type == 'plugin'){
$dir_plugins_re = $zi_registry->getApplicationPath().'plugins_re';
***************
*** 147,162 ****
System::mkDir($dir_plugins_re);
}
!
$zi_registry->unsetPlugins();
}
!
?>
<h2>Installed <?php echo ucfirst($pkg_type); ?>s</h2>
<div class="warning">Removed installed <?php echo ucfirst($pkg_type); ?>s.</div>
<?php
!
$app_settings = $zi_registry->getApplicationSettings();
$log = array();
!
require_once 'ZZOSS_Package/Package.php';
$pkg_obj = new ZZOSS_Package;
--- 150,165 ----
System::mkDir($dir_plugins_re);
}
!
$zi_registry->unsetPlugins();
}
!
?>
<h2>Installed <?php echo ucfirst($pkg_type); ?>s</h2>
<div class="warning">Removed installed <?php echo ucfirst($pkg_type); ?>s.</div>
<?php
!
$app_settings = $zi_registry->getApplicationSettings();
$log = array();
! die();
require_once 'ZZOSS_Package/Package.php';
$pkg_obj = new ZZOSS_Package;
***************
*** 172,178 ****
?>
<h2>Local <?php echo ucfirst($pkg_type); ?>s</h2>
!
<div class="warning">Rebuilt <?php echo ucfirst($pkg_type); ?>s from sources.</div>
!
<textarea cols="60" rows="20" wrap="off"><?php
echo $log;
--- 175,181 ----
?>
<h2>Local <?php echo ucfirst($pkg_type); ?>s</h2>
!
<div class="warning">Rebuilt <?php echo ucfirst($pkg_type); ?>s from sources.</div>
!
<textarea cols="60" rows="20" wrap="off"><?php
echo $log;
***************
*** 181,185 ****
$zi_registry->registerPackages();
}
!
// If the package is not available locally, download it from the
// location specified in the packages.xml.
--- 184,188 ----
$zi_registry->registerPackages();
}
!
// If the package is not available locally, download it from the
// location specified in the packages.xml.
***************
*** 221,225 ****
}
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer'.$widget_type.'.php';
!
if(!$is_popup && $buffer_output){
ob_end_clean();
--- 224,228 ----
}
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer'.$widget_type.'.php';
!
if(!$is_popup && $buffer_output){
ob_end_clean();
Index: applications_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications_download.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** applications_download.php 7 Apr 2004 11:05:14 -0000 1.7
--- applications_download.php 6 May 2004 12:34:18 -0000 1.8
***************
*** 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,51 ****
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
! /***************************************************************************
! * INSTALLER FRAMEWORK FUNCTIONS *
! ***************************************************************************/
function zi_process()
{
global $zi_registry;
!
if(!is_array($_REQUEST["ZI_VALUES"]["application"]) || !count($_REQUEST["ZI_VALUES"]["application"])){
return false;
}
!
$zi_registry->setDir($GLOBALS['ZI']['installer_data_dir']);
!
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distribution.xml';
$distribution_xml = new ZZOSS_Config();
$distribution_xml->setFile($file);
$distribution = $distribution_xml->query('/distribution');
!
$zi_registry->initDistribution($distribution['name'].'-'.$distribution['release']['version']);
!
// download application.xml
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_applications.xml';
--- 23,51 ----
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
! /***************************************************************************
! * INSTALLER FRAMEWORK FUNCTIONS *
! ***************************************************************************/
function zi_process()
{
global $zi_registry;
!
if(!is_array($_REQUEST["ZI_VALUES"]["application"]) || !count($_REQUEST["ZI_VALUES"]["application"])){
return false;
}
!
$zi_registry->setDir($GLOBALS['ZI']['installer_data_dir']);
!
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distribution.xml';
$distribution_xml = new ZZOSS_Config();
$distribution_xml->setFile($file);
$distribution = $distribution_xml->query('/distribution');
!
$zi_registry->initDistribution($distribution['name'].'-'.$distribution['release']['version']);
!
// download application.xml
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_applications.xml';
***************
*** 53,60 ****
$remote_applications_xml->setFile($file);
$remote_applications = $remote_applications_xml->query('/applications/application');
!
foreach($_REQUEST["ZI_VALUES"]["application"] as $app_selected){
$remote_application = $remote_applications[$app_selected];
!
//$distribution_dir = $GLOBALS['ZI']['installer_data_dir'].'distributions/'.$distribution["name"].'-'.$distribution["release"]["version"].'/';
// create directories for distribution if not exists
--- 53,60 ----
$remote_applications_xml->setFile($file);
$remote_applications = $remote_applications_xml->query('/applications/application');
!
foreach($_REQUEST["ZI_VALUES"]["application"] as $app_selected){
$remote_application = $remote_applications[$app_selected];
!
//$distribution_dir = $GLOBALS['ZI']['installer_data_dir'].'distributions/'.$distribution["name"].'-'.$distribution["release"]["version"].'/';
// create directories for distribution if not exists
***************
*** 66,72 ****
*/
$zi_registry->initApplication($remote_application["name"].'-'.$remote_application["release"]["version"]);
!
//$application_dir = $distribution_dir.'applications/'.$remote_application["name"].'-'.$remote_application["release"]["version"].'/';
!
// copy distribution.xml
$file_src = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distribution.xml';
--- 66,72 ----
*/
$zi_registry->initApplication($remote_application["name"].'-'.$remote_application["release"]["version"]);
!
//$application_dir = $distribution_dir.'applications/'.$remote_application["name"].'-'.$remote_application["release"]["version"].'/';
!
// copy distribution.xml
$file_src = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distribution.xml';
***************
*** 88,92 ****
$file_application = $zi_registry->getApplicationPath().'application.xml';
$file_packages = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'remote_packages.xml';
!
// download application.xml and packages.xml
if(is_array($remote_application["filelist"]["descriptor"])) {
--- 88,92 ----
$file_application = $zi_registry->getApplicationPath().'application.xml';
$file_packages = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'remote_packages.xml';
!
// download application.xml and packages.xml
if(is_array($remote_application["filelist"]["descriptor"])) {
***************
*** 103,125 ****
}
}
!
// set rebuild applications flag
$fp = fopen($GLOBALS['ZI']['installer_data_dir']."installer".DIRECTORY_SEPARATOR."distributions.lock","w");
fputs($fp,'dummy');
fclose($fp);
!
// set rebuild applications flag
$fp = fopen($zi_registry->getDistributionPath()."installer".DIRECTORY_SEPARATOR."applications.lock","w");
fputs($fp,'dummy');
fclose($fp);
!
@unlink($GLOBALS['ZI']['installer_data_dir']."installer".DIRECTORY_SEPARATOR."distributions.reg");
!
$_REQUEST["ZI_LOCATION_NEXT"] = 'applications.php';
}
! /***************************************************************************
! * STARTUP *
! ***************************************************************************/
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distribution.xml';
--- 103,125 ----
}
}
!
// set rebuild applications flag
$fp = fopen($GLOBALS['ZI']['installer_data_dir']."installer".DIRECTORY_SEPARATOR."distributions.lock","w");
fputs($fp,'dummy');
fclose($fp);
!
// set rebuild applications flag
$fp = fopen($zi_registry->getDistributionPath()."installer".DIRECTORY_SEPARATOR."applications.lock","w");
fputs($fp,'dummy');
fclose($fp);
!
@unlink($GLOBALS['ZI']['installer_data_dir']."installer".DIRECTORY_SEPARATOR."distributions.reg");
!
$_REQUEST["ZI_LOCATION_NEXT"] = 'applications.php';
}
! /***************************************************************************
! * STARTUP *
! ***************************************************************************/
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distribution.xml';
***************
*** 127,134 ****
$distribution_xml->setFile($file);
$distribution = $distribution_xml->query('/distribution');
!
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
--- 127,134 ----
$distribution_xml->setFile($file);
$distribution = $distribution_xml->query('/distribution');
!
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
***************
*** 137,152 ****
<?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);
?>
--- 137,152 ----
<?php
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_applications.xml';
!
$items = array('Applications XML');
$label = 'Downloading';
!
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$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);
?>
Index: info_changelog.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info_changelog.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** info_changelog.php 4 Apr 2004 15:53:41 -0000 1.8
--- info_changelog.php 6 May 2004 12:34:19 -0000 1.9
***************
*** 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,39 ****
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
include 'inc/info.php';
!
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
!
$zi_buttons['back'] = 'info.php'.zi_form_querystr();
!
$widget_type = '_popup';
!
if(isset($_REQUEST['widget_type'])){
if($_REQUEST['widget_type'] == '_self'){
--- 23,39 ----
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
include 'inc/info.php';
!
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
!
$zi_buttons['back'] = 'info.php'.zi_form_querystr();
!
$widget_type = '_popup';
!
if(isset($_REQUEST['widget_type'])){
if($_REQUEST['widget_type'] == '_self'){
***************
*** 50,54 ****
case 'distribution_remote':
$header = 'Distribution';
!
// load selected distribution
$file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distributions.xml';
--- 50,54 ----
case 'distribution_remote':
$header = 'Distribution';
!
// load selected distribution
$file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distributions.xml';
***************
*** 61,81 ****
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')));
! $distribution_config->setFile($file);
$info = $distribution_config->query('/distribution');
}
--- 61,81 ----
unlink($file);
}
!
$items = array('Distribution XML');
$label = 'Downloading';
!
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$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')));
! $distribution_config->setFile($file);
$info = $distribution_config->query('/distribution');
}
***************
*** 93,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();
--- 93,104 ----
$remote_applications = $remote_applications_xml->query('/applications/application');
$remote_application = $remote_applications[$_REQUEST["id"]];
!
$items = array('Application XML');
$label = 'Downloading';
!
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$bar->prepareListHorizontal($items, 'Downloading');
!
require_once 'ZZOSS_File/Download.php';
$download = new ZZOSS_FileDownload();
***************
*** 121,125 ****
case 'distribution':
$header = 'Distribution';
!
// load selected package
$distribution = $zi_registry->getDistribution($_REQUEST["distribution"]);
--- 121,125 ----
case 'distribution':
$header = 'Distribution';
!
// load selected package
$distribution = $zi_registry->getDistribution($_REQUEST["distribution"]);
***************
*** 150,165 ****
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']);
--- 150,165 ----
if($info["install"]["type"] == 'remote') {
$zi_registry->unsetPackageRemoteInfo();
!
$items = array('Package XML');
$label = 'Downloading';
!
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$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']);
Index: info.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** info.php 5 Apr 2004 10:17:56 -0000 1.7
--- info.php 6 May 2004 12:34:19 -0000 1.8
***************
*** 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,33 ****
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
include 'inc/info.php';
!
$widget_type = '_popup';
!
if(isset($_REQUEST['widget_type'])){
if($_REQUEST['widget_type'] == '_self'){
--- 23,33 ----
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
include 'inc/info.php';
!
$widget_type = '_popup';
!
if(isset($_REQUEST['widget_type'])){
if($_REQUEST['widget_type'] == '_self'){
***************
*** 41,49 ****
<h1>Information</h1>
<?php
!
switch($_REQUEST['type']){
case 'distribution_remote':
$header = 'Distribution';
!
// load selected distribution
$file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distributions.xml';
--- 41,49 ----
<h1>Information</h1>
<?php
!
switch($_REQUEST['type']){
case 'distribution_remote':
$header = 'Distribution';
!
// load selected distribution
$file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distributions.xml';
***************
*** 58,75 ****
$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')));
! $distribution_config->setFile($file);
$info = $distribution_config->query('/distribution');
}
--- 58,75 ----
$items = array('Distribution XML');
$label = 'Downloading';
!
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$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')));
! $distribution_config->setFile($file);
$info = $distribution_config->query('/distribution');
}
***************
*** 77,81 ****
case 'distribution':
$header = 'Distribution';
!
// load selected package
$distribution = $zi_registry->getDistribution($_REQUEST["distribution"]);
--- 77,81 ----
case 'distribution':
$header = 'Distribution';
!
// load selected package
$distribution = $zi_registry->getDistribution($_REQUEST["distribution"]);
***************
*** 97,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"])) {
--- 97,112 ----
$remote_applications = $remote_applications_xml->query('/applications/application');
$remote_application = $remote_applications[$_REQUEST["id"]];
!
$items = array('Application XML');
$label = 'Downloading';
!
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$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"])) {
***************
*** 146,161 ****
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']);
--- 146,161 ----
if($info["install"]["type"] == 'remote') {
$zi_registry->unsetPackageRemoteInfo();
!
$items = array('Package XML');
$label = 'Downloading';
!
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$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']);
***************
*** 167,175 ****
break;
}
!
if(isset($info["changelog"]) && is_array($info["changelog"])) {
$zi_buttons['next'] = 'info_changelog.php'.zi_form_querystr();
}
!
$content = '';
// Show the installation paths if it is an installed application
--- 167,175 ----
break;
}
!
if(isset($info["changelog"]) && is_array($info["changelog"])) {
$zi_buttons['next'] = 'info_changelog.php'.zi_form_querystr();
}
!
$content = '';
// Show the installation paths if it is an installed application
Index: packages_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_download.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** packages_download.php 7 Apr 2004 14:21:54 -0000 1.12
--- packages_download.php 6 May 2004 12:34:19 -0000 1.13
***************
*** 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,36 ****
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
!
function downloadPackages($packages_selection)
! {
global $process;
$process = false;
$error = false;
!
if(!is_array($packages_selection)) {
$result['error'] = true;
--- 23,36 ----
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
!
function downloadPackages($packages_selection)
! {
global $process;
$process = false;
$error = false;
!
if(!is_array($packages_selection)) {
$result['error'] = true;
***************
*** 38,42 ****
} else {
global $zi_registry;
!
$pkg_type = 'package';
if(isset($_REQUEST['type'])){
--- 38,42 ----
} else {
global $zi_registry;
!
$pkg_type = 'package';
if(isset($_REQUEST['type'])){
***************
*** 44,53 ****
}
$zi_registry->setPackageType($pkg_type);
!
$items = array();
!
$packages_resolve = $zi_registry->getPackagesResolve();
$packages = $zi_registry->getPackages();
!
foreach($packages_selection as $key => $val) {
$name = $packages_resolve[$key];
--- 44,53 ----
}
$zi_registry->setPackageType($pkg_type);
!
$items = array();
!
$packages_resolve = $zi_registry->getPackagesResolve();
$packages = $zi_registry->getPackages();
!
foreach($packages_selection as $key => $val) {
$name = $packages_resolve[$key];
***************
*** 61,79 ****
}
}
!
if(!count($items)){
$result['error'] = true;
$result['log'] = 'Nothing to download';
} else {
! 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'));
!
$log = '';
!
foreach($packages_selection as $key=>$val) {
if(!$error) {
--- 61,79 ----
}
}
!
if(!count($items)){
$result['error'] = true;
$result['log'] = 'Nothing to download';
} else {
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$bar->prepareListHorizontal($items, 'Downloading');
!
require_once 'ZZOSS_File/Download.php';
$download = new ZZOSS_FileDownload();
$download->setCallback(array(&$bar, '_downloadCallback'));
!
$log = '';
!
foreach($packages_selection as $key=>$val) {
if(!$error) {
***************
*** 85,91 ****
$dir_downloads = $zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR;
$dir_package = $dir_packages.$package['name'].'-'.$package['release']['version'].DIRECTORY_SEPARATOR;
!
//print_r($package['filelist']['file']);
!
$pkg_remote = NULL;
if(isset($package['filelist']['file'][0]['#']) && strlen($package['filelist']['file'][0]['#'])>2) {
--- 85,91 ----
$dir_downloads = $zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR;
$dir_package = $dir_packages.$package['name'].'-'.$package['release']['version'].DIRECTORY_SEPARATOR;
!
//print_r($package['filelist']['file']);
!
$pkg_remote = NULL;
if(isset($package['filelist']['file'][0]['#']) && strlen($package['filelist']['file'][0]['#'])>2) {
***************
*** 98,109 ****
// download archive and extract it
$pkg_dl = $dir_downloads.basename($pkg_remote);
!
$log .= "Downloaded remote package archive:\n".$pkg_remote."\n";
!
$download->download($pkg_remote, $pkg_dl);
//$bar->executeListHorizontal();
!
$log .= $download->getLog();
!
if(file_exists($pkg_dl)) {
//$log .= 'downloaded package '.$package['name'].'-'.$package['release']['version']."\n";
--- 98,109 ----
// download archive and extract it
$pkg_dl = $dir_downloads.basename($pkg_remote);
!
$log .= "Downloaded remote package archive:\n".$pkg_remote."\n";
!
$download->download($pkg_remote, $pkg_dl);
//$bar->executeListHorizontal();
!
$log .= $download->getLog();
!
if(file_exists($pkg_dl)) {
//$log .= 'downloaded package '.$package['name'].'-'.$package['release']['version']."\n";
***************
*** 117,121 ****
PEAR::raiseError("No download location specified for the archive (.tgz).");
}
!
$xml_dest = $dir_package.'package.xml';
$xml_dl = $dir_packages.'package.xml';
--- 117,121 ----
PEAR::raiseError("No download location specified for the archive (.tgz).");
}
!
$xml_dest = $dir_package.'package.xml';
$xml_dl = $dir_packages.'package.xml';
***************
*** 127,135 ****
copy($xml_dl, $xml_dest);
//unlink($xml_dl);
! }
//print_r($package['filelist']);
if(isset($package['filelist']['descriptor']['#']) && strlen($package['filelist']['descriptor']['#'])>2) {
$xml_dl = $dir_downloads.$package['name'].'-'.$package['release']['version'].'.xml';
!
// download specified remote package XML
$log .= "Downloaded remote package XML:\n".$package['filelist']['descriptor']['#']."\n";
--- 127,135 ----
copy($xml_dl, $xml_dest);
//unlink($xml_dl);
! }
//print_r($package['filelist']);
if(isset($package['filelist']['descriptor']['#']) && strlen($package['filelist']['descriptor']['#'])>2) {
$xml_dl = $dir_downloads.$package['name'].'-'.$package['release']['version'].'.xml';
!
// download specified remote package XML
$log .= "Downloaded remote package XML:\n".$package['filelist']['descriptor']['#']."\n";
***************
*** 144,148 ****
}
}
!
// register new package
if(file_exists($xml_dest)) {
--- 144,148 ----
}
}
!
// register new package
if(file_exists($xml_dest)) {
***************
*** 153,157 ****
$error = true;
}
!
}
}
--- 153,157 ----
$error = true;
}
!
}
}
***************
*** 161,172 ****
}
}
!
return $result;
}
!
! /***************************************************************************
! * STARTUP *
! ***************************************************************************/
!
$pkg_type = 'package';
if(isset($_REQUEST['type'])){
--- 161,172 ----
}
}
!
return $result;
}
!
! /***************************************************************************
! * STARTUP *
! ***************************************************************************/
!
$pkg_type = 'package';
if(isset($_REQUEST['type'])){
***************
*** 174,187 ****
}
$zi_registry->setPackageType($pkg_type);
!
// 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];
--- 174,187 ----
}
$zi_registry->setPackageType($pkg_type);
!
// 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];
***************
*** 189,193 ****
if(
$val=='I' &&
! $package["install"]["type"] == 'remote' &&
!file_exists($zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR.$name.'.tgz')
) {
--- 189,193 ----
if(
$val=='I' &&
! $package["install"]["type"] == 'remote' &&
!file_exists($zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR.$name.'.tgz')
) {
***************
*** 196,205 ****
}
}
!
if(!$has_downloads){
header('Location: packages_process.php'.zi_form_querystr());
exit;
}
!
/*
echo '<h3>Actions</h3>';
--- 196,205 ----
}
}
!
if(!$has_downloads){
header('Location: packages_process.php'.zi_form_querystr());
exit;
}
!
/*
echo '<h3>Actions</h3>';
***************
*** 212,222 ****
// default do not process
$process = false;
!
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
!
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
!
$application = $zi_registry->getApplication();
?>
--- 212,222 ----
// default do not process
$process = false;
!
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
!
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
!
$application = $zi_registry->getApplication();
?>
***************
*** 232,236 ****
<?php
$zi_buttons['back'] = "packages_confirm.php".zi_form_querystr();
!
if(!$result['error']) {
$zi_buttons['next'] = 'packages_dependencies.php'.zi_form_querystr();
--- 232,236 ----
<?php
$zi_buttons['back'] = "packages_confirm.php".zi_form_querystr();
!
if(!$result['error']) {
$zi_buttons['next'] = 'packages_dependencies.php'.zi_form_querystr();
Index: distribution_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/distribution_download.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** distribution_download.php 6 Apr 2004 19:51:09 -0000 1.7
--- distribution_download.php 6 May 2004 12:34:18 -0000 1.8
***************
*** 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,36 ****
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
! /***************************************************************************
! * INSTALLER FRAMEWORK FUNCTIONS *
! ***************************************************************************/
function zi_process() {
!
// download distribution.xml
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distributions.xml';
--- 23,36 ----
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
// execute init file
require_once 'inc/init.php';
! /***************************************************************************
! * INSTALLER FRAMEWORK FUNCTIONS *
! ***************************************************************************/
function zi_process() {
!
// download distribution.xml
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distributions.xml';
***************
*** 52,58 ****
}
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
--- 52,58 ----
}
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
***************
*** 61,76 ****
<?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);
?>
--- 61,76 ----
<?php
$file = $GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR.'remote_distributions.xml';
!
$items = array('Distributions XML');
$label = 'Downloading';
!
! require_once 'ZZOSS_Portlet/Progress.php';
! $bar = new ZZOSS_PortletProgress();
$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);
?>
-------------------------------------------------------
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