[zi-cvs] packages/com.zzoss.zic application_delete.php,1.7,1.8 application_install.php,1.3,1.4 application_profile.php,1.7,1.8 application_settings.php,1.12,1.13 application_update.php,1.5,1.6 applications.php,1.18,1.19 bundle.php,1.1,1.2 dev_application_import.php,1.5,1.6 dev_bundle.php,1.6,1.7 dev_bundle_instant.php,1.7,1.8 dev_bundle_process.php,1.2,1.3 dev_import_xml.php,1.2,1.3 packages.php,1.10,1.11 packages_confirm.php,1.8,1.9 packages_process.php,1.8,1.9 packages_reset.php,1.7,1.8 plugins_process.php,1.7,1.8 setup.php,1.9,1.10
Sandro Zic <[email protected]> Sat, 03 Apr 2004 16:15:51 +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-serv28439/com.zzoss.zic
Modified Files:
application_delete.php application_install.php
application_profile.php application_settings.php
application_update.php applications.php bundle.php
dev_application_import.php dev_bundle.php
dev_bundle_instant.php dev_bundle_process.php
dev_import_xml.php packages.php packages_confirm.php
packages_process.php packages_reset.php plugins_process.php
setup.php
Log Message:
make instant bundle work
Index: bundle.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/bundle.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** bundle.php 5 Mar 2004 14:25:25 -0000 1.1
--- bundle.php 3 Apr 2004 16:15:48 -0000 1.2
***************
*** 62,66 ****
<?php
$zi_buttons['ok'] = "applications.php".zi_form_querystr();
! $zi_buttons['back'] = "applications.php".zi_form_querystr();
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
--- 62,66 ----
<?php
$zi_buttons['ok'] = "applications.php".zi_form_querystr();
! //$zi_buttons['back'] = "applications.php".zi_form_querystr();
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
Index: packages_confirm.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_confirm.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** packages_confirm.php 1 Apr 2004 18:59:05 -0000 1.8
--- packages_confirm.php 3 Apr 2004 16:15:48 -0000 1.9
***************
*** 32,36 ****
}
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' && !$zi_registry->isProcedure($pkg_type.'s_confirm')){
header('Location: packages_dependencies.php'.zi_form_querystr());
exit;
--- 32,36 ----
}
// 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_confirm')){
header('Location: packages_dependencies.php'.zi_form_querystr());
exit;
***************
*** 113,117 ****
</table>
<?php
! if($GLOBALS['ZI']['mode'] == 'dev') {
?>
<h2>Packages Source Paths</h2>
--- 113,117 ----
</table>
<?php
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' ) {
?>
<h2>Packages Source Paths</h2>
Index: application_settings.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_settings.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** application_settings.php 1 Apr 2004 18:59:05 -0000 1.12
--- application_settings.php 3 Apr 2004 16:15:48 -0000 1.13
***************
*** 28,39 ****
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' && !$zi_registry->isProcedure('settings')){
header('Location: application_profile.php'.zi_form_querystr());
exit;
}
!
function zi_process()
{
! if($_REQUEST['dev'] != 'bundle'){
// should we create the install root?
if($_REQUEST["ZI_VALUES"]['application_root_create'] == 'on'){
--- 28,39 ----
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && ($_REQUEST['mode'] == 'dev' || $_REQUEST['mode'] == 'instant') && !$zi_registry->isProcedure('settings')){
header('Location: application_profile.php'.zi_form_querystr());
exit;
}
!
function zi_process()
{
! if(!isset($_REQUEST['dev']) || $_REQUEST['dev'] != 'bundle'){
// should we create the install root?
if($_REQUEST["ZI_VALUES"]['application_root_create'] == 'on'){
***************
*** 53,57 ****
$count = 0;
for($i=1;$i<=5;$i++) {
! if( (strlen($_REQUEST["ZI_VALUES"]["source_".$i])>0) &&
(is_dir($_REQUEST["ZI_VALUES"]["source_".$i])) ) {
$_REQUEST["ZI_VALUES"]["additional_sources"][$count] = $_REQUEST["ZI_VALUES"]["source_".$i];
--- 53,57 ----
$count = 0;
for($i=1;$i<=5;$i++) {
! if( (isset($_REQUEST["ZI_VALUES"]["source_".$i]) && strlen($_REQUEST["ZI_VALUES"]["source_".$i])) &&
(is_dir($_REQUEST["ZI_VALUES"]["source_".$i])) ) {
$_REQUEST["ZI_VALUES"]["additional_sources"][$count] = $_REQUEST["ZI_VALUES"]["source_".$i];
***************
*** 61,67 ****
// save data
! $zi_registry->updateApplicationSettingsById($_REQUEST['id'], $_REQUEST["ZI_VALUES"]);
! if($_REQUEST['dev'] != 'bundle'){
// This is our first, the "virgin" installation.
// So we register it by saying which installer installed it.
--- 61,67 ----
// save data
! $zi_registry->updateApplicationSettings($_REQUEST["ZI_VALUES"]);
! if(!isset($_REQUEST['dev']) || $_REQUEST['dev'] != 'bundle'){
// This is our first, the "virgin" installation.
// So we register it by saying which installer installed it.
***************
*** 87,91 ****
$_REQUEST['ZI_VALUES']['application_root'] = ZZOSS_InstallerUtils::fixSlashes($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] != '/'){
--- 87,96 ----
$_REQUEST['ZI_VALUES']['application_root'] = ZZOSS_InstallerUtils::fixSlashes($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];
!
! if($GLOBALS['ZI']['mode'] != 'setup'){
! $_REQUEST['ZI_VALUES']['application_url_rel'] .= $application.'/';
! }
!
// relative path from URL to root
if($_REQUEST['ZI_VALUES']['application_url_rel'][0] != '/'){
***************
*** 185,189 ****
}
! if($GLOBALS['ZI']['mode'] == 'dev') {
?>
<h2>Packages Source Paths</h2>
--- 190,194 ----
}
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' ) {
?>
<h2>Packages Source Paths</h2>
Index: packages_reset.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_reset.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** packages_reset.php 26 Mar 2004 08:49:19 -0000 1.7
--- packages_reset.php 3 Apr 2004 16:15:48 -0000 1.8
***************
*** 58,62 ****
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' && !$zi_registry->isProcedure($pkg_type.'s_register')){
header('Location: packages.php'.zi_form_querystr());
exit;
--- 58,62 ----
// 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')){
header('Location: packages.php'.zi_form_querystr());
exit;
***************
*** 177,181 ****
?></textarea>
<?php
! $zi_registry->registerPackages('downloads');
}
--- 177,181 ----
?></textarea>
<?php
! $zi_registry->registerPackages();
}
Index: application_profile.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_profile.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** application_profile.php 18 Mar 2004 09:41:39 -0000 1.7
--- application_profile.php 3 Apr 2004 16:15:48 -0000 1.8
***************
*** 28,32 ****
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' && !$zi_registry->isProcedure('profile')){
$_REQUEST['type'] = 'plugin';
header('Location: packages_reset.php'.zi_form_querystr().'&type=plugin');
--- 28,32 ----
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && ($_REQUEST['mode'] == 'dev' || $_REQUEST['mode'] == 'instant') && !$zi_registry->isProcedure('profile')){
$_REQUEST['type'] = 'plugin';
header('Location: packages_reset.php'.zi_form_querystr().'&type=plugin');
***************
*** 45,55 ****
$zi_registry->updateApplicationSettings($_REQUEST['ZI_VALUES']);
- $application = $zi_registry->getApplicationNameById($_REQUEST['id']);
- // finally set "rebuild application" flag
- $zi_registry->lockApplications();
-
// redirect to proper page
$_REQUEST['profile'] = $_REQUEST['ZI_VALUES']['application_profile'];
- $_REQUEST['application'] = $application;
$_REQUEST['type'] = 'plugin';
if($_REQUEST["mode"] == 'dev') {
--- 45,50 ----
***************
*** 74,78 ****
}
! $application = $zi_registry->getApplicationById($_REQUEST['id']);
/***************************************************************************
--- 69,73 ----
}
! $application = $zi_registry->getApplication();
/***************************************************************************
Index: dev_bundle_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_bundle_process.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dev_bundle_process.php 1 Apr 2004 18:59:05 -0000 1.2
--- dev_bundle_process.php 3 Apr 2004 16:15:48 -0000 1.3
***************
*** 27,38 ****
if(isset($_REQUEST['action'])){
! $action_redirect = '';
$bundle_tgz = '';
switch($_REQUEST['action']){
case 'bundle':
- $bundle_dir = $zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR;
- $distri_xml = $zi_registry->getDistributionPath().'distribution.xml';
- $app_xml = $zi_registry->getApplicationPath().'application.xml';
-
require_once 'ZZOSS_Package/Package.php';
$pkg_obj = new ZZOSS_Package;
--- 27,38 ----
if(isset($_REQUEST['action'])){
!
! $bundle_dir = $zi_registry->getApplicationPath().'downloads'.DIRECTORY_SEPARATOR;
! $distri_xml = $zi_registry->getDistributionPath().'distribution.xml';
! $app_xml = $zi_registry->getApplicationPath().'application.xml';
$bundle_tgz = '';
+
switch($_REQUEST['action']){
case 'bundle':
require_once 'ZZOSS_Package/Package.php';
$pkg_obj = new ZZOSS_Package;
***************
*** 40,95 ****
break;
case 'instant':
! System::mkdir(array('-p', $instant_dir));
!
! $instant_name = $application['name'].'-'.$application['release']['version'];
! $instant_tgz = $instant_name.'.tgz';
! $instant_link = $instant_dir.$instant_tgz;
!
! // Grab all installer files from the various installer directories.
! /*
! echo '<pre>';
! print_r($dir_map);
! echo '</pre>';
! */
! $filter_dirs = array('CVS', 'bundles');
! // TODO: .bak
! $filter_files = '/[~#]$/i';
!
! // Create tar file list.
! require_once 'ZZOSS_File/Find.php';
! $zi_filefind = new ZZOSS_FileFind;
! $zi_filefind->setFilterDirs($filter_dirs);
! $zi_filefind->setFilterFiles($filter_files);
! $tar_list = $zi_filefind->listFiles('.');
! /*
! echo '<pre>';
! print_r($tar_list);
! echo '</pre>';
! */
! $tar = new Archive_Tar($instant_tgz);
! //$tar->setErrorHandling(PEAR_ERROR_PRINT);
! $tar->createModify($tar_list, $instant_name.'/installer/');
! // WORKAROUND: Did not manage to have Archive_Tar add
! // the bundle file from bundles/dev/, so we copy
! // it to bundle/ and take care that we do not
! // overwrite a production bundle with the same name.
! if(file_exists($bundle_dir_prod.$bundle_tgz)){
! copy($bundle_dir_prod.$bundle_tgz, $bundle_dir_prod.$bundle_tgz.'.bak');
! $undo_backup = true;
! }
! copy($bundle_dir_dev.$bundle_tgz, $bundle_dir_prod.$bundle_tgz);
! $tar->addModify('bundles'.DIRECTORY_SEPARATOR.$bundle_tgz, $instant_name.'/installer');
! if($undo_backup){
! copy($bundle_dir_prod.$bundle_tgz.'.bak', $bundle_dir_prod.$bundle_tgz);
! unlink($bundle_dir_prod.$bundle_tgz.'.bak');
! $backup = true;
! }
! unlink($bundle_dir_prod.$bundle_tgz);
! copy($instant_tgz, $instant_link);
! unlink($instant_tgz);
break;
}
--- 40,57 ----
break;
case 'instant':
! // compose instant installer src path
! require_once 'ZZOSS_File/File.php';
! $instant_dir = ZZOSS_File::fixPath($zi_setup->getInstallerDataDir().DIRECTORY_SEPARATOR.'instant'.DIRECTORY_SEPARATOR);
! require_once 'ZZOSS_Package/Package.php';
! $pkg_obj = new ZZOSS_Package;
! $bundle_tgz = $pkg_obj->mkBundle($bundle_dir, $distri_xml, $app_xml);
! $bundles = array($bundle_tgz);
! require_once 'ZZOSS_Package/Instant.php';
! $pkg_obj = new ZZOSS_PackageInstant;
! $bundle_tgz = $pkg_obj->create($_REQUEST['application'], $instant_dir, $bundles);
break;
}
Index: applications.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** applications.php 1 Apr 2004 18:33:41 -0000 1.18
--- applications.php 3 Apr 2004 16:15:48 -0000 1.19
***************
*** 163,166 ****
--- 163,168 ----
}
} elseif (
+ $GLOBALS['ZI']['mode'] != 'setup' &&
+ $GLOBALS['ZI']['installer_dev'] == false &&
(isset($_REQUEST['mode']) && $_REQUEST['mode'] != 'dev') &&
$GLOBALS['ZI']['installer_distribution'] == $distribution['name'].'-'.$distribution['release']['version'] &&
***************
*** 265,270 ****
<a title="Installation Log" href="log.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $application["id"]; ?>&application=<?php echo $application["name"].'-'.$application["release"]['version']; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>" onclick="javascript:window.open('log.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $application["id"]; ?>&application=<?php echo $application["name"].'-'.$application["release"]['version']; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>', 'LogFile', '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="Log File"><img src="th
emes/share/icons/org.kde.icons.crystalsvg/16x16/log.png" border="0" alt="Installation Log" align="absmiddle"></a><?php
}
! ?> <a href="<?php echo $_SERVER['PHP_SELF'].$querystr; ?>&action=remove" title="Remove">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/trashcan_empty.png" border="0" alt="Remove" align="absmiddle"></a>
</div>
</td>
--- 267,276 ----
<a title="Installation Log" href="log.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $application["id"]; ?>&application=<?php echo $application["name"].'-'.$application["release"]['version']; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>" onclick="javascript:window.open('log.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&id=<?php echo $application["id"]; ?>&application=<?php echo $application["name"].'-'.$application["release"]['version']; ?>&distribution=<?php echo rawurlencode($distribution['name'].'-'.$distribution['release']['version']); ?>', 'LogFile', '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="Log File"><img src="th
emes/share/icons/org.kde.icons.crystalsvg/16x16/log.png" border="0" alt="Installation Log" align="absmiddle"></a><?php
}
! if($GLOBALS['ZI']['mode'] != 'setup'){
! ?> <a href="<?php echo $_SERVER['PHP_SELF'].$querystr; ?>&action=remove" title="Remove">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/trashcan_empty.png" border="0" alt="Remove" align="absmiddle"></a>
! <?php
! }
! ?>
</div>
</td>
Index: dev_bundle.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_bundle.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dev_bundle.php 1 Apr 2004 18:59:05 -0000 1.6
--- dev_bundle.php 3 Apr 2004 16:15:48 -0000 1.7
***************
*** 34,41 ****
'plugins_register' => 'hide',
'packages_register' => 'hide',
! '_dest' => 'dev_bundle_process.php'.zi_form_querystr().'&action=bundle'
);
$zi_registry->setProcedures($procedures);
! $action_redirect = 'packages_reset.php'.zi_form_querystr().'&type=plugin';
break;
case 'instant':
--- 34,41 ----
'plugins_register' => 'hide',
'packages_register' => 'hide',
! '_dest' => 'dev_bundle_process.php'.zi_form_querystr().'&action=bundle'
);
$zi_registry->setProcedures($procedures);
! $action_redirect = 'application_settings.php'.zi_form_querystr();
break;
case 'instant':
***************
*** 43,50 ****
'plugins_register' => 'hide',
'packages_register' => 'hide',
! '_dest' => 'dev_bundle_process.php'.zi_form_querystr().'&action=instant'
);
$zi_registry->setProcedures($procedures);
! $action_redirect = 'packages_reset.php'.zi_form_querystr().'&type=plugin';
break;
}
--- 43,50 ----
'plugins_register' => 'hide',
'packages_register' => 'hide',
! '_dest' => 'dev_bundle_process.php'.zi_form_querystr().'&action=instant'
);
$zi_registry->setProcedures($procedures);
! $action_redirect = 'application_settings.php'.zi_form_querystr();
break;
}
***************
*** 64,68 ****
?>
<h1>Application Bundle</h1>
! <h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&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
--- 64,68 ----
?>
<h1>Application Bundle</h1>
! <h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>&application=<?php echo $_REQUEST['application']; ?>', 'ApplicationInformation', 'width=500,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="<?php echo $application["summary"].' '.$application['release']['version']; ?>"><?php echo $application["summary"].' '.$application['release']['version']; ?></a></h2>
<?php
***************
*** 77,81 ****
</p>
<p>
! [<a href="<?php echo $_SERVER['PHP_SELF'].zi_form_querystr().'&action=instant'; ?>">Instant Bundle</a>]<br/>
An instant bundle contains the application as well as the installer.<br/>
--- 77,82 ----
</p>
<p>
! [<a href="<?php echo $_SERVER['PHP_SELF'].zi_form_querystr().'&action=instant'; ?>">Instant Bundle</a>]
! [<a href="dev_bundle_instant.php?mode=instant&distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&action=start&distribution_bundle=<?php echo $_REQUEST['distribution']; ?>&application_bundle=<?php echo $_REQUEST['application']; ?>" title="Configure Instant Installer">Configure Instant Installer</a>]<br/>
An instant bundle contains the application as well as the installer.<br/>
Index: setup.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** setup.php 19 Mar 2004 12:18:16 -0000 1.9
--- setup.php 3 Apr 2004 16:15:48 -0000 1.10
***************
*** 24,27 ****
--- 24,43 ----
*/
+ // check if data directory has been provided
+ require_once 'inc/config_params.php';
+
+ if(!isset($GLOBALS['ZI']['data']) || !strlen($GLOBALS['ZI']['data'])){
+ echo "<p>You need to set the absolute path to the directory where the installer stores all its data.</p>";
+ echo "<p>Do this in <code>\$GLOBALS['ZI']['data']</code> of the file '<code>".getcwd().DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config_params.php</code>'.";
+ echo "<p>For example:</p>";
+ echo "<pre>\$GLOBALS['ZI']['data'] = '".dirname($_SERVER['DOCUMENT_ROOT']).DIRECTORY_SEPARATOR."zic_data".DIRECTORY_SEPARATOR."';</pre>";
+ exit;
+ } elseif(!is_writeable($GLOBALS['ZI']['data'].DIRECTORY_SEPARATOR.'.')){
+ echo "<p>Please make the data directory '<code>".$GLOBALS['ZI']['data']."</code>' writeable.";
+ echo "<p>Or change the path in <code>\$GLOBALS['ZI']['data']</code> of the file <code>".getcwd().DIRECTORY_SEPARATOR."inc".DIRECTORY_SEPARATOR."config_params.php</code>.";
+ exit;
+ }
+
+ // initialize framework
require_once 'inc/init.php';
***************
*** 32,37 ****
// within itself and can be updated.
$installs = ZZOSS_InstallerUtils::unserializeFromFile($zi_setup->getDataDir().'.installed_by.reg');
! $installed_by = $installs[getcwd().DIRECTORY_SEPARATOR];
! if(strlen($installed_by)){
// Modify the .init file.
$inits = ZZOSS_InstallerUtils::unserializeFromFile($zi_setup->getInitFile());
--- 48,54 ----
// within itself and can be updated.
$installs = ZZOSS_InstallerUtils::unserializeFromFile($zi_setup->getDataDir().'.installed_by.reg');
! if(isset($installs[getcwd().DIRECTORY_SEPARATOR])){
! $installed_by = $installs[getcwd().DIRECTORY_SEPARATOR];
!
// Modify the .init file.
$inits = ZZOSS_InstallerUtils::unserializeFromFile($zi_setup->getInitFile());
***************
*** 59,95 ****
if(!isset($msg)){
! // Extract the bundled installer.
! require_once 'ZZOSS_Package/Package.php';
! ZZOSS_Package::extractBundles('bundles'.DIRECTORY_SEPARATOR, $zi_setup->getInstallerDataDir());
! }
! /*
! function zi_process()
! {
! global $zi_setup;
! // Check if this is a fresh setup installation
! // of the installer. If so, then we take over the
! // data of the installer which installed us.
! // This way, the installed installer is registered
! // within itself and can be updated.
! include_once 'ZZOSS_Installer/Utils.php';
! $installs = ZZOSS_InstallerUtils::unserializeFromFile($zi_setup->getDataDir().'.installed_by.reg');
! $installed_by = $installs[getcwd().DIRECTORY_SEPARATOR];
! if(strlen($installed_by)){
! header('Location: setup_datadir.php');
! exit;
}
! if($zi_setup->hasRoot()){
! $zi_setup->init();
! $zi_setup->initData();
! // Extract the bundled installer.
! require_once 'ZZOSS_Package/Package.php';
! ZZOSS_Package::extractBundles('bundles'.DIRECTORY_SEPARATOR, $zi_setup->getInstallerDataDir());
! header('Location: index.php');
! exit;
! }
}
! */
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
--- 76,96 ----
if(!isset($msg)){
! require_once 'ZZOSS_File/File.php';
! // copy the installer files for the instant bundle to data directory
! $instant_dir = ZZOSS_File::fixPath($zi_setup->getInstallerDataDir().DIRECTORY_SEPARATOR.'instant'.DIRECTORY_SEPARATOR);
! //System::mkdir(array('-p', $instant_dir));
! require_once 'ZZOSS_Dir/Dir.php';
! ZZOSS_Dir::copy(getcwd(), $instant_dir);
! if(is_dir($instant_dir.'bundles'.DIRECTORY_SEPARATOR)){
! // remove the bundles directory from the instant sources
! System::rm(array('-rf', $instant_dir.'bundles'.DIRECTORY_SEPARATOR));
}
! // Extract the bundled installer.
! require_once 'ZZOSS_Package/Package.php';
! ZZOSS_Package::extractBundles(getcwd().DIRECTORY_SEPARATOR.'bundles'.DIRECTORY_SEPARATOR, $zi_setup->getInstallerDataDir());
}
!
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
Index: dev_bundle_instant.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_bundle_instant.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dev_bundle_instant.php 18 Mar 2004 09:41:39 -0000 1.7
--- dev_bundle_instant.php 3 Apr 2004 16:15:48 -0000 1.8
***************
*** 27,202 ****
require_once 'inc/init.php';
! function zi_process()
! {
! global $zi_registry;
!
! $distribution = $zi_registry->getDistribution();
! $application = $zi_registry->getApplication();
! $bundle_dir_prod = 'bundles'.DIRECTORY_SEPARATOR;
! $bundle_dir_dev = $bundle_dir_prod.'dev'.DIRECTORY_SEPARATOR;
! $bundle_tgz = $distribution['name'].'.'.$application['name'].'.bundle-'.$application['release']['version'].'.tgz';
! $bundle_link = $bundle_dir_dev.$bundle_tgz;
! $instant_dir = $bundle_dir_dev.'instant'.DIRECTORY_SEPARATOR.$distribution['name'].'-'.$distribution['release']['version'].DIRECTORY_SEPARATOR;
! $instant_name = $application['name'].'-'.$application['release']['version'];
! $instant_tgz = $_REQUEST['ZI_VALUES']['instant_name'].'.tgz';
! $instant_link = $instant_dir.$instant_tgz;
!
! // clean previous instant bundles
! if(is_dir($instant_dir)){
! System::rm(array('-rf', $instant_dir));
! }
! System::mkdir(array('-p', $instant_dir));
!
! // parse the config file
!
! $config_file = 'inc/config_params.php-dist';
!
! // backup current run-time config file
! @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
! // compose replace array
! $values = $_REQUEST['ZI_VALUES'];
! $query_str = '';
! if(is_array($values) && count($values)){
! foreach($values as $key => $val){
! if(is_string($val)) {
! $replace_values['{'.$key.'}'] = "'".htmlspecialchars($val)."'";
! $query_str .= '&ZI_VALUES['.$key.']='.$val;
! }
! }
! }
!
! $replace->file($config_file);
! $replace->replace($replace_values);
! $replace->writeout('inc'.DIRECTORY_SEPARATOR.'config_params.php');
!
! // Grab all installer files from the various installer directories.
! /*
! echo '<pre>';
! print_r($dir_map);
! echo '</pre>';
! */
! $filter_dirs = array('CVS', 'bundles');
! // TODO: .bak
! $filter_files = '/[~#]$/i';
!
! // Create tar file list.
! require_once 'ZZOSS_File/Find.php';
! $zi_filefind = new ZZOSS_FileFind;
! $zi_filefind->setFilterDirs($filter_dirs);
! $zi_filefind->setFilterFiles($filter_files);
! $tar_list = $zi_filefind->listFiles('.');
/*
! echo '<pre>';
! print_r($tar_list);
! echo '</pre>';
! */
! $tar = new Archive_Tar($instant_tgz);
! //$tar->setErrorHandling(PEAR_ERROR_PRINT);
! $tar->createModify($tar_list, $_REQUEST['ZI_VALUES']['instant_name'].'/installer/');
! // WORKAROUND: Did not manage to have Archive_Tar add
! // the bundle file from bundles/dev/, so we copy
! // it to bundle/ and take care that we do not
! // overwrite a production bundle with the same name.
! if(file_exists($bundle_dir_prod.$bundle_tgz)){
! copy($bundle_dir_prod.$bundle_tgz, $bundle_dir_prod.$bundle_tgz.'~');
! $undo_backup = true;
! }
!
! copy($bundle_dir_dev.$bundle_tgz, $bundle_dir_prod.$bundle_tgz);
!
! $tar->addModify('bundles'.DIRECTORY_SEPARATOR.$bundle_tgz, $_REQUEST['ZI_VALUES']['instant_name'].'/installer');
!
! if(isset($undo_backup) && $undo_backup){
! if(!is_dir($bundle_dir_prod)){
! System::mkdir(array('-p', $bundle_dir_prod));
}
- copy($bundle_dir_prod.$bundle_tgz.'~', $bundle_dir_prod.$bundle_tgz);
- unlink($bundle_dir_prod.$bundle_tgz.'~');
- $backup = true;
}
! unlink($bundle_dir_prod.$bundle_tgz);
! copy($instant_tgz, $instant_link);
! unlink($instant_tgz);
! // restore backuped run-time config file
! //unlink('inc'.DIRECTORY_SEPARATOR.'config_params.php');
! copy('inc'.DIRECTORY_SEPARATOR.'config_params.php~', 'inc'.DIRECTORY_SEPARATOR.'config_params.php');
! $_REQUEST['ZI_LOCATION_NEXT'] .= $query_str;
! }
!
! /***************************************************************************
! * PAGE CONTENT *
! ***************************************************************************/
!
! $application = $zi_registry->getApplication();
! $distribution = $zi_registry->getDistribution();
!
! include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
! ?>
! <h1>Instant Bundle</h1>
! <h2><a href="info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&distribution=<?php echo $_REQUEST['distribution']; ?>" onclick="javascript:window.open('info.php?mode=<?php echo $_REQUEST['mode']; ?>&type=application&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
! if(isset($_REQUEST['process']) && $_REQUEST['process'] == '1'){
! $bundle_dir_prod = 'bundles'.DIRECTORY_SEPARATOR;
! $bundle_dir_dev = $bundle_dir_prod.'dev'.DIRECTORY_SEPARATOR;
! $instant_dir = $bundle_dir_dev.'instant'.DIRECTORY_SEPARATOR.$distribution['name'].'-'.$distribution['release']['version'].DIRECTORY_SEPARATOR;
! $instant_name =$application['name'].'-'.$application['release']['version'];
! $instant_tgz = $_REQUEST['ZI_VALUES']['instant_name'].'.tgz';
! $instant_link = $instant_dir.$instant_tgz;
! echo '<p><span class="label">Download Instant Bundle: </span>';
! echo '<a href="'.$instant_link.'">'.$instant_tgz.'</a></p>';
! } else {
! $application = $zi_registry->getApplication();
! $_REQUEST['ZI_VALUES']['zi_application'] = $application['name'].'-'.$application['release']['version'];
! $distribution = $zi_registry->getDistribution();
! $_REQUEST['ZI_VALUES']['zi_distribution'] = $distribution['name'].'-'.$distribution['release']['version'];
! $_REQUEST['ZI_VALUES']['instant_name'] = $application['name'].'-'.$application['release']['version'];
! }
!
! // installer widget class
! require_once 'ZZOSS_Installer/Widget.php';
! $zi_widget = new ZZOSS_InstallerWidget;
! if(isset($zi_errors)){
! $zi_widget->setErrors($zi_errors);
}
- ?>
- <table class="form">
- <tr>
- <th colspan="3">Settings of instant bundle.</th>
- </tr>
- <?php
- echo $zi_widget->add('path', 'File name', 'instant_name', array('validation' => 'not empty', 'info' => 'The file name of the compressed archive. ".tgz" is automatically appended to the name.', 'append' => '.tgz'));
- ?>
- </table>
- <?php
-
- require_once 'ZZOSS_Installer/ConfigInput.php';
- $input = new ZZOSS_InstallerConfigInput;
- $input->setMode('event');
-
- //$zi_widget->setHelpPath($component_params['path'].'help/');
- //echo 'exists';
- ?>
- <table class="form">
- <tr>
- <th colspan="3">Settings of included installer.</th>
- </tr>
- <?php
- $input->parseString(file_get_contents('inc/config_input.xml'));
- ?>
- </table>
- <?php
-
- $zi_buttons['back'] = 'dev_bundle.php'.zi_form_querystr();
- $zi_buttons['next'] = $_SERVER['PHP_SELF'].zi_form_querystr().'&process=1';
- include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
?>
\ No newline at end of file
--- 27,86 ----
require_once 'inc/init.php';
! if($_REQUEST['action'] == 'start'){
! // remember the app we want to bundle
! $app_settings = $zi_registry->getApplicationSettings($_REQUEST['application_bundle'], $_REQUEST['distribution_bundle']);
! $_SESSION['distribution'] = $_REQUEST['distribution_bundle'];
! $_SESSION['application'] = $_REQUEST['application_bundle'];
! $_SESSION['application_root'] = $app_settings['application_root'];
+ require_once 'ZZOSS_File/File.php';
+ $instant_dir = ZZOSS_File::fixPath($zi_setup->getInstallerDataDir().DIRECTORY_SEPARATOR.'instant'.DIRECTORY_SEPARATOR);
/*
! // check if instant sources are there or copy them anyway
! // if we develop the installer itself
! if($GLOBALS['ZI']['installer_dev']){
! if(is_dir($instant_dir)){
! System::rm(array('-rf', $instant_dir));
! }
! // copy the installer files for the instant bundle to data directory
! require_once 'ZZOSS_Dir/Dir.php';
! ZZOSS_Dir::copy(getcwd(), $instant_dir);
!
! if(is_dir($instant_dir.'bundles'.DIRECTORY_SEPARATOR)){
! // remove the bundles directory from the instant sources
! System::rm(array('-rf', $instant_dir.'bundles'.DIRECTORY_SEPARATOR));
}
}
+ */
+ // change the application root to the instant sources in data directory
+ $app_settings['application_root'] = $instant_dir;
+ $zi_registry->updateApplicationSettings($app_settings, $_REQUEST['application'], $_REQUEST['distribution']);
+ $procedures = array(
+ 'plugins_deps' => 'installed',
+ 'packages_deps' => 'installed',
+ 'packages_build'=> 'on',
+ '_dest' => 'dev_bundle_instant.php'.zi_form_querystr().'&action=end'
+ );
+ $zi_registry->setProcedures($procedures, '', $_REQUEST['application'], $_REQUEST['distribution']);
+ $redirect = 'application_settings.php'.zi_form_querystr();
+ //$redirect = 'plugins_process.php'.zi_form_querystr().'&type=package&step=0';
+ header('Location: '.$redirect);
+ exit;
+ }
+ if($_REQUEST['action'] == 'end'){
+ // reset app root
+ $app_settings['application_root'] = $_SESSION['application_root'];
+ $zi_registry->updateApplicationSettings($app_settings);
! $_REQUEST['distribution'] = $_SESSION['distribution'];
! $_REQUEST['application'] = $_SESSION['application'];
! $_REQUEST['mode'] = 'dev';
! unset($_SESSION['distribution']);
! unset($_SESSION['application']);
! unset($_SESSION['application_root']);
! header('Location: dev_bundle.php'.zi_form_querystr());
! exit;
}
?>
\ No newline at end of file
Index: application_delete.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_delete.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** application_delete.php 22 Mar 2004 08:25:26 -0000 1.7
--- application_delete.php 3 Apr 2004 16:15:48 -0000 1.8
***************
*** 75,79 ****
<?php
// load selected package
! $application = $zi_registry->getApplicationById($_REQUEST["id"]);
// make those items a numeric array where more than one element with the same name occurs
// on the same level
--- 75,79 ----
<?php
// load selected package
! $application = $zi_registry->getApplication();
// make those items a numeric array where more than one element with the same name occurs
// on the same level
Index: dev_import_xml.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_import_xml.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dev_import_xml.php 5 Mar 2004 14:25:25 -0000 1.2
--- dev_import_xml.php 3 Apr 2004 16:15:48 -0000 1.3
***************
*** 35,39 ****
<p>Add an application by importing its distribution.xml, and application.xml.</p>
<?php
! $zi_buttons['back'] = 'applications.php?mode=dev';
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
--- 35,39 ----
<p>Add an application by importing its distribution.xml, and application.xml.</p>
<?php
! //$zi_buttons['back'] = 'applications.php?mode=dev';
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
Index: dev_application_import.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_application_import.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dev_application_import.php 5 Mar 2004 14:25:25 -0000 1.5
--- dev_application_import.php 3 Apr 2004 16:15:48 -0000 1.6
***************
*** 135,139 ****
</table>
<?php
! $zi_buttons['back'] = 'applications.php?mode=dev';
$zi_buttons['next'] = 'applications.php?mode=dev';
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
--- 135,139 ----
</table>
<?php
! //$zi_buttons['back'] = 'applications.php?mode=dev';
$zi_buttons['next'] = 'applications.php?mode=dev';
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
Index: packages_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_process.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** packages_process.php 18 Mar 2004 11:10:25 -0000 1.8
--- packages_process.php 3 Apr 2004 16:15:48 -0000 1.9
***************
*** 46,50 ****
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' && !$zi_registry->isProcedure($pkg_type.'s_fileroles')){
header('Location: plugins_process.php'.zi_form_querystr().'&step='.$step);
exit;
--- 46,50 ----
// 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_fileroles')){
header('Location: plugins_process.php'.zi_form_querystr().'&step='.$step);
exit;
Index: packages.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** packages.php 18 Mar 2004 09:41:39 -0000 1.10
--- packages.php 3 Apr 2004 16:15:48 -0000 1.11
***************
*** 33,37 ****
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' && !$zi_registry->isProcedure($pkg_type.'s_manager')){
header('Location: packages_confirm.php'.zi_form_querystr());
exit;
--- 33,37 ----
// 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_manager')){
header('Location: packages_confirm.php'.zi_form_querystr());
exit;
***************
*** 107,111 ****
$pkg_type = $_REQUEST['type'];
}
!
?>
<h1>Application <?php echo ucfirst($pkg_type); ?>s</h1>
--- 107,116 ----
$pkg_type = $_REQUEST['type'];
}
! $zi_registry->setPackageType($pkg_type);
!
! // TODO: this is a hack, because in prod mode, plugins_packages.reg is not updated properly
! if($pkg_type == 'plugin'){
! $zi_registry->unsetPackages();
! }
?>
<h1>Application <?php echo ucfirst($pkg_type); ?>s</h1>
***************
*** 115,119 ****
<h2><?php echo ucfirst($pkg_type); ?>s</h2>
<p>[<a href="package_add.php<?php echo zi_form_querystr(); ?>">Add <?php echo ucfirst($pkg_type); ?></a>]<?php
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
?>
[<a href="packages_reset.php<?php echo zi_form_querystr(); ?>&widget_type=popup" onclick="javascript:if(confirm('This will undo all previous installation work. Are you sure you want to continue?')){window.open('packages_reset.php<?php echo zi_form_querystr(); ?>&widget_type=popup', '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']; ?>">Reset <?php echo ucfirst($pkg_type); ?>s</a>]
--- 120,124 ----
<h2><?php echo ucfirst($pkg_type); ?>s</h2>
<p>[<a href="package_add.php<?php echo zi_form_querystr(); ?>">Add <?php echo ucfirst($pkg_type); ?></a>]<?php
! if($GLOBALS['ZI']['installer_dev'] || (isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev')){
?>
[<a href="packages_reset.php<?php echo zi_form_querystr(); ?>&widget_type=popup" onclick="javascript:if(confirm('This will undo all previous installation work. Are you sure you want to continue?')){window.open('packages_reset.php<?php echo zi_form_querystr(); ?>&widget_type=popup', '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']; ?>">Reset <?php echo ucfirst($pkg_type); ?>s</a>]
Index: application_install.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_install.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** application_install.php 22 Mar 2004 08:36:51 -0000 1.3
--- application_install.php 3 Apr 2004 16:15:48 -0000 1.4
***************
*** 40,53 ****
$redirect = 'applications.php';
} else {
$redirect = 'application_settings.php';
}
} else {
if(!$is_installed){
! $redirect = 'application_settings.php';
! }
! }
!
! if(isset($redirect)){
! $procedures = array(
'settings' => 'on',
'profile' => 'on',
--- 40,66 ----
$redirect = 'applications.php';
} else {
+ // installing new application in prod mode
+ $procedures = array(
+ 'settings' => 'on',
+ 'profile' => 'on',
+ 'plugins_manager' => 'on',
+ 'plugins_confirm' => 'on',
+ 'plugins_register' => 'hide',
+ 'plugins_deps' => 'on',
+ 'plugins_fileroles' => 'on',
+ 'plugins_build' => 'on',
+ 'packages_manager' => 'on',
+ 'packages_confirm' => 'on',
+ 'packages_register' => 'hide',
+ 'packages_deps' => 'on',
+ 'packages_fileroles' => 'on',
+ 'packages_build' => 'on'
+ );
+ $zi_registry->setProcedures($procedures);
$redirect = 'application_settings.php';
}
} else {
if(!$is_installed){
! $procedures = array(
'settings' => 'on',
'profile' => 'on',
***************
*** 65,69 ****
'packages_build' => 'on'
);
! $zi_registry->setProcedures($procedures);
header('Location: '.$redirect.zi_form_querystr());
exit;
--- 78,87 ----
'packages_build' => 'on'
);
! $zi_registry->setProcedures($procedures);
! $redirect = 'application_settings.php';
! }
! }
!
! if(isset($redirect)){
header('Location: '.$redirect.zi_form_querystr());
exit;
Index: application_update.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_update.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** application_update.php 9 Mar 2004 06:06:15 -0000 1.5
--- application_update.php 3 Apr 2004 16:15:48 -0000 1.6
***************
*** 55,59 ****
return false;
}
! $application = $zi_registry->getApplicationById($_REQUEST['id']);
$_REQUEST['ZI_LOCATION_NEXT'] = 'application_update_confirm.php'.zi_form_querystr().
'&update_src='.$params['src'].'&update_old='.$old_app.'-'.$old_version.'&update_old_human='.rawurlencode($application["summary"].' '.$application['release']['version']).'&update_new='.$new_app.'-'.$new_version;
--- 55,59 ----
return false;
}
! $application = $zi_registry->getApplication();
$_REQUEST['ZI_LOCATION_NEXT'] = 'application_update_confirm.php'.zi_form_querystr().
'&update_src='.$params['src'].'&update_old='.$old_app.'-'.$old_version.'&update_old_human='.rawurlencode($application["summary"].' '.$application['release']['version']).'&update_new='.$new_app.'-'.$new_version;
Index: plugins_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/plugins_process.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** plugins_process.php 18 Mar 2004 11:10:25 -0000 1.7
--- plugins_process.php 3 Apr 2004 16:15:48 -0000 1.8
***************
*** 35,42 ****
$zi_registry->setPackageType($pkg_type);
$step = $_REQUEST["step"];
// check if this script is part of installation procedure
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev' && !$zi_registry->isProcedure($pkg_type.'s_build')){
// by default, no further installation steps are required
$has_step = false;
--- 35,44 ----
$zi_registry->setPackageType($pkg_type);
+ $zi_registry->registerPackages();
+
$step = $_REQUEST["step"];
// 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_build')){
// by default, no further installation steps are required
$has_step = false;
***************
*** 264,269 ****
// if nothing is there to configure post a message
if(!isset($_REQUEST['package']) && !strlen($plugin->getOutput())) {
! /*echo $plugin->getLog();
! die('here');*/
// maybe some plugin just want to exec ...
zi_process();
--- 266,274 ----
// if nothing is there to configure post a message
if(!isset($_REQUEST['package']) && !strlen($plugin->getOutput())) {
! /*
! echo $plugin->getLog();
! echo $zi_registry->getApplicationPath();
! die('here');
! */
// maybe some plugin just want to exec ...
zi_process();
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click