[zi-cvs] packages/com.zzoss.zic application_delete.php,1.4,1.5 application_done.php,1.11,1.12 installer_remove.php,1.1,1.2 package.xml,1.8,1.9 packages_reset.php,1.4,1.5 setup.php,1.8,1.9
Sandro Zic <[email protected]> Fri, 19 Mar 2004 12:18:18 +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-serv12869/com.zzoss.zic
Modified Files:
application_delete.php application_done.php
installer_remove.php package.xml packages_reset.php setup.php
Log Message:
quick install
Index: setup.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/setup.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** setup.php 29 Jan 2004 14:09:16 -0000 1.8
--- setup.php 19 Mar 2004 12:18:16 -0000 1.9
***************
*** 26,29 ****
--- 26,67 ----
require_once 'inc/init.php';
+ // 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.
+ $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());
+ $data_dir = $inits[$installed_by];
+ $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.
+ if(file_exists($data_dir.'.htpasswd')){
+ unlink($data_dir.'.htpasswd');
+ }
+ /*
+ header('Location: index.php');
+ exit;*/
+ } elseif(!$zi_setup->init()){
+ $msg = $zi_setup->getError();
+ } elseif(!$zi_setup->initData()){
+ $msg = $zi_setup->getError();
+ }
+
+ 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()
{
***************
*** 53,57 ****
}
}
!
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
--- 91,95 ----
}
}
! */
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/header.php';
?>
***************
*** 61,64 ****
--- 99,108 ----
<p align="center"><a href="http://www.zzoss.com/projects/installer" target="_blank">http://www.zzoss.com/projects/installer</a></p>
<?php
+ if(!isset($msg)){
+ $msg = 'Installer has been initiated. Data directory is \''.$GLOBALS['ZI']['data'].'\'';
+ }
+ ?><div class="warning"><?php echo $msg; ?></div><?php
+
+ /*
// check if the installer directory is writeable.
$is_writeable = true;
***************
*** 71,75 ****
<?php
}
!
if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'){
?>
--- 115,119 ----
<?php
}
! */
if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'){
?>
***************
*** 113,117 ****
<?php
! $zi_buttons['next'] = 'setup_datadir.php';
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
--- 157,161 ----
<?php
! $zi_buttons['next'] = 'index.php';
require_once 'themes/'.$GLOBALS['ZI']['theme'].'/footer.php';
Index: packages_reset.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_reset.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** packages_reset.php 18 Mar 2004 11:10:25 -0000 1.4
--- packages_reset.php 19 Mar 2004 12:18:16 -0000 1.5
***************
*** 195,199 ****
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer'.$widget_type.'.php';
! if($buffer_output){
ob_end_clean();
header('Location: '.$zi_buttons['next']);
--- 195,199 ----
include 'themes/'.$GLOBALS['ZI']['theme'].'/footer'.$widget_type.'.php';
! if(!$is_popup && $buffer_output){
ob_end_clean();
header('Location: '.$zi_buttons['next']);
Index: application_delete.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_delete.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** application_delete.php 5 Mar 2004 14:25:24 -0000 1.4
--- application_delete.php 19 Mar 2004 12:18:15 -0000 1.5
***************
*** 84,88 ****
include 'inc/info.php';
$content = '';
!
$content .= zi_info_td('Description', zi_info_text($info["description"]) );
if(isset($_REQUEST['type']) && $_REQUEST['type'] != 'distribution'){
--- 84,93 ----
include 'inc/info.php';
$content = '';
! // Show the installation paths if it is an installed application
! if(isset($info['installed'])){
! $settings = $zi_registry->getApplicationSettings();
! $content .= zi_info_td('Install Root', $settings['application_root']);
! $content .= zi_info_td('Install URL', '<a href="'.$settings['application_url'].'" target="_blank">'.$settings['application_url'].'</a>');
! }
$content .= zi_info_td('Description', zi_info_text($info["description"]) );
if(isset($_REQUEST['type']) && $_REQUEST['type'] != 'distribution'){
Index: installer_remove.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/installer_remove.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** installer_remove.php 5 Mar 2004 14:25:25 -0000 1.1
--- installer_remove.php 19 Mar 2004 12:18:16 -0000 1.2
***************
*** 32,35 ****
--- 32,36 ----
if(isset($_REQUEST["action"])) {
+ $msg = '';
switch($_REQUEST["action"]) {
// reset installer
Index: package.xml
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/package.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** package.xml 18 Mar 2004 09:41:39 -0000 1.8
--- package.xml 19 Mar 2004 12:18:16 -0000 1.9
***************
*** 47,50 ****
--- 47,51 ----
<file role="php" baseinstalldir="" name="application_delete.php"/>
<file role="php" baseinstalldir="" name="application_done.php"/>
+ <file role="php" baseinstalldir="" name="application_install.php"/>
<file role="php" baseinstalldir="" name="application_profile.php"/>
<file role="php" baseinstalldir="" name="application_profile_auto.php"/>
***************
*** 66,69 ****
--- 67,71 ----
<file role="php" baseinstalldir="" name="dev_package.php"/>
<file role="php" baseinstalldir="" name="dev_package_xml.php"/>
+ <file role="php" baseinstalldir="" name="dev_plugin.php"/>
<file role="php" baseinstalldir="" name="dev_reset_data.php"/>
<file role="php" baseinstalldir="" name="distribution_download.php"/>
***************
*** 123,128 ****
<file role="php" baseinstalldir="" name="inc\config.php"/>
<file role="php" baseinstalldir="" name="inc\config_input.xml"/>
! <file role="php" baseinstalldir="" name="inc\config_params.php"/>
! <file role="php" baseinstalldir="" name="inc\config_params.php-dist"/>
<file role="php" baseinstalldir="" name="inc\form.php"/>
<file role="php" baseinstalldir="" name="inc\info.php"/>
--- 125,130 ----
<file role="php" baseinstalldir="" name="inc\config.php"/>
<file role="php" baseinstalldir="" name="inc\config_input.xml"/>
! <!--<file role="php" baseinstalldir="" name="inc\config_params.php"/>
! <file role="php" baseinstalldir="" name="inc\config_params.php-dist"/>-->
<file role="php" baseinstalldir="" name="inc\form.php"/>
<file role="php" baseinstalldir="" name="inc\info.php"/>
Index: application_done.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_done.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** application_done.php 18 Mar 2004 09:41:39 -0000 1.11
--- application_done.php 19 Mar 2004 12:18:16 -0000 1.12
***************
*** 42,45 ****
--- 42,46 ----
isset($_REQUEST['mode']) &&
$_REQUEST['mode'] == 'dev' &&
+ isset($application['installed']) &&
$application['installed'] == $application['release']['version']
){
-------------------------------------------------------
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