[zi-cvs] packages/com.zzoss.zic TODO,1.5,1.6 application_done.php,1.2,1.3 application_settings.php,1.2,1.3 applications.php,1.4,1.5 applications_download.php,1.2,1.3 authentication.php,1.1,1.2 dev_application_import.php,1.1,1.2 dev_index.php,1.1,1.2 dev_reset_data.php,1.1,1.2 distribution_download.php,1.2,1.3 info.php,1.1,1.2 package.xml,1.6,1.7 setup.php,1.3,1.4 setup_datadir.php,1.2,1.3
[email protected] Wed, 14 Jan 2004 07:41:30 -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-serv23220/com.zzoss.zic
Modified Files:
TODO application_done.php application_settings.php
applications.php applications_download.php authentication.php
dev_application_import.php dev_index.php dev_reset_data.php
distribution_download.php info.php package.xml setup.php
setup_datadir.php
Log Message:
- fixed bug in ZZOSS_InstallerRegistry::refreshApplications() which caused installer to always switch to first application during installation process, see http://sourceforge.net/tracker/index.php?func=detail&aid=867719&group_id=95735&atid=612476
- added ZZOSS_InstallerRegistry::getApplicationPathRel();
Index: TODO
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/TODO,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TODO 4 Jan 2004 17:11:34 -0000 1.5
--- TODO 14 Jan 2004 15:41:27 -0000 1.6
***************
*** 442,446 ****
- maybe better use general options method for all locks, should be faster
! - install path in setup wizard should be the root of extracted archive (../../)
- show release notes of app and all its packages after installation
--- 442,446 ----
- maybe better use general options method for all locks, should be faster
! # install path in setup wizard should be the root of extracted archive (../../)
- show release notes of app and all its packages after installation
***************
*** 473,476 ****
--- 473,478 ----
- if application root is not writeable error occures in application_settings.php, keep additional source paths
+ - update from 1.0.1 to 1.1.0 should move plugins.reg from zic-1.0.1/installer/ to /tmp/../installer/
+
### Low Priority ###
Index: application_done.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_done.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** application_done.php 1 Jan 2004 15:41:20 -0000 1.2
--- application_done.php 14 Jan 2004 15:41:27 -0000 1.3
***************
*** 27,30 ****
--- 27,38 ----
require_once 'inc/init.php';
+ function zi_process()
+ {
+ // Remove the Setup Wizard?
+ if($_REQUEST["ZI_VALUES"]['remove_setup'] == 'on'){
+ System::rm(array('-rf', getcwd()));
+ }
+ }
+
/***************************************************************************
* PAGE CONTENT *
***************
*** 67,78 ****
<?php
if($GLOBALS['ZI']['mode'] == 'setup'){
?>
! <h3>Remove Setup</h3>
! <p>You can now remove the setup wizard by deleting the directory</p>
! <pre><?php echo getcwd().DIRECTORY_SEPARATOR; ?></pre>
<?php
}
if($GLOBALS['ZI']['mode'] != 'setup'){
$zi_buttons['next'] = "applications.php".zi_form_querystr();
}
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
--- 75,91 ----
<?php
if($GLOBALS['ZI']['mode'] == 'setup'){
+ // installer widget class
+ require_once 'ZZOSS_Installer/Widget.php';
+ $zi_widget = new ZZOSS_InstallerWidget;
+ $zi_widget->setErrors($zi_errors);
+ echo $zi_widget->add('checkbox', 'Remove Setup Wizard', 'remove_setup');
?>
! <p>You can now remove this setup wizard.</p>
<?php
}
if($GLOBALS['ZI']['mode'] != 'setup'){
$zi_buttons['next'] = "applications.php".zi_form_querystr();
+ } else {
+ $zi_buttons['ok'] = $app_settings['application_url'];
}
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
Index: application_settings.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_settings.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** application_settings.php 4 Jan 2004 13:26:55 -0000 1.2
--- application_settings.php 14 Jan 2004 15:41:27 -0000 1.3
***************
*** 66,79 ****
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] != '/'){
--- 66,83 ----
function default_paths($dev_mode = false)
{
! if($GLOBALS['ZI']['mode'] != 'setup'){
! $application = $_REQUEST['application'];
!
! if($dev_mode){
! $application .= '-dev';
! }
! } else {
! $application = '';
}
// absolute root
$split[0] = substr(dirname($_SERVER['PATH_TRANSLATED']), 0, strrpos(dirname($_SERVER['PATH_TRANSLATED']), '/')).'/';
! $_REQUEST['ZI_VALUES']['application_root'] = ZZOSS_InstallerUtils::fixPath($split[0].$application.DIRECTORY_SEPARATOR);
$split[0] = substr(dirname($_SERVER['PHP_SELF']), 0, strrpos(dirname($_SERVER['PHP_SELF']), '/')).'/';
! $_REQUEST['ZI_VALUES']['application_url_rel'] = ZZOSS_InstallerUtils::fixPath($split[0].$application.'/');
// relative path from URL to root
if($_REQUEST['ZI_VALUES']['application_url_rel'][0] != '/'){
***************
*** 139,143 ****
<h1 align="center">Setup Wizard</h1>
<p>This wizard helps you with setting up the application. You are adviced to remove
! the setup wizard as displayed after successful installation.</p>
<?php
}
--- 143,147 ----
<h1 align="center">Setup Wizard</h1>
<p>This wizard helps you with setting up the application. You are adviced to remove
! the setup wizard after successful installation.</p>
<?php
}
Index: applications.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** applications.php 4 Jan 2004 17:11:34 -0000 1.4
--- applications.php 14 Jan 2004 15:41:27 -0000 1.5
***************
*** 98,103 ****
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
! ?>
! <h1>Manage Applications</h1>
<p><span class="label">Load Bundle: </span><input type="file" name="bundle"/><!--<br/>
Upload an application bundle to add it to the list of applications.--></p>
--- 98,108 ----
include 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
!
! if($_REQUEST['mode'] == 'dev') {
! ?><h1>Manage Applications</h1><?php
! } else {
! ?><h1>Develop Applications</h1><?php
! }
! ?>
<p><span class="label">Load Bundle: </span><input type="file" name="bundle"/><!--<br/>
Upload an application bundle to add it to the list of applications.--></p>
Index: applications_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/applications_download.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** applications_download.php 1 Jan 2004 15:41:20 -0000 1.2
--- applications_download.php 14 Jan 2004 15:41:27 -0000 1.3
***************
*** 39,45 ****
}
! $zi_registry->setDir($GLOBALS['ZI']['data_dir']);
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_distribution.xml';
$distribution_xml = new ZZOSS_Config();
$distribution_xml->setFile($file);
--- 39,45 ----
}
! $zi_registry->setDir($GLOBALS['ZI']['installer_data_dir']);
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distribution.xml';
$distribution_xml = new ZZOSS_Config();
$distribution_xml->setFile($file);
***************
*** 49,53 ****
// download application.xml
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_applications.xml';
$remote_applications_xml = new ZZOSS_Config(array('numeric' => array('application','descriptor')));
$remote_applications_xml->setFile($file);
--- 49,53 ----
// download application.xml
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_applications.xml';
$remote_applications_xml = new ZZOSS_Config(array('numeric' => array('application','descriptor')));
$remote_applications_xml->setFile($file);
***************
*** 57,61 ****
$remote_application = $remote_applications[$app_selected];
! //$distribution_dir = $GLOBALS['ZI']['data_dir'].'distributions/'.$distribution["name"].'-'.$distribution["release"]["version"].'/';
// create directories for distribution if not exists
/*
--- 57,61 ----
$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
/*
***************
*** 70,74 ****
// copy distribution.xml
! $file_src = $GLOBALS['ZI']['data_dir'].'installer/remote_distribution.xml';
$file_dest = $zi_registry->getDistributionPath().'distribution.xml';
if(file_exists($file_dest)) {
--- 70,74 ----
// copy distribution.xml
! $file_src = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distribution.xml';
$file_dest = $zi_registry->getDistributionPath().'distribution.xml';
if(file_exists($file_dest)) {
***************
*** 109,113 ****
// set rebuild applications flag
! $fp = fopen($GLOBALS['ZI']['data_dir']."installer/distributions.lock","w");
fputs($fp,'dummy');
fclose($fp);
--- 109,113 ----
// set rebuild applications flag
! $fp = fopen($GLOBALS['ZI']['installer_data_dir']."installer/distributions.lock","w");
fputs($fp,'dummy');
fclose($fp);
***************
*** 118,122 ****
fclose($fp);
! @unlink($GLOBALS['ZI']['data_dir']."installer/distributions.reg");
$_REQUEST["ZI_LOCATION_NEXT"] = 'applications.php';
--- 118,122 ----
fclose($fp);
! @unlink($GLOBALS['ZI']['installer_data_dir']."installer/distributions.reg");
$_REQUEST["ZI_LOCATION_NEXT"] = 'applications.php';
***************
*** 127,136 ****
***************************************************************************/
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_distribution.xml';
$distribution_xml = new ZZOSS_Config();
$distribution_xml->setFile($file);
$distribution = $distribution_xml->query('/distribution');
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_applications.xml';
ZZOSS_InstallerUtils::downloadFile(
$distribution["filelist"]["descriptor"]["#"],
--- 127,136 ----
***************************************************************************/
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distribution.xml';
$distribution_xml = new ZZOSS_Config();
$distribution_xml->setFile($file);
$distribution = $distribution_xml->query('/distribution');
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_applications.xml';
ZZOSS_InstallerUtils::downloadFile(
$distribution["filelist"]["descriptor"]["#"],
Index: authentication.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/authentication.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** authentication.php 22 Dec 2003 17:19:58 -0000 1.1
--- authentication.php 14 Jan 2004 15:41:27 -0000 1.2
***************
*** 58,62 ****
$crypted_password = crypt(trim($_REQUEST['ZI_VALUES']['password']),$salt);
// write the data to the password file
! $filename = $GLOBALS['ZI']['data_dir'].'.htpasswd';
$fp = fopen( $filename, "w");
fputs( $fp, $_REQUEST['ZI_VALUES']['username'].':'.$crypted_password);
--- 58,62 ----
$crypted_password = crypt(trim($_REQUEST['ZI_VALUES']['password']),$salt);
// write the data to the password file
! $filename = $GLOBALS['ZI']['installer_data_dir'].'.htpasswd';
$fp = fopen( $filename, "w");
fputs( $fp, $_REQUEST['ZI_VALUES']['username'].':'.$crypted_password);
***************
*** 69,73 ****
// check if the password file exists
! if(file_exists($GLOBALS['ZI']['data_dir'].'.htpasswd')){
// redirect to the start page of the installer
header('Location: index.php');
--- 69,73 ----
// check if the password file exists
! if(file_exists($GLOBALS['ZI']['installer_data_dir'].'.htpasswd')){
// redirect to the start page of the installer
header('Location: index.php');
Index: dev_application_import.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_application_import.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dev_application_import.php 22 Dec 2003 17:19:58 -0000 1.1
--- dev_application_import.php 14 Jan 2004 15:41:27 -0000 1.2
***************
*** 53,57 ****
global $zi_registry, $zi_errors;
! $zi_registry->setDir($GLOBALS['ZI']['data_dir_dev']);
require_once 'ZZOSS_Config/Config.php';
--- 53,57 ----
global $zi_registry, $zi_errors;
! $zi_registry->setDir($GLOBALS['ZI']['installer_data_dir_dev']);
require_once 'ZZOSS_Config/Config.php';
***************
*** 84,88 ****
fclose($fp);
! @unlink($GLOBALS['ZI']['data_dir_dev']."installer/distributions.reg");
$zi_registry->updateApplicationSettings(
--- 84,88 ----
fclose($fp);
! @unlink($GLOBALS['ZI']['installer_data_dir_dev']."installer/distributions.reg");
$zi_registry->updateApplicationSettings(
Index: dev_index.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dev_index.php 22 Dec 2003 17:19:58 -0000 1.1
--- dev_index.php 14 Jan 2004 15:41:27 -0000 1.2
***************
*** 68,72 ****
// remove login data
case 'reset_login':
! $msg .= dev_remove($GLOBALS['ZI']['data_dir'].'.htpasswd');
break;
// reset plugin cache
--- 68,72 ----
// remove login data
case 'reset_login':
! $msg .= dev_remove($GLOBALS['ZI']['installer_data_dir'].'.htpasswd');
break;
// reset plugin cache
***************
*** 105,114 ****
break;
// reset installer
! case 'reset_installer': $msg .= dev_remove($GLOBALS['ZI']['data_dir']);
/*
! $msg .= dev_remove($GLOBALS['ZI']['data_dir'].'distributions/');
! $msg .= dev_remove($GLOBALS['ZI']['data_dir'].'.htpasswd');
! System::mkdir(array('-p',$GLOBALS['ZI']['data_dir'].'installer'.DIRECTORY_SEPARATOR));
! System::mkdir(array('-p',$GLOBALS['ZI']['data_dir'].'distributions'.DIRECTORY_SEPARATOR));*/
break;
}
--- 105,114 ----
break;
// reset installer
! case 'reset_installer': $msg .= dev_remove($GLOBALS['ZI']['installer_data_dir']);
/*
! $msg .= dev_remove($GLOBALS['ZI']['installer_data_dir'].'distributions/');
! $msg .= dev_remove($GLOBALS['ZI']['installer_data_dir'].'.htpasswd');
! System::mkdir(array('-p',$GLOBALS['ZI']['installer_data_dir'].'installer'.DIRECTORY_SEPARATOR));
! System::mkdir(array('-p',$GLOBALS['ZI']['installer_data_dir'].'distributions'.DIRECTORY_SEPARATOR));*/
break;
}
Index: dev_reset_data.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/dev_reset_data.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dev_reset_data.php 4 Jan 2004 17:11:34 -0000 1.1
--- dev_reset_data.php 14 Jan 2004 15:41:27 -0000 1.2
***************
*** 28,64 ****
/***************************************************************************
- * DEVELOPER FUNCTIONS *
- ***************************************************************************/
-
- function dev_remove($file) {
- if(substr($file, 0, 3) == '../') {
- $str_file = substr($file, 3);
- } else {
- $str_file = $file;
- }
- if(is_dir($file)) {
- if(ZZOSS_InstallerUtils::rmdir($file)) {
- $msg = 'removed directory '.$str_file."\n";
- } else {
- $msg = 'error removing directory '.$str_file."\n";
- }
- } else
- if(file_exists($file)) {
- if(@unlink($file)) {
- $msg = 'removed file '.$str_file."\n";
- } else {
- $msg = 'error removing file '.$str_file."\n";
- }
- } else {
- if($str_file[strlen($str_file)]=='/') {
- $msg = 'directory '.$str_file.' does not exist'."\n";
- } else {
- $msg = 'file '.$str_file.' does not exist'."\n";
- }
- }
- return $msg;
- }
-
- /***************************************************************************
* PAGE CONTENT *
***************************************************************************/
--- 28,31 ----
***************
*** 68,76 ****
// remove login data
case 'reset_login':
! $msg .= dev_remove($GLOBALS['ZI']['data_dir'].'.htpasswd');
break;
// reset installer
case 'reset_installer':
! $msg .= 'removed '.$GLOBALS['ZI']['data_dir']."\n";
break;
}
--- 35,44 ----
// remove login data
case 'reset_login':
! $msg .= dev_remove($GLOBALS['ZI']['installer_data_dir'].'.htpasswd');
break;
// reset installer
case 'reset_installer':
! $zi_setup->rmDataDir();
! $msg .= 'removed '.$GLOBALS['ZI']['installer_data_dir']."\n";
break;
}
Index: distribution_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/distribution_download.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** distribution_download.php 1 Jan 2004 15:41:20 -0000 1.2
--- distribution_download.php 14 Jan 2004 15:41:27 -0000 1.3
***************
*** 33,42 ****
function zi_process() {
// download distribution.xml
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_distributions.xml';
$distributions_xml = new ZZOSS_Config(array('numeric' => array('distribution')));
$distributions_xml->setFile($file);
$distributions = $distributions_xml->query('/distributions/distribution');
$distribution = $distributions[$_REQUEST["ZI_VALUES"]["distribution"]];
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_distribution.xml';
if(file_exists($file)) {
unlink($file);
--- 33,42 ----
function zi_process() {
// download distribution.xml
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distributions.xml';
$distributions_xml = new ZZOSS_Config(array('numeric' => array('distribution')));
$distributions_xml->setFile($file);
$distributions = $distributions_xml->query('/distributions/distribution');
$distribution = $distributions[$_REQUEST["ZI_VALUES"]["distribution"]];
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distribution.xml';
if(file_exists($file)) {
unlink($file);
***************
*** 54,58 ****
***************************************************************************/
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_distributions.xml';
ZZOSS_InstallerUtils::downloadFile(
$GLOBALS['ZI']['distributions_url'],
--- 54,58 ----
***************************************************************************/
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distributions.xml';
ZZOSS_InstallerUtils::downloadFile(
$GLOBALS['ZI']['distributions_url'],
Index: info.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/info.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** info.php 22 Dec 2003 17:19:58 -0000 1.1
--- info.php 14 Jan 2004 15:41:27 -0000 1.2
***************
*** 37,46 ****
// load selected distribution
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_distributions.xml';
$distributions_xml = new ZZOSS_Config(array('numeric' => array('distribution')));
$distributions_xml->setFile($file);
$distributions = $distributions_xml->query('/distributions/distribution');
$distribution = $distributions[$_REQUEST["id"]];
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_distribution.xml';
if(file_exists($file)) {
unlink($file);
--- 37,46 ----
// load selected distribution
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distributions.xml';
$distributions_xml = new ZZOSS_Config(array('numeric' => array('distribution')));
$distributions_xml->setFile($file);
$distributions = $distributions_xml->query('/distributions/distribution');
$distribution = $distributions[$_REQUEST["id"]];
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_distribution.xml';
if(file_exists($file)) {
unlink($file);
***************
*** 69,74 ****
$header = 'Application';
// download application.xml
! $file = $GLOBALS['ZI']['data_dir'].'installer/remote_applications.xml';
! $file_application = $GLOBALS['ZI']['data_dir'].'installer/remote_application.xml';
if(file_exists($file_application)) {
unlink($file_application);
--- 69,74 ----
$header = 'Application';
// download application.xml
! $file = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_applications.xml';
! $file_application = $GLOBALS['ZI']['installer_data_dir'].'installer/remote_application.xml';
if(file_exists($file_application)) {
unlink($file_application);
Index: package.xml
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/package.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** package.xml 4 Jan 2004 17:11:34 -0000 1.6
--- package.xml 14 Jan 2004 15:41:27 -0000 1.7
***************
*** 19,23 ****
</maintainers>
<release>
! <version>1.0</version>
<date>{zi_release_date}</date>
<license url="http://www.gnu.org/licenses/lgpl.txt" version="2">LGPL</license>
--- 19,23 ----
</maintainers>
<release>
! <version>1.1.0</version>
<date>{zi_release_date}</date>
<license url="http://www.gnu.org/licenses/lgpl.txt" version="2">LGPL</license>
***************
*** 38,41 ****
--- 38,42 ----
- net.php.pear.logos
- logos are placed under $ZIC_DIR/themes/share/logos/[package-name]
+ - install path in setup wizard is the root of extracted archive
]]>
</notes>
***************
*** 90,99 ****
<file role="php" basinstalldir="" name="cancel.php"/>
<file role="php" basinstalldir="" name="help.php"/>
! <file role="php" basinstalldir="" name="inc/config_params.php-dist"/>
<file role="php" basinstalldir="" name="inc/form.php"/>
<file role="php" basinstalldir="" name="inc/config.php"/>
<file role="php" basinstalldir="" name="inc/config_input.xml"/>
<file role="php" basinstalldir="" name="inc/authentication.php"/>
! <file role="php" basinstalldir="" name="inc/config_params.php"/>
<file role="php" basinstalldir="" name="inc/info.php"/>
<file role="php" basinstalldir="" name="inc/init.php"/>
--- 91,100 ----
<file role="php" basinstalldir="" name="cancel.php"/>
<file role="php" basinstalldir="" name="help.php"/>
! <!--<file role="php" basinstalldir="" name="inc/config_params.php-dist"/>-->
<file role="php" basinstalldir="" name="inc/form.php"/>
<file role="php" basinstalldir="" name="inc/config.php"/>
<file role="php" basinstalldir="" name="inc/config_input.xml"/>
<file role="php" basinstalldir="" name="inc/authentication.php"/>
! <!--<file role="php" basinstalldir="" name="inc/config_params.php"/>-->
<file role="php" basinstalldir="" name="inc/info.php"/>
<file role="php" basinstalldir="" name="inc/init.php"/>
Index: setup.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.php 4 Jan 2004 13:26:55 -0000 1.3
--- setup.php 14 Jan 2004 15:41:27 -0000 1.4
***************
*** 36,40 ****
// within itself and can be updated.
include_once 'ZZOSS_Installer/Utils.php';
! $installs = ZZOSS_InstallerUtils::unserializeFromFile($zi_setup->getInitDir().'.installed_by.reg');
$installed_by = $installs[getcwd().DIRECTORY_SEPARATOR];
if(strlen($installed_by)){
--- 36,40 ----
// 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)){
***************
*** 48,52 ****
// Extract the bundled installer.
require_once 'ZZOSS_Package/Package.php';
! ZZOSS_Package::extractBundles('bundles'.DIRECTORY_SEPARATOR, $zi_setup->getDataDir());
header('Location: index.php');
exit;
--- 48,52 ----
// Extract the bundled installer.
require_once 'ZZOSS_Package/Package.php';
! ZZOSS_Package::extractBundles('bundles'.DIRECTORY_SEPARATOR, $zi_setup->getInstallerDataDir());
header('Location: index.php');
exit;
Index: setup_datadir.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup_datadir.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** setup_datadir.php 4 Jan 2004 13:26:55 -0000 1.2
--- setup_datadir.php 14 Jan 2004 15:41:27 -0000 1.3
***************
*** 38,42 ****
// within itself and can be updated.
include_once 'ZZOSS_Installer/Utils.php';
! $installs = ZZOSS_InstallerUtils::unserializeFromFile($zi_setup->getInitDir().'.installed_by.reg');
$installed_by = $installs[getcwd().DIRECTORY_SEPARATOR];
if(strlen($installed_by)){
--- 38,42 ----
// 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)){
***************
*** 46,52 ****
$inits[getcwd()] = $data_dir;
ZZOSS_InstallerUtils::serializeToFile($zi_setup->getInitFile(), $inits);
!
// Delete the .htpasswd so that we have a fresh login.
! unlink($data_dir.'.htpasswd');
header('Location: index.php');
--- 46,57 ----
$inits[getcwd()] = $data_dir;
ZZOSS_InstallerUtils::serializeToFile($zi_setup->getInitFile(), $inits);
! /*
! // grab all plugins from the setup installer and copy them
! // to our plugins directory
! require_once 'ZZOSS_Installer/Utils.php';
! ZZOSS_InstallerUtils::copy($installed_by.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR, 'plugins'.DIRECTORY_SEPARATOR);
! */
// Delete the .htpasswd so that we have a fresh login.
! @unlink($data_dir.'.htpasswd');
header('Location: index.php');
***************
*** 81,85 ****
// Extract the bundled installer.
require_once 'ZZOSS_Package/Package.php';
! ZZOSS_Package::extractBundles('bundles'.DIRECTORY_SEPARATOR, $zi_setup->getDataDir());
header('Location: index.php');
--- 86,90 ----
// Extract the bundled installer.
require_once 'ZZOSS_Package/Package.php';
! ZZOSS_Package::extractBundles('bundles'.DIRECTORY_SEPARATOR, $zi_setup->getInstallerDataDir());
header('Location: index.php');
***************
*** 94,98 ****
<?php
if(!strlen($_REQUEST['data_dir'])){
! $_REQUEST['data_dir'] = $zi_setup->getInitDir(false);
}
?>
--- 99,103 ----
<?php
if(!strlen($_REQUEST['data_dir'])){
! $_REQUEST['data_dir'] = $zi_setup->getDataDir(false);
}
?>
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html