[zi-cvs] packages/com.zzoss.zic/inc authentication.php,1.2,1.3 form.php,1.2,1.3 info.php,1.2,1.3 init.php,1.5,1.6 registry.php,1.2,1.3
[email protected] Thu, 29 Jan 2004 06:09:19 -0800
| Newsgroups | gmane.comp.php.zzoss.installer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16467/com.zzoss.zic/inc
Modified Files:
authentication.php form.php info.php init.php registry.php
Log Message:
E_ALL support
Index: authentication.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/authentication.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** authentication.php 14 Jan 2004 15:41:27 -0000 1.2
--- authentication.php 29 Jan 2004 14:09:16 -0000 1.3
***************
*** 43,68 ****
$zi_auth->start();
}
- /*
- // if PEAR has not been included yet, we get the relevant files
- // from the installer's library
- if(!@include_once('Auth/HTTP.php')){
- $include_path = ini_get('include_path');
- if (substr(PHP_OS, 0, 3) == 'WIN') {
- $include_path_delimiter = ';';
- } else {
- $include_path_delimiter = ':';
- }
- ini_set('include_path', $include_path.$include_path_delimiter.'lib');
- }
- */
function cancelText()
{
- global $zi_registry;
-
// create a nice looking cancel text :)
ob_start();
-
- include 'themes/'.$GLOBALS['ZI']['theme'].'/header_error.php';
?>
<b>Error 401 - Access denied</b>
--- 43,51 ----
***************
*** 71,84 ****
Then create a new login by accessing the installer again.</p>
<?php
- include 'themes/'.$GLOBALS['ZI']['theme'].'/footer_error.php';
$cancel_text = ob_get_contents();
ob_end_clean();
return $cancel_text;
}
- /*
- // undo settings from above
- if(!class_exists('PEAR')){
- ini_set('include_path', $include_path);
- }
- */
?>
\ No newline at end of file
--- 54,60 ----
Index: form.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/form.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** form.php 4 Jan 2004 13:49:15 -0000 1.2
--- form.php 29 Jan 2004 14:09:16 -0000 1.3
***************
*** 48,52 ****
//echo 'VALIDATE';
// iterate values
! if(is_array($_REQUEST['ZI_VALIDATIONS']) && count($_REQUEST['ZI_VALIDATIONS'])){
$zi_errors = null;
foreach($_REQUEST['ZI_VALIDATIONS'] as $var_name => $validation_type){
--- 48,52 ----
//echo 'VALIDATE';
// iterate values
! if(isset($_REQUEST['ZI_VALIDATIONS']) && is_array($_REQUEST['ZI_VALIDATIONS']) && count($_REQUEST['ZI_VALIDATIONS'])){
$zi_errors = null;
foreach($_REQUEST['ZI_VALIDATIONS'] as $var_name => $validation_type){
***************
*** 89,93 ****
isset($_REQUEST['ZI_BUTTON_OK']) || isset($_REQUEST['ZI_BUTTON_OK_x'])
) &&
! !is_array($zi_errors)){
// process data
if(function_exists('zi_process')){
--- 89,93 ----
isset($_REQUEST['ZI_BUTTON_OK']) || isset($_REQUEST['ZI_BUTTON_OK_x'])
) &&
! !isset($zi_errors)){
// process data
if(function_exists('zi_process')){
***************
*** 116,128 ****
function zi_form_querystr()
{
! return
! '?id='.$_REQUEST['id'].
! '&mode='.$_REQUEST['mode'].
! '&dev='.$_REQUEST['dev'].
! '&profile='.$_REQUEST['profile'].
! '&application='.$_REQUEST['application'].
! '&distribution='.$_REQUEST['distribution'].
! '&update_old='.$_REQUEST['update_old'].
! '&type='.$_REQUEST['type'];
}
?>
\ No newline at end of file
--- 116,141 ----
function zi_form_querystr()
{
! $fields = array('id', 'distribution', 'application', 'mode', 'update_old', 'type', 'dev', 'profile');
! $querystr = '';
! foreach($fields as $field){
! if(isset($_REQUEST[$field])){
! $querystr .= $field.'='.rawurlencode($_REQUEST[$field]).'&';
! }
! }
!
! return '?'.$querystr;
! }
!
! function zi_form_hidden_fields($fields)
! {
! if(is_array($fields) && count($fields)){
! foreach($fields as $field){
! if(isset($_REQUEST[$field])){
! ?>
! <input type="hidden" name="<?php echo $field; ?>" value="<?php echo $_REQUEST[$field]; ?>">
! <?php
! }
! }
! }
}
?>
\ No newline at end of file
Index: info.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/info.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** info.php 21 Jan 2004 18:16:14 -0000 1.2
--- info.php 29 Jan 2004 14:09:16 -0000 1.3
***************
*** 58,61 ****
--- 58,63 ----
function zi_info_maintainers($maintainers)
{
+ $maintainers_str = '';
+
// compose maintainer_str
if(!is_array($maintainers) || !count($maintainers)) {
***************
*** 64,68 ****
foreach($maintainers as $maintainer_s) {
$maintainers_str .= $maintainer_s["name"];
! if(strlen($maintainer_s["role"])>0) {
$maintainers_str .= ' ('.$maintainer_s["role"].')';
}
--- 66,70 ----
foreach($maintainers as $maintainer_s) {
$maintainers_str .= $maintainer_s["name"];
! if(isset($maintainer_s["role"])>0) {
$maintainers_str .= ' ('.$maintainer_s["role"].')';
}
***************
*** 76,79 ****
--- 78,83 ----
function zi_info_copyrights($copyrights)
{
+ $copyright_str = '';
+
// compose copyright string
if(!is_array($copyrights) || !count($copyrights)) {
***************
*** 87,94 ****
if(is_array($copyright['@'])) {
// add URL and version?
! if(strlen($copyright['@']['url'])) {
$copyright_str_part = '<a href="'.$copyright['@']['url'].'" target="_blank">'.$copyright_str_part.'</a>';
}
! if(strlen($copyright['@']['year'])) {
$copyright_str_part = $copyright['@']['year'].' '.$copyright_str_part;
}
--- 91,98 ----
if(is_array($copyright['@'])) {
// add URL and version?
! if(isset($copyright['@']['url'])) {
$copyright_str_part = '<a href="'.$copyright['@']['url'].'" target="_blank">'.$copyright_str_part.'</a>';
}
! if(isset($copyright['@']['year'])) {
$copyright_str_part = $copyright['@']['year'].' '.$copyright_str_part;
}
***************
*** 104,107 ****
--- 108,113 ----
function zi_info_licenses($licenses)
{
+ $license_str = '';
+
// compose license string
if(!is_array($licenses) || !count($licenses)) {
***************
*** 109,120 ****
} else {
foreach($licenses as $license) {
! if(strlen($license['@']['url'])>0) {
$license_str .= '<a href="'.$license['@']['url'].'" target="_blank">';
}
$license_str .= $license['#'];
! if(strlen($license['@']['version'])>0) {
$license_str .= ' '.$license['@']['version'];
}
! if(strlen($license['@']['url'])>0) {
$license_str .= '</a>';
}
--- 115,126 ----
} else {
foreach($licenses as $license) {
! if(isset($license['@']['url'])) {
$license_str .= '<a href="'.$license['@']['url'].'" target="_blank">';
}
$license_str .= $license['#'];
! if(isset($license['@']['version'])) {
$license_str .= ' '.$license['@']['version'];
}
! if(isset($license['@']['url'])) {
$license_str .= '</a>';
}
Index: init.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/init.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** init.php 28 Jan 2004 11:41:35 -0000 1.5
--- init.php 29 Jan 2004 14:09:16 -0000 1.6
***************
*** 26,29 ****
--- 26,30 ----
// define parameters
$zi_phpversion_required = '4.3.0';
+ $zi_phpversions_excluded = array();
/*
$zi_phpversions_excluded = array(
***************
*** 78,82 ****
define('ZI_DEBUG', false);
define('ZZOSS_INSTALLER_REGISTRY_DEBUG', false);
! define('ZZOSS_PACKAGE_DEBUG', false);
define('ZZOSS_CONFIG_DEBUG', false);
--- 79,83 ----
define('ZI_DEBUG', false);
define('ZZOSS_INSTALLER_REGISTRY_DEBUG', false);
! define('ZZOSS_PACKAGE_DEBUG', true);
define('ZZOSS_CONFIG_DEBUG', false);
***************
*** 85,89 ****
require_once 'PEAR.php';
! PEAR::setErrorHandling(PEAR_ERROR_DIE);
// The root directory where the installer resides.
--- 86,123 ----
require_once 'PEAR.php';
!
! require_once 'ZZOSS_Error/Error.php';
!
! $options['production'] = false;
!
! $error =& new ZZOSS_Error($options);
! $error->setIdent('zic');
!
! if($options['production']){
! $error->setBehaviour(E_WARNING, ZZOSS_ERROR_B_EXIT + ZZOSS_ERROR_B_CLIENT + ZZOSS_ERROR_B_LOG);
! $error->setBehaviour(E_NOTICE, ZZOSS_ERROR_B_CONTINUE);
! $error->setBehaviour(E_USER_ERROR, ZZOSS_ERROR_B_EXIT + ZZOSS_ERROR_B_CLIENT + ZZOSS_ERROR_B_LOG);
! $error->setBehaviour(E_USER_WARNING, ZZOSS_ERROR_B_EXIT + ZZOSS_ERROR_B_CLIENT + ZZOSS_ERROR_B_LOG);
! $error->setBehaviour(E_USER_NOTICE, ZZOSS_ERROR_B_EXIT + ZZOSS_ERROR_B_CLIENT + ZZOSS_ERROR_B_LOG);
! } else {
! $error->setBehaviour(E_WARNING, ZZOSS_ERROR_B_DEV + ZZOSS_ERROR_B_EXIT);
! $error->setBehaviour(E_NOTICE, ZZOSS_ERROR_B_DEV + ZZOSS_ERROR_B_EXIT);
! $error->setBehaviour(E_USER_ERROR, ZZOSS_ERROR_B_DEV + ZZOSS_ERROR_B_EXIT);
! $error->setBehaviour(E_USER_WARNING, ZZOSS_ERROR_B_DEV + ZZOSS_ERROR_B_EXIT);
! $error->setBehaviour(E_USER_NOTICE, ZZOSS_ERROR_B_DEV + ZZOSS_ERROR_B_EXIT);
! }
!
! //$error->setLog('C:\WINDOWS\Temp\zzoss_error.log', ZZOSS_ERROR_ROTATE_MONTHLY);
! //$error->setRecipients('root@local');
!
! // Default values for reserved variables that are used frequently.
! $zi_auth = NULL;
! $zi_registry = NULL;
! $zi_hide = array();
! $zi_hide['profile'] = false;
! $chdir = '';
! if(!isset($_REQUEST['mode'])){
! $_REQUEST['mode'] = '';
! }
// The root directory where the installer resides.
Index: registry.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/registry.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** registry.php 14 Jan 2004 15:41:27 -0000 1.2
--- registry.php 29 Jan 2004 14:09:16 -0000 1.3
***************
*** 26,30 ****
require_once 'ZZOSS_Installer/Registry.php';
// are we in development?
! if($_REQUEST['mode'] == 'dev'){
$data_dir = $GLOBALS['ZI']['installer_data_dir_dev'];
} else {
--- 26,30 ----
require_once 'ZZOSS_Installer/Registry.php';
// are we in development?
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
$data_dir = $GLOBALS['ZI']['installer_data_dir_dev'];
} else {
***************
*** 35,43 ****
$zi_registry->refreshDistributions();
! if(strlen($_REQUEST['distribution'])){
$zi_registry->setDistribution($_REQUEST['distribution']);
}
! if(strlen($_REQUEST['application'])){
$zi_registry->setApplication($_REQUEST['application']);
}
--- 35,43 ----
$zi_registry->refreshDistributions();
! if(isset($_REQUEST['distribution'])){
$zi_registry->setDistribution($_REQUEST['distribution']);
}
! if(isset($_REQUEST['application'])){
$zi_registry->setApplication($_REQUEST['application']);
}
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn