[zi-cvs] packages/com.zzoss.zic application_profile.php,1.8,1.9 application_profile_auto.php,1.1,1.2 application_settings.php,1.13,1.14 packages.php,1.12,1.13 packages_auto.php,1.2,1.3 packages_confirm.php,1.10,1.11 packages_process.php,1.9,1.10 packages_reset.php,1.8,1.9 plugins_process.php,1.9,1.10
Sandro Zic <[email protected]> Mon, 05 Apr 2004 06:49:45 +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-serv13023/com.zzoss.zic
Modified Files:
application_profile.php application_profile_auto.php
application_settings.php packages.php packages_auto.php
packages_confirm.php packages_process.php packages_reset.php
plugins_process.php
Log Message:
make full/minimum install work
Index: packages_confirm.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_confirm.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** packages_confirm.php 3 Apr 2004 16:49:33 -0000 1.10
--- packages_confirm.php 5 Apr 2004 06:49:42 -0000 1.11
***************
*** 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;
--- 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;
Index: application_settings.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_settings.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** application_settings.php 3 Apr 2004 16:15:48 -0000 1.13
--- application_settings.php 5 Apr 2004 06:49:42 -0000 1.14
***************
*** 28,32 ****
// 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;
--- 28,32 ----
// 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;
Index: packages_reset.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_reset.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** packages_reset.php 3 Apr 2004 16:15:48 -0000 1.8
--- packages_reset.php 5 Apr 2004 06:49:42 -0000 1.9
***************
*** 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;
--- 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;
***************
*** 165,168 ****
--- 165,170 ----
<div class="warning">No package sources defined.</div>
<?php
+ // need to register packages here, otherwise full/minimum install would not work!
+ $zi_registry->registerPackages();
} else {
$log = $pkg_obj->getLog();
Index: application_profile.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_profile.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** application_profile.php 3 Apr 2004 16:15:48 -0000 1.8
--- application_profile.php 5 Apr 2004 06:49:42 -0000 1.9
***************
*** 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');
--- 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,56 ****
$zi_registry->updateApplicationSettings($_REQUEST['ZI_VALUES']);
- // redirect to proper page
$_REQUEST['profile'] = $_REQUEST['ZI_VALUES']['application_profile'];
! $_REQUEST['type'] = 'plugin';
! if($_REQUEST["mode"] == 'dev') {
$_REQUEST["ZI_LOCATION_NEXT"] = "packages_reset.php".zi_form_querystr();
! } else {
$_REQUEST["ZI_LOCATION_NEXT"] = 'packages.php'.zi_form_querystr();
! }
}
--- 45,113 ----
$zi_registry->updateApplicationSettings($_REQUEST['ZI_VALUES']);
$_REQUEST['profile'] = $_REQUEST['ZI_VALUES']['application_profile'];
!
! // compose actions if full or minimum installation
! if(isset($_REQUEST['profile']) && $_REQUEST["profile"] != 'custom') {
! // preselect plugins
! $zi_registry->setPackageType('plugin');
! $a = array();
! $zi_registry->registerPackages();
! $packages = $zi_registry->getPackages();
!
! if(is_array($packages) && count($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);
!
! // preselect packages
! $zi_registry->setPackageType('package');
! $a = array();
! $zi_registry->registerPackages();
! $packages = $zi_registry->getPackages();
!
! if(is_array($packages) && count($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);
!
! // change procedures, omit the plugins/packages managers
! // as well as the confirm pages
! $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);
! }
!
! //if($_REQUEST["mode"] == 'dev') {
! $_REQUEST['type'] = 'plugin';
$_REQUEST["ZI_LOCATION_NEXT"] = "packages_reset.php".zi_form_querystr();
! /*} else {
$_REQUEST["ZI_LOCATION_NEXT"] = 'packages.php'.zi_form_querystr();
! }*/
}
Index: packages_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_process.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** packages_process.php 3 Apr 2004 16:15:48 -0000 1.9
--- packages_process.php 5 Apr 2004 06:49:42 -0000 1.10
***************
*** 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;
--- 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_auto.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_auto.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** packages_auto.php 5 Mar 2004 14:25:25 -0000 1.2
--- packages_auto.php 5 Apr 2004 06:49:42 -0000 1.3
***************
*** 25,34 ****
// execute init file
! require_once 'inc/init.php';
/***************************************************************************
* STARTUP *
***************************************************************************/
!
$a = array();
--- 25,34 ----
// execute init file
! //require_once 'inc/init.php';
/***************************************************************************
* STARTUP *
***************************************************************************/
! /*
$a = array();
***************
*** 54,56 ****
--- 54,57 ----
header("Location: packages_confirm.php".zi_form_querystr());
+ */
?>
\ No newline at end of file
Index: packages.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** packages.php 3 Apr 2004 16:42:36 -0000 1.12
--- packages.php 5 Apr 2004 06:49:42 -0000 1.13
***************
*** 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;
--- 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;
***************
*** 39,48 ****
$zi_registry->setProcedure($pkg_type.'s_deps', 'on');
}
!
if(isset($_REQUEST['profile']) && $_REQUEST["profile"] != 'custom') {
header('Location: packages_auto.php'.zi_form_querystr());
exit;
}
!
/***************************************************************************
* INSTALLER FRAMEWORK FUNCTIONS *
--- 39,48 ----
$zi_registry->setProcedure($pkg_type.'s_deps', 'on');
}
! /*
if(isset($_REQUEST['profile']) && $_REQUEST["profile"] != 'custom') {
header('Location: packages_auto.php'.zi_form_querystr());
exit;
}
! */
/***************************************************************************
* INSTALLER FRAMEWORK FUNCTIONS *
Index: application_profile_auto.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/application_profile_auto.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** application_profile_auto.php 22 Dec 2003 17:19:58 -0000 1.1
--- application_profile_auto.php 5 Apr 2004 06:49:42 -0000 1.2
***************
*** 23,34 ****
@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();
--- 23,34 ----
@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();
***************
*** 47,49 ****
--- 47,50 ----
header("Location: packages_confirm.php".zi_form_querystr());
+ */
?>
\ No newline at end of file
Index: plugins_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/plugins_process.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** plugins_process.php 4 Apr 2004 08:44:32 -0000 1.9
--- plugins_process.php 5 Apr 2004 06:49:42 -0000 1.10
***************
*** 40,44 ****
// 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;
--- 40,44 ----
// 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;
-------------------------------------------------------
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