[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: setup manageheader.php,1.38,1.39
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: setup manageheader.php,1.38,1.39 |
|
Date: |
Sun, 28 Apr 2002 20:26:04 -0400 |
Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv1913/setup
Modified Files:
manageheader.php
Log Message:
Some cleanups of warnings.
Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** manageheader.php 26 Apr 2002 23:54:21 -0000 1.38
--- manageheader.php 29 Apr 2002 00:26:01 -0000 1.39
***************
*** 22,31 ****
include('./inc/functions.inc.php');
- include('../phpgwapi/setup/setup.inc.php');
$GLOBALS['phpgw_info']['server']['versions']['current_header'] =
$setup_info['phpgwapi']['versions']['current_header'];
unset($setup_info);
#include('../version.inc.php');
! if($GLOBALS['HTTP_POST_VARS']['adddomain'])
{
}
--- 22,30 ----
include('./inc/functions.inc.php');
$GLOBALS['phpgw_info']['server']['versions']['current_header'] =
$setup_info['phpgwapi']['versions']['current_header'];
unset($setup_info);
#include('../version.inc.php');
! if(@$GLOBALS['HTTP_POST_VARS']['adddomain'])
{
}
***************
*** 77,80 ****
--- 76,80 ----
$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
+ $setup_tpl->set_block('T_setup_manage','manageheader','manageheader');
$setup_tpl->set_block('T_setup_manage','domain','domain');
***************
*** 265,272 ****
$detected .= lang('Found existing configuration
file. Loading settings from the file...') . '<br>' . "\n";
$GLOBALS['phpgw_info']['flags']['noapi'] = True;
- include('../header.inc.php');
$no_guess = true;
/* This code makes sure the newer multi-domain
supporting header.inc.php is being used */
! if(!isset($phpgw_domain))
{
$detected .= lang("You're using an old
configuration file format...") . '<br>' . "\n";
--- 265,271 ----
$detected .= lang('Found existing configuration
file. Loading settings from the file...') . '<br>' . "\n";
$GLOBALS['phpgw_info']['flags']['noapi'] = True;
$no_guess = true;
/* This code makes sure the newer multi-domain
supporting header.inc.php is being used */
! if(!isset($GLOBALS['phpgw_domain']))
{
$detected .= lang("You're using an old
configuration file format...") . '<br>' . "\n";
***************
*** 275,313 ****
else
{
!
if($GLOBALS['phpgw_info']['server']['header_version'] !=
$GLOBALS['phpgw_info']['server']['current_header_version'])
{
$detected .= lang("You're using
an old header.inc.php version...") . '<br>' . "\n";
$detected .= lang('Importing
old settings into the new format....') . '<br>' . "\n";
}
! reset($phpgw_domain);
! $default_domain = each($phpgw_domain);
$GLOBALS['phpgw_info']['server']['default_domain'] = $default_domain[0];
unset($default_domain); // we kill this
for security reasons
!
$GLOBALS['phpgw_info']['server']['config_passwd'] =
$phpgw_domain[$GLOBALS['phpgw_info']['server']['default_domain']]['config_passwd'];
!
if($GLOBALS['HTTP_POST_VARS']['adddomain'])
{
! $phpgw_domain[lang('new')] =
array();
}
! reset($phpgw_domain);
! while(list($key,$val) =
each($phpgw_domain))
{
$setup_tpl->set_var('lang_domain',lang('Domain'));
$setup_tpl->set_var('lang_delete',lang('Delete'));
$setup_tpl->set_var('db_domain',$key);
!
$setup_tpl->set_var('db_host',$phpgw_domain[$key]['db_host']);
!
$setup_tpl->set_var('db_name',$phpgw_domain[$key]['db_name']);
!
$setup_tpl->set_var('db_user',$phpgw_domain[$key]['db_user']);
!
$setup_tpl->set_var('db_pass',$phpgw_domain[$key]['db_pass']);
!
$setup_tpl->set_var('db_type',$phpgw_domain[$key]['db_type']);
!
$setup_tpl->set_var('config_pass',$phpgw_domain[$key]['config_passwd']);
$selected = '';
! $db_type_option = '';
$found_dbtype = False;
while(list($k,$v) =
each($supported_db))
{
! if($v ==
$phpgw_domain[$key]['db_type'])
{
$selected = '
selected ';
--- 274,312 ----
else
{
!
if(@$GLOBALS['phpgw_info']['server']['header_version'] !=
@$GLOBALS['phpgw_info']['server']['current_header_version'])
{
$detected .= lang("You're using
an old header.inc.php version...") . '<br>' . "\n";
$detected .= lang('Importing
old settings into the new format....') . '<br>' . "\n";
}
! reset($GLOBALS['phpgw_domain']);
! $default_domain =
each($GLOBALS['phpgw_domain']);
$GLOBALS['phpgw_info']['server']['default_domain'] = $default_domain[0];
unset($default_domain); // we kill this
for security reasons
!
$GLOBALS['phpgw_info']['server']['config_passwd'] =
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['config_passwd'];
!
if(@$GLOBALS['HTTP_POST_VARS']['adddomain'])
{
!
$GLOBALS['phpgw_domain'][lang('new')] = array();
}
! reset($GLOBALS['phpgw_domain']);
! while(list($key,$val) =
each($GLOBALS['phpgw_domain']))
{
$setup_tpl->set_var('lang_domain',lang('Domain'));
$setup_tpl->set_var('lang_delete',lang('Delete'));
$setup_tpl->set_var('db_domain',$key);
!
$setup_tpl->set_var('db_host',$GLOBALS['phpgw_domain'][$key]['db_host']);
!
$setup_tpl->set_var('db_name',$GLOBALS['phpgw_domain'][$key]['db_name']);
!
$setup_tpl->set_var('db_user',$GLOBALS['phpgw_domain'][$key]['db_user']);
!
$setup_tpl->set_var('db_pass',$GLOBALS['phpgw_domain'][$key]['db_pass']);
!
$setup_tpl->set_var('db_type',$GLOBALS['phpgw_domain'][$key]['db_type']);
!
$setup_tpl->set_var('config_pass',$GLOBALS['phpgw_domain'][$key]['config_passwd']);
$selected = '';
! $dbtype_options = '';
$found_dbtype = False;
while(list($k,$v) =
each($supported_db))
{
! if($v ==
$GLOBALS['phpgw_domain'][$key]['db_type'])
{
$selected = '
selected ';
***************
*** 318,326 ****
$selected = '';
}
! $dbtype_options .=
'<option ' . $selected . ' value="' . $v . '">' . $v . "\n";
}
$setup_tpl->set_var('dbtype_options',$dbtype_options);
!
$setup_tpl->fp('domains','domain',True);
}
$setup_tpl->set_var('domain','');
--- 317,325 ----
$selected = '';
}
! $dbtype_options .=
'<option ' . $selected . 'value="' . $v . '">' . $v . "\n";
}
$setup_tpl->set_var('dbtype_options',$dbtype_options);
!
$setup_tpl->parse('domains','domain',True);
}
$setup_tpl->set_var('domain','');
***************
*** 331,341 ****
$GLOBALS['phpgw_info']['server']['include_root'] = PHPGW_INCLUDE_ROOT;
}
!
elseif(!isset($GLOBALS['phpgw_info']['server']['include_root']) &&
$GLOBALS['phpgw_info']['server']['header_version'] <= 1.6)
{
!
$GLOBALS['phpgw_info']['server']['include_root'] =
$GLOBALS['phpgw_info']['server']['server_root'];
}
!
elseif(!isset($GLOBALS['phpgw_info']['server']['header_version']) &&
$GLOBALS['phpgw_info']['server']['header_version'] <= 1.6)
{
!
$GLOBALS['phpgw_info']['server']['include_root'] =
$GLOBALS['phpgw_info']['server']['server_root'];
}
}
--- 330,340 ----
$GLOBALS['phpgw_info']['server']['include_root'] = PHPGW_INCLUDE_ROOT;
}
!
elseif(address@hidden($GLOBALS['phpgw_info']['server']['include_root']) &&
@$GLOBALS['phpgw_info']['server']['header_version'] <= 1.6)
{
!
$GLOBALS['phpgw_info']['server']['include_root'] =
@$GLOBALS['phpgw_info']['server']['server_root'];
}
!
elseif(address@hidden($GLOBALS['phpgw_info']['server']['header_version']) &&
@$GLOBALS['phpgw_info']['server']['header_version'] <= 1.6)
{
!
$GLOBALS['phpgw_info']['server']['include_root'] =
@$GLOBALS['phpgw_info']['server']['server_root'];
}
}
***************
*** 365,369 ****
$setup_tpl->set_var('dbtype_options',$dbtype_options);
! $setup_tpl->fp('domains','domain',True);
$setup_tpl->set_var('domain','');
--- 364,368 ----
$setup_tpl->set_var('dbtype_options',$dbtype_options);
! $setup_tpl->parse('domains','domain',True);
$setup_tpl->set_var('domain','');
***************
*** 403,411 ****
/* End of detected settings, now display the form with
the detected or prior values */
!
$setup_tpl->set_var('server_root',$GLOBALS['phpgw_info']['server']['server_root']);
!
$setup_tpl->set_var('include_root',$GLOBALS['phpgw_info']['server']['include_root']);
!
$setup_tpl->set_var('header_admin_password',$GLOBALS['phpgw_info']['server']['header_admin_password']);
! if($GLOBALS['phpgw_info']['server']['db_persistent'])
{
$setup_tpl->set_var('db_persistent_yes','
selected');
--- 402,410 ----
/* End of detected settings, now display the form with
the detected or prior values */
!
$setup_tpl->set_var('server_root',@$GLOBALS['phpgw_info']['server']['server_root']);
!
$setup_tpl->set_var('include_root',@$GLOBALS['phpgw_info']['server']['include_root']);
!
$setup_tpl->set_var('header_admin_password',@$GLOBALS['phpgw_info']['server']['header_admin_password']);
! if(@$GLOBALS['phpgw_info']['server']['db_persistent'])
{
$setup_tpl->set_var('db_persistent_yes','
selected');
***************
*** 417,424 ****
$selected = '';
! $session_type_option = '';
while(list($k,$v) = each($supported_sessions_type))
{
! if($v ==
$GLOBALS['phpgw_info']['server']['sessions_type'])
{
$selected = ' selected ';
--- 416,423 ----
$selected = '';
! $session_options = '';
while(list($k,$v) = each($supported_sessions_type))
{
! if($v ==
@$GLOBALS['phpgw_info']['server']['sessions_type'])
{
$selected = ' selected ';
***************
*** 428,436 ****
$selected = '';
}
! $session_options .= '<option ' . $selected . '
value="' . $v . '">' . $v . "\n";
}
$setup_tpl->set_var('session_options',$session_options);
! if($GLOBALS['phpgw_info']['server']['mcrypt_enabled'])
{
$setup_tpl->set_var('mcrypt_enabled_yes','
selected');
--- 427,435 ----
$selected = '';
}
! $session_options .= '<option ' . $selected .
'value="' . $v . '">' . $v . "\n";
}
$setup_tpl->set_var('session_options',$session_options);
! if(@$GLOBALS['phpgw_info']['server']['mcrypt_enabled'])
{
$setup_tpl->set_var('mcrypt_enabled_yes','
selected');
***************
*** 447,451 ****
$setup_tpl->set_var('setup_acl',$GLOBALS['phpgw_info']['server']['setup_acl']);
! if($GLOBALS['phpgw_info']['server']['domain_selectbox'])
{
$setup_tpl->set_var('domain_selectbox_yes','
selected');
--- 446,450 ----
$setup_tpl->set_var('setup_acl',$GLOBALS['phpgw_info']['server']['setup_acl']);
!
if(@$GLOBALS['phpgw_info']['server']['domain_selectbox'])
{
$setup_tpl->set_var('domain_selectbox_yes','
selected');
***************
*** 511,515 ****
$setup_tpl->set_var('lang_finaldescr',lang('After
retrieving the file, put it into place as the header.inc.php. Then, click
"continue".'));
! $setup_tpl->pfp('out','T_setup_manage');
break; // ending the switch default
}
--- 510,514 ----
$setup_tpl->set_var('lang_finaldescr',lang('After
retrieving the file, put it into place as the header.inc.php. Then, click
"continue".'));
! $setup_tpl->pfp('out','manageheader');
break; // ending the switch default
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: setup manageheader.php,1.38,1.39,
Mark A Peters <address@hidden> <=