[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] setup index.php,1.120 manageheader.php,1.53
|
From: |
skwashd |
|
Subject: |
[Phpgroupware-cvs] setup index.php,1.120 manageheader.php,1.53 |
|
Date: |
Sun, 15 May 2005 13:59:00 +0200 |
Update of setup
Modified Files:
Branch: MAIN
index.php lines: +12 -12
manageheader.php lines: +41 -27
Log Message:
fixes
====================================================
Index: setup/index.php
diff -u setup/index.php:1.119 setup/index.php:1.120
--- setup/index.php:1.119 Sun Apr 17 13:18:24 2005
+++ setup/index.php Sun May 15 11:59:36 2005
@@ -1,8 +1,8 @@
<?php
/**
- * Setup
+ * phpGroupWare Setup - http://phpGroupWare.org
*
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Portions Copyright (C) 2000-2005 Free Software Foundation,
Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
@@ -28,7 +28,7 @@
/**
* Include setup functions
*/
- include('./inc/functions.inc.php');
+ require_once('./inc/functions.inc.php');
@set_time_limit(0);
@@ -143,11 +143,11 @@
$setup_tpl->set_var('subaction',@$subaction);
// Old PHP
- if (!function_exists('version_compare'))
+ if ( !function_exists('sha1') )
{
$GLOBALS['phpgw_setup']->html->show_header($GLOBALS['phpgw_info']['setup']['header_msg'],True);
$GLOBALS['phpgw_setup']->html->show_alert_msg('Error',
- lang('You appear to be using PHP earlier than 4.1.0.
phpGroupWare now requires 4.1.0 or later'));
+ lang('You appear to be using PHP earlier than 4.3.0.
phpGroupWare now requires 4.3.0 or later') );
$GLOBALS['phpgw_setup']->html->show_footer();
exit;
}
@@ -155,12 +155,12 @@
// BEGIN setup page
//$GLOBALS['phpgw_setup']->app_status();
- $GLOBALS['phpgw_info']['server']['app_images'] =
'templates/default/images';
+ $GLOBALS['phpgw_info']['server']['app_images'] =
'templates/base/images';
$incomplete = $GLOBALS['phpgw_info']['server']['app_images'] .
'/incomplete.png';
$completed = $GLOBALS['phpgw_info']['server']['app_images'] .
'/completed.png';
- $setup_tpl->set_var('img_incomplete',$incomplete);
- $setup_tpl->set_var('img_completed',$completed);
+ $setup_tpl->set_var('img_incomplete', $incomplete);
+ $setup_tpl->set_var('img_completed', $completed);
$setup_tpl->set_var('db_step_text',lang('Step 1 - Simple Application
Management'));
@@ -236,13 +236,13 @@
$db_filled_block =
$setup_tpl->get_var('V_db_stage_6_pre');
flush();
- ob_start();
+ //ob_start();
$GLOBALS['phpgw_setup']->db->Halt_On_Error = 'report';
switch
($GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'])
{
case 'dbcreate':
-
$GLOBALS['phpgw_setup']->db->create_database($db_root, $db_pass);
+
$GLOBALS['phpgw_setup']->db->create_database($_POST['db_root'],
$_POST['db_pass']);
break;
case 'drop':
$setup_info =
$GLOBALS['phpgw_setup']->detection->get_versions($setup_info);
@@ -262,7 +262,7 @@
$GLOBALS['phpgw_info']['setup']['currentver']['phpgwapi'] = 'oldversion';
break;
}
- ob_end_clean();
+ //ob_end_clean();
$GLOBALS['phpgw_setup']->db->Halt_On_Error = 'no';
====================================================
Index: setup/manageheader.php
diff -u setup/manageheader.php:1.52 setup/manageheader.php:1.53
--- setup/manageheader.php:1.52 Sun Apr 17 13:18:24 2005
+++ setup/manageheader.php Sun May 15 11:59:36 2005
@@ -1,8 +1,8 @@
<?php
/**
- * Setup
+ * phpGroupWare Setup - http://phpgroupware.org
*
- * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc.
http://www.fsf.org/
+ * @copyright Portions Copyright (C) 2000-2005 Free Software Foundation,
Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package setup
* @version $Id$
@@ -10,23 +10,22 @@
$phpgw_info = array();
$GLOBALS['phpgw_info']['flags'] = array(
- 'nocachecontrol' => True,
- 'noheader' => True,
- 'nonavbar' => True,
- 'currentapp' => 'home',
- 'noapi' => True
+ 'nocachecontrol' => True,
+ 'noheader' => True,
+ 'nonavbar' => True,
+ 'currentapp' => 'setup',
+ 'noapi' => True
);
/**
* Include setup functions
*/
- include('./inc/functions.inc.php');
+ require_once('./inc/functions.inc.php');
- $GLOBALS['phpgw_info']['server']['versions']['current_header'] =
$setup_info['phpgwapi']['versions']['current_header'];
+ //$GLOBALS['phpgw_info']['server']['versions']['current_header'] =
$setup_info['phpgwapi']['versions']['current_header'];
unset($setup_info);
- #include('../version.inc.php');
- $adddomain = get_var('adddomain',Array('POST'));
+ $adddomain = get_var('adddomain', array('POST'));
if(@$adddomain)
{
}
@@ -38,15 +37,19 @@
{
$errors = '';
$domains = get_var('domains',Array('POST'));
- @reset($domains);
- while(list($k,$v) = @each($domains))
+ if ( !is_array($domains) )
+ {
+ $domains = array();
+ }
+ reset($domains);
+ foreach($domains as $k => $v)
{
$deletedomain = get_var('deletedomain',Array('POST'));
- if(isset($deletedomain[$k]))
+ if ( isset($deletedomain[$k]) )
{
continue;
}
- //$dom = get_var("settings['$k']", Array('POST'));
+
if(!$_POST['settings'][$k]['config_pass'])
{
$errors .= '<br />' . lang("You didn't enter a
config password for domain %1",$v);
@@ -87,19 +90,20 @@
$setup_tpl->set_block('T_setup_manage','domain','domain');
$setup_tpl->set_var('HeaderLoginWarning', lang('Warning: All your
passwords (database, phpGroupWare admin,...)<br /> will be shown in plain text
after you log in for header administration.'));
+ $setup_tpl->set_var('lang_cookies_must_be_enabled', lang('<b>NOTE:</b>
You must have cookies enabled to use setup and header admin!') );
/* Detect current mode */
switch($GLOBALS['phpgw_info']['setup']['stage']['header'])
{
- case '1':
+ case 1:
$GLOBALS['phpgw_info']['setup']['HeaderFormMSG'] =
lang('Create your header.inc.php');
$GLOBALS['phpgw_info']['setup']['PageMSG'] = lang('You
have not created your header.inc.php yet!<br /> You can create it now.');
break;
- case '2':
+ case 2:
$GLOBALS['phpgw_info']['setup']['HeaderFormMSG'] =
lang('Your header admin password is NOT set. Please set it now!');
$GLOBALS['phpgw_info']['setup']['PageMSG'] = lang('Your
header admin password is NOT set. Please set it now!');
break;
- case '3':
+ case 3:
$GLOBALS['phpgw_info']['setup']['HeaderFormMSG'] =
lang('Your header.inc.php needs upgrading.');
$GLOBALS['phpgw_info']['setup']['PageMSG'] = lang('Your
header.inc.php needs upgrading.<br /><blink><b
class="msg">WARNING!</b></blink><br /><b>MAKE BACKUPS!</b>');
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] =
lang('Your header.inc.php needs upgrading.');
@@ -111,7 +115,7 @@
exit;
}
break;
- case '10':
+ case 10:
if (!$GLOBALS['phpgw_setup']->auth('Header'))
{
$GLOBALS['phpgw_setup']->html->show_header('Please login',True);
@@ -124,7 +128,7 @@
break;
}
- $action = @get_var('action',Array('POST'));
+ $action = get_var('action',Array('POST'));
list($action) = @each($action);
switch($action)
{
@@ -189,7 +193,7 @@
$detected = '';
- if (!$ConfigLang)
+ if ( !isset($ConfigLang) || !$ConfigLang )
{
$_POST['ConfigLang'] = 'en';
$detected .= '<br /><form
action="manageheader.php" method="post">Please Select your language ' .
lang_select(True) . "</form>\n";
@@ -334,8 +338,12 @@
$GLOBALS['phpgw_domain'][lang('new')] = array();
}
- reset($GLOBALS['phpgw_domain']);
- while(list($key,$val) =
each($GLOBALS['phpgw_domain']))
+ if( !isset($GLOBALS['phpgw_domain']) )
+ {
+ $GLOBALS['phpgw_domain'] =
array();
+ }
+
+ foreach($GLOBALS['phpgw_domain'] as
$key => $val)
{
$setup_tpl->set_var('lang_domain',lang('Domain'));
$setup_tpl->set_var('lang_delete',lang('Delete'));
@@ -403,7 +411,8 @@
$setup_tpl->set_var('db_type','mysql');
$setup_tpl->set_var('config_pass','changeme');
- while(list($k,$v) = each($supported_db))
+ $dbtype_options = '';
+ foreach($supported_db as $k => $v)
{
$dbtype_options .= '<option value="' .
$v . '">' . $v . "\n";
}
@@ -428,6 +437,7 @@
'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
);
+ $GLOBALS['phpgw_info']['server']['mcrypt_iv'] =
'';
for($i=0; $i < 30; ++$i)
{
$GLOBALS['phpgw_info']['server']['mcrypt_iv'] .=
$random_char[rand(1,count($random_char))];
@@ -488,8 +498,12 @@
$setup_tpl->set_var('mcrypt',$GLOBALS['phpgw_info']['server']['versions']['mcrypt']);
$setup_tpl->set_var('mcrypt_iv',$GLOBALS['phpgw_info']['server']['mcrypt_iv']);
+ if (
!isset($GLOBALS['phpgw_info']['server']['setup_acl']) ||
!$GLOBALS['phpgw_info']['server']['setup_acl'] )
+ {
+ $GLOBALS['phpgw_info']['server']['setup_acl'] =
'127.0.0.1';
+ }
$setup_tpl->set_var('lang_setup_acl',lang('Limit access
to setup to the following addresses or networks (e.g. 10.1.1,127.0.0.1)'));
-
$setup_tpl->set_var('setup_acl',$GLOBALS['phpgw_info']['server']['setup_acl']);
+ $setup_tpl->set_var('setup_acl',
$GLOBALS['phpgw_info']['server']['setup_acl']);
if(@$GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
{
@@ -510,7 +524,7 @@
}
$errors = '';
- if(!$found_dbtype)
+ if( !isset($found_dbtype) || !$found_dbtype )
{
/*
$errors .= '<br /><font color="red">' .
lang('Warning!') . '<br />'
- [Phpgroupware-cvs] setup index.php,1.120 manageheader.php,1.53, skwashd, 2005/05/16
- [Phpgroupware-cvs] setup index.php,1.120 manageheader.php,1.53, skwashd, 2005/05/16
- [Phpgroupware-cvs] setup index.php,1.120 manageheader.php,1.53, skwashd, 2005/05/16
- [Phpgroupware-cvs] setup index.php,1.120 manageheader.php,1.53,
skwashd <=
- Prev by Date:
[Phpgroupware-cvs] property/setup tables_update.inc.php, 1.9 tables_current.inc.php, 1.29 default_records.inc.php, 1.13 setup.inc.php, 1.16
- Next by Date:
[Phpgroupware-cvs] email addressbook-js.php, 1.4 compose.php, 1.54 view_image.php, 1.19 attach_file.php, 1.31 addressbook.php, 1.42 index.php, 1.93 addressbook-js.changelog.txt, 1.4
- Previous by thread:
[Phpgroupware-cvs] setup index.php,1.120 manageheader.php,1.53
- Next by thread:
[Phpgroupware-cvs] todo/inc hook_home.inc.php, 1.8 hook_preferences.inc.php, 1.14 class.sotodo.inc.php, 1.18 class.uipreferences.inc.php, 1.3 class.uitodo.inc.php, 1.24 class.botodo.inc.php, 1.18 hook_deleteaccount.inc.php, 1.4 class.bopreferences.inc.php, 1.5 hook_admin.inc.php, 1.7 hook_manual.inc.php, 1.5
- Index(es):