[zi-cvs] packages/com.zzoss.zic packages_auto.php,NONE,1.1 packages_sources.php,NONE,1.1 packages_sources_downloads.php,NONE,1.1 TODO,1.3,1.4 application_profile.php,1.1,1.2 application_settings.php,1.1,1.2 applications.php,1.2,1.3 config_components.php,1.1,1.2 dev_bundle_instant.php,1.1,1.2 package.xml,1.3,1.4 packages.php,1.2,1.3 setup.php,1.2,1.3 setup_datadir.php,1.1,1.2 setup_resume.php,1.1,1.2 dev_bundle_downloads.php,1.1,NONE dev_bundle_new.php,1.1,NONE
[email protected] Sun, 04 Jan 2004 05:26:58 -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:/tmp/cvs-serv29252/com.zzoss.zic
Modified Files:
TODO application_profile.php application_settings.php
applications.php config_components.php dev_bundle_instant.php
package.xml packages.php setup.php setup_datadir.php
setup_resume.php
Added Files:
packages_auto.php packages_sources.php
packages_sources_downloads.php
Removed Files:
dev_bundle_downloads.php dev_bundle_new.php
Log Message:
development applications can now also be installed
--- NEW FILE: packages_auto.php ---
<?php
/*
Copyright (C) 2001-2004 ZZOSS GbR, http://www.zzoss.com
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/**
@version $Id: packages_auto.php,v 1.1 2004/01/04 13:26:55 ordnas Exp $
@copyright Copyright © 2001-2004 ZZ/OSS GbR, http://www.zzoss.com
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
// execute init file
require_once 'inc/init.php';
/***************************************************************************
* STARTUP *
***************************************************************************/
$a = array();
$zi_registry->registerPackages();
$packages = $zi_registry->getPackages();
if(is_array($packages)) {
foreach($packages as $package) {
if($_REQUEST["profile"] == 'full') {
$a[$package["id"]] = 'I';
} elseif($_REQUEST["profile"] == 'minimum' && $package["install"]["required"]) {
$a[$package["id"]] = 'I';
}
}
}
$zi_registry->setPackagesActions($a);
header("Location: packages_confirm.php".zi_form_querystr());
?>
--- NEW FILE: packages_sources.php ---
<?php
/*
Copyright (C) 2001-2004 ZZOSS GbR, http://www.zzoss.com
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/**
@version $Id: packages_sources.php,v 1.1 2004/01/04 13:26:55 ordnas Exp $
@copyright Copyright © 2001-2004 ZZ/OSS GbR, http://www.zzoss.com
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
// execute init file
require_once 'inc/init.php';
function zi_process()
{
$log = '';
$downloads = $_REQUEST['ZI_VALUES'];
if(is_array($downloads) && count($downloads)){
$_REQUEST['ZI_LOCATION_NEXT'] = 'packages_sources_downloads.php'.zi_form_querystr();
global $zi_registry;
if($_REQUEST['dev'] != 'bundle'){
$bundle_dir = $zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR;
} else {
$bundle_dir = $zi_registry->getApplicationPath().'bundle'.DIRECTORY_SEPARATOR;
}
$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);
$log .= "[$package]\n* Downloaded from $url.\n";
} else {
$log .= "[$package]\n* Error ".$saved->getMessage().".\n";
$_REQUEST['ZI_LOCATION_NEXT'] .= '&error=true';
break;
}
$log .= "\n";
}
$regfile = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'bundle_downloads.reg';
ZZOSS_InstallerUtils::serializeToFile($regfile, $downloads);
$logfile = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'bundle_downloads.log';
$fp = fopen($logfile,"w");
fputs($fp,$log);
fclose($fp);
}
}
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 *
***************************************************************************/
$application = $zi_registry->getApplication();
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
<h1>Packages Sources</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']; ?>', 'Application Information', '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
require_once 'ZZOSS_Config/Config.php';
$application = ZZOSS_Config::prepareNumeric($application, array('package'));
$packages = $application['release']['packages']['package'];
if(!is_array($packages) || !count($packages)){
?>
<div class="warning">No packages defined in application.xml</div>
<?php
} else {
if($_REQUEST['dev'] != 'bundle'){
$bundle_dir = $zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR;
} else {
$bundle_dir = $zi_registry->getApplicationPath().'bundle'.DIRECTORY_SEPARATOR;
System::rm(array('-rf', $bundle_dir));
System::mkdir(array('-p', $bundle_dir));
}
$app_settings = $zi_registry->getApplicationSettings();
$log = array();
require_once 'ZZOSS_Package/Package.php';
$pkg_obj = new ZZOSS_Package;
$pkg_obj->packageSources($bundle_dir, $packages, $app_settings);
$log = $pkg_obj->getLog();
if(strlen($log)){
?>
<h2>Local Packages</h2>
<textarea cols="60" rows="20" wrap="off"><?php
echo $log;
?></textarea>
<?php
}
// If the package is not available locally, download it from the
// location specified in the packages.xml.
if($pkg_obj->hasUnprocessedPkgs()){
$zi_buttons['next'] = 'packages_sources_downloads.php'.zi_form_querystr();
// installer widget class
require_once 'ZZOSS_Installer/Widget.php';
$zi_widget = new ZZOSS_InstallerWidget;
$zi_widget->setErrors($zi_errors);
?>
<h2>Remote Packages</h2>
<p>Please provide the URL to the download location of each package.</p>
<table border="0" cellspacing="0" cellpadding="4">
<?php
//print_r($packages);
//$zi_registry->registerPackages();
//$pkgs_available = $zi_registry->getPackages();
//print_r($pkgs_available);
$pkgs_unprocessed = $pkg_obj->getUnprocessedPkgs();
foreach($pkgs_unprocessed as $pos => $package){
$package_unique = $package['@']['name'].'-'.$package['@']['version'];
echo $zi_widget->add('text', $package_unique, $package_unique, array('validation' => 'not empty'));
}
?>
</table>
<?php
} else {
if($_REQUEST['dev'] == 'bundle'){
$zi_buttons['next'] = 'dev_bundle_process.php'.zi_form_querystr();
} else {
$zi_buttons['next'] = 'packages.php'.zi_form_querystr();
}
}
}
if($_REQUEST['dev'] == 'bundle'){
$zi_buttons['back'] = 'application_settings.php'.zi_form_querystr().'&dev=bundle';
} else {
$zi_buttons['back'] = 'application_profile.php'.zi_form_querystr();
}
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
?>
--- NEW FILE: packages_sources_downloads.php ---
<?php
/*
Copyright (C) 2001-2004 ZZOSS GbR, http://www.zzoss.com
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/**
@version $Id: packages_sources_downloads.php,v 1.1 2004/01/04 13:26:55 ordnas Exp $
@copyright Copyright © 2001-2004 ZZ/OSS GbR, http://www.zzoss.com
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
// execute init file
require_once 'inc/init.php';
/***************************************************************************
* PAGE CONTENT *
***************************************************************************/
$application = $zi_registry->getApplication();
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
<h1>Download Remote Packages</h1>
<?php
if($_REQUEST['error'] == 'true'){
?>
<div class="warning">An error occured while downloading, please read the log.</div>
<?php
}
?>
<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']; ?>', 'Application Information', '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 cols="60" rows="20" wrap="off"><?php
$logfile = $zi_registry->getApplicationPath().'installer'.DIRECTORY_SEPARATOR.'bundle_downloads.log';
readfile($logfile);
?></textarea>
<?php
if($_REQUEST['error'] != 'true'){
if($_REQUEST['dev'] == 'bundle'){
$zi_buttons['next'] = 'dev_bundle_process.php'.zi_form_querystr();
} else {
$zi_buttons['next'] = 'packages.php'.zi_form_querystr();
}
}
$zi_buttons['back'] = 'packages_sources.php'.zi_form_querystr();
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
?>
Index: TODO
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/TODO,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TODO 1 Jan 2004 15:41:20 -0000 1.3
--- TODO 4 Jan 2004 13:26:55 -0000 1.4
***************
*** 469,472 ****
--- 469,474 ----
- danymically parse inc/config_params.php-dist, also app version from XML
+ - handle errors if a file specified in package.xml filelist does not exist in dev_bundle_new.php
+
### Low Priority ###
Index: application_profile.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_profile.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** application_profile.php 22 Dec 2003 17:19:58 -0000 1.1
--- application_profile.php 4 Jan 2004 13:26:55 -0000 1.2
***************
*** 47,54 ****
$_REQUEST['profile'] = $_REQUEST['ZI_VALUES']['application_profile'];
$_REQUEST['application'] = $application;
! if($_REQUEST["profile"] == 'custom') {
! $_REQUEST["ZI_LOCATION_NEXT"] = "packages.php".zi_form_querystr();
} else {
! $_REQUEST["ZI_LOCATION_NEXT"] = 'application_profile_auto.php'.zi_form_querystr();
}
--- 47,54 ----
$_REQUEST['profile'] = $_REQUEST['ZI_VALUES']['application_profile'];
$_REQUEST['application'] = $application;
! if($_REQUEST["mode"] == 'dev') {
! $_REQUEST["ZI_LOCATION_NEXT"] = "packages_sources.php".zi_form_querystr();
} else {
! $_REQUEST["ZI_LOCATION_NEXT"] = 'packages.php'.zi_form_querystr();
}
Index: application_settings.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_settings.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** application_settings.php 22 Dec 2003 17:19:58 -0000 1.1
--- application_settings.php 4 Jan 2004 13:26:55 -0000 1.2
***************
*** 64,67 ****
--- 64,89 ----
}
+ function default_paths($dev_mode = false)
+ {
+ $application = $_REQUEST['application'];
+
+ if($dev_mode){
+ $application .= '-dev';
+ }
+ // absolute root
+ $split[0] = substr(dirname($_SERVER['PATH_TRANSLATED']), 0, strrpos(dirname($_SERVER['PATH_TRANSLATED']), '/')).'/';
+ $_REQUEST['ZI_VALUES']['application_root'] = $split[0].$application.DIRECTORY_SEPARATOR;
+ $split[0] = substr(dirname($_SERVER['PHP_SELF']), 0, strrpos(dirname($_SERVER['PHP_SELF']), '/')).'/';
+ $_REQUEST['ZI_VALUES']['application_url_rel'] = $split[0].$application.'/';
+ // relative path from URL to root
+ if($_REQUEST['ZI_VALUES']['application_url_rel'][0] != '/'){
+ // this is a problem with Windows
+ $_REQUEST['ZI_VALUES']['application_url_rel'] = '/'.$_REQUEST['ZI_VALUES']['application_url_rel'];
+ }
+ // URL
+ $_REQUEST['ZI_VALUES']['application_url'] = 'http://'.$_SERVER['HTTP_HOST'].$_REQUEST['ZI_VALUES']['application_url_rel'];
+ return $_REQUEST;
+ }
+
// assign default values
function zi_default()
***************
*** 69,90 ****
global $zi_registry;
// if we had a previous installation, we get those values
if($application_settings = $zi_registry->getApplicationSettingsById($_REQUEST['id'])){
$_REQUEST['ZI_VALUES'] = $application_settings;
return $_REQUEST;
} else {
! // absolute root
! $split[0] = substr(dirname($_SERVER['PATH_TRANSLATED']), 0, strrpos(dirname($_SERVER['PATH_TRANSLATED']), '/')).'/';
! $_REQUEST['ZI_VALUES']['application_root'] = $split[0].$_REQUEST['application'].DIRECTORY_SEPARATOR;
! $split[0] = substr(dirname($_SERVER['PHP_SELF']), 0, strrpos(dirname($_SERVER['PHP_SELF']), '/')).'/';
! $_REQUEST['ZI_VALUES']['application_url_rel'] = $split[0].$_REQUEST['application'].'/';
! // relative path from URL to root
! if($_REQUEST['ZI_VALUES']['application_url_rel'][0] != '/'){
! // this is a problem with Windows
! $_REQUEST['ZI_VALUES']['application_url_rel'] = '/'.$_REQUEST['ZI_VALUES']['application_url_rel'];
! }
! // URL
! $_REQUEST['ZI_VALUES']['application_url'] = 'http://'.$_SERVER['HTTP_HOST'].$_REQUEST['ZI_VALUES']['application_url_rel'];
! return $_REQUEST;
}
}
--- 91,109 ----
global $zi_registry;
+ $dev_mode = false;
+
+ if($_REQUEST['mode'] == 'dev'){
+ $dev_mode = true;
+ }
+
// if we had a previous installation, we get those values
if($application_settings = $zi_registry->getApplicationSettingsById($_REQUEST['id'])){
$_REQUEST['ZI_VALUES'] = $application_settings;
+ if(!strlen($_REQUEST['ZI_VALUES']['application_root'])){
+ return default_paths($dev_mode);
+ }
return $_REQUEST;
} else {
! return default_paths($dev_mode);
}
}
***************
*** 132,135 ****
--- 151,155 ----
if($_REQUEST['dev'] != 'bundle'){
?>
+ <h2>Application Paths</h2>
<table border="0" cellspacing="0" cellpadding="4">
<?php
***************
*** 163,167 ****
$zi_buttons['back'] = 'applications.php'.zi_form_querystr();
if($_REQUEST['dev'] == 'bundle'){
! $zi_buttons['next'] = 'dev_bundle_new.php'.zi_form_querystr();
} else {
$zi_buttons['next'] = 'application_profile.php'.zi_form_querystr();
--- 183,187 ----
$zi_buttons['back'] = 'applications.php'.zi_form_querystr();
if($_REQUEST['dev'] == 'bundle'){
! $zi_buttons['next'] = 'packages_sources.php'.zi_form_querystr();
} else {
$zi_buttons['next'] = 'application_profile.php'.zi_form_querystr();
Index: applications.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** applications.php 1 Jan 2004 15:41:20 -0000 1.2
--- applications.php 4 Jan 2004 13:26:55 -0000 1.3
***************
*** 69,72 ****
--- 69,75 ----
} else {
switch($split[1]){
+ case 'i':
+ $_REQUEST["ZI_LOCATION_NEXT"] = 'application_settings.php'.zi_form_querystr();
+ break;
case 'b':
$bundle_dir =
***************
*** 228,232 ****
<td<?php echo $highlight; ?>>
<p>
! <input type="radio" name="a" value="<?php echo $application["id"].'_u_'.$distribution['name'].'-'.$distribution['release']['version']; ?>">Update<br/>
<input type="radio" name="a" value="<?php echo $application["id"].'_b_'.$distribution['name'].'-'.$distribution['release']['version']; ?>">Bundle<br/>
<input type="radio" name="a" value="<?php echo $application["id"].'_R_'.$distribution['name'].'-'.$distribution['release']['version']; ?>">Delete
--- 231,236 ----
<td<?php echo $highlight; ?>>
<p>
! <input type="radio" name="a" value="<?php echo $application["id"].'_i_'.$distribution['name'].'-'.$distribution['release']['version']; ?>">Install<br/>
! <input type="radio" name="a" value="<?php echo $application["id"].'_u_'.$distribution['name'].'-'.$distribution['release']['version']; ?>">Update XML<br/>
<input type="radio" name="a" value="<?php echo $application["id"].'_b_'.$distribution['name'].'-'.$distribution['release']['version']; ?>">Bundle<br/>
<input type="radio" name="a" value="<?php echo $application["id"].'_R_'.$distribution['name'].'-'.$distribution['release']['version']; ?>">Delete
Index: config_components.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/config_components.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config_components.php 22 Dec 2003 17:19:58 -0000 1.1
--- config_components.php 4 Jan 2004 13:26:55 -0000 1.2
***************
*** 81,86 ****
$components = $GLOBALS['ZI_CONFIG']['component'];
if(is_array($components) && count($components)){
! require_once 'ZZOSS_Installer/FileReplace.php';
! $replace = new ZZOSS_InstallerFileReplace;
foreach($components as $component_name => $component_params){
// compose paths to configuration file
--- 81,86 ----
$components = $GLOBALS['ZI_CONFIG']['component'];
if(is_array($components) && count($components)){
! require_once 'ZZOSS_File/Replace.php';
! $replace = new ZZOSS_FileReplace;
foreach($components as $component_name => $component_params){
// compose paths to configuration file
Index: dev_bundle_instant.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_bundle_instant.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dev_bundle_instant.php 22 Dec 2003 17:19:58 -0000 1.1
--- dev_bundle_instant.php 4 Jan 2004 13:26:55 -0000 1.2
***************
*** 53,58 ****
@copy('inc'.DIRECTORY_SEPARATOR.'config_params.php', 'inc'.DIRECTORY_SEPARATOR.'config_params.php~');
! require_once 'ZZOSS_Installer/FileReplace.php';
! $replace = new ZZOSS_InstallerFileReplace;
// search and replace config files
--- 53,58 ----
@copy('inc'.DIRECTORY_SEPARATOR.'config_params.php', 'inc'.DIRECTORY_SEPARATOR.'config_params.php~');
! require_once 'ZZOSS_File/Replace.php';
! $replace = new ZZOSS_FileReplace;
// search and replace config files
Index: package.xml
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/package.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** package.xml 2 Jan 2004 18:44:05 -0000 1.3
--- package.xml 4 Jan 2004 13:26:55 -0000 1.4
***************
*** 67,72 ****
<file role="php" basinstalldir="" name="application_profile.php"/>
<file role="php" basinstalldir="" name="dev_bundle_new.php"/>
! <file role="php" basinstalldir="" name="dev_bundle_downloads.php"/>
! <file role="php" basinstalldir="" name="application_profile_auto.php"/>
<file role="php" basinstalldir="" name="setup.php"/>
<file role="php" basinstalldir="" name="plugins_process.php"/>
--- 67,72 ----
<file role="php" basinstalldir="" name="application_profile.php"/>
<file role="php" basinstalldir="" name="dev_bundle_new.php"/>
! <file role="php" basinstalldir="" name="packages_sources_downloads.php"/>
! <file role="php" basinstalldir="" name="packages_auto.php"/>
<file role="php" basinstalldir="" name="setup.php"/>
<file role="php" basinstalldir="" name="plugins_process.php"/>
***************
*** 124,127 ****
--- 124,129 ----
<dep type="pkg" rel="ge" version="1.0">com.zzoss.zic.build</dep>
<dep type="pkg" rel="ge" version="1.0">com.zzoss.zic.theme.kde</dep>
+ <dep type="pkg" rel="ge" version="1.0.0">com.zzoss.filereplace.lib</dep>
+ <dep type="pkg" rel="ge" version="1.0">com.zzoss.plugin.lib</dep>
</deps>
</release>
Index: packages.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** packages.php 1 Jan 2004 15:41:20 -0000 1.2
--- packages.php 4 Jan 2004 13:26:55 -0000 1.3
***************
*** 27,30 ****
--- 27,35 ----
require_once 'inc/init.php';
+ if($_REQUEST["profile"] != 'custom') {
+ header('Location: packages_auto.php'.zi_form_querystr());
+ exit;
+ }
+
/***************************************************************************
* INSTALLER FRAMEWORK FUNCTIONS *
***************
*** 77,80 ****
--- 82,87 ----
<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']; ?>', 'Application Information', '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
+
+ // Register all packages
$zi_registry->registerPackages();
Index: setup.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup.php 1 Jan 2004 15:41:20 -0000 1.2
--- setup.php 4 Jan 2004 13:26:55 -0000 1.3
***************
*** 54,58 ****
}
! require_once 'themes/zzoss/header.php';
?>
<h1>ZZ/OSS Installer Client (ZIC)</h1>
--- 54,58 ----
}
! require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
<h1>ZZ/OSS Installer Client (ZIC)</h1>
***************
*** 112,115 ****
$zi_buttons['next'] = 'setup_datadir.php';
! require_once 'themes/zzoss/footer.php';
?>
--- 112,115 ----
$zi_buttons['next'] = 'setup_datadir.php';
! require_once 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
?>
Index: setup_datadir.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup_datadir.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup_datadir.php 22 Dec 2003 17:19:58 -0000 1.1
--- setup_datadir.php 4 Jan 2004 13:26:55 -0000 1.2
***************
*** 89,93 ****
}
! require_once 'themes/zzoss/header.php';
?>
<h1>Data Directory</h1>
--- 89,93 ----
}
! require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
<h1>Data Directory</h1>
***************
*** 123,126 ****
$zi_buttons['back'] = 'setup.php';
$zi_buttons['next'] = 'setup_datadir.php';
! require_once 'themes/zzoss/footer.php';
?>
--- 123,126 ----
$zi_buttons['back'] = 'setup.php';
$zi_buttons['next'] = 'setup_datadir.php';
! require_once 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
?>
Index: setup_resume.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup_resume.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** setup_resume.php 22 Dec 2003 17:19:58 -0000 1.1
--- setup_resume.php 4 Jan 2004 13:26:55 -0000 1.2
***************
*** 43,47 ****
}
! require_once 'themes/zzoss/header.php';
?>
<h1>Resume Previous Setup</h1>
--- 43,47 ----
}
! require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
<h1>Resume Previous Setup</h1>
***************
*** 56,59 ****
<?php
$zi_buttons['next'] = 'setup_resume.php';
! require_once 'themes/zzoss/footer.php';
?>
--- 56,59 ----
<?php
$zi_buttons['next'] = 'setup_resume.php';
! require_once 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
?>
--- dev_bundle_downloads.php DELETED ---
--- dev_bundle_new.php DELETED ---
-------------------------------------------------------
This SF.net email is sponsored by: IBM Linux Tutorials.
Become an expert in LINUX or just sharpen your skills. Sign up for IBM's
Free Linux Tutorials. Learn everything from the bash shell to sys admin.
Click now! http://ads.osdn.com/?ad_id=1278&alloc_id=3371&op=click