[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.19,1.19.2.1 clas
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.19,1.19.2.1 class.setup_html.inc.php,1.7,1.7.2.1 class.setup_lang.inc.php,1.6,1.6.2.1 functions.inc.php,1.41,1.41.2.1 |
|
Date: |
Mon, 14 Jan 2002 07:14:19 -0500 |
Update of /cvsroot/phpgroupware/setup/inc
In directory subversions:/tmp/cvs-serv2171/setup/inc
Modified Files:
Tag: Version-0_9_14-branch
class.setup.inc.php class.setup_html.inc.php
class.setup_lang.inc.php functions.inc.php
Log Message:
This will now correctly remove the system level cache. Previous problem was
occuring because loaddb() was not called prior to clearing the cache. This
also clears up all warning messages being dumped to the HTTP log file.
Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup.inc.php,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C2 -r1.19 -r1.19.2.1
*** class.setup.inc.php 13 Jan 2002 17:20:33 -0000 1.19
--- class.setup.inc.php 14 Jan 2002 12:14:17 -0000 1.19.2.1
***************
*** 28,36 ****
function loaddb()
{
! $ConfigDomain =
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] ?
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] :
$GLOBALS['HTTP_POST_VARS']['ConfigDomain'];
! if(empty($ConfigDomain))
{
/* This is to fix the reading of this value
immediately after the cookie was set on login */
! $ConfigDomain =
$GLOBALS['HTTP_POST_VARS']['FormDomain'];
}
--- 28,36 ----
function loaddb()
{
! $GLOBALS['ConfigDomain'] =
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] ?
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] :
@$GLOBALS['HTTP_POST_VARS']['ConfigDomain'];
! if(empty($GLOBALS['ConfigDomain']))
{
/* This is to fix the reading of this value
immediately after the cookie was set on login */
! $GLOBALS['ConfigDomain'] =
@$GLOBALS['HTTP_POST_VARS']['FormDomain'] ?
@$GLOBALS['HTTP_POST_VARS']['FormDomain'] : 'default';
}
***************
*** 40,50 ****
$GLOBALS['phpgw_info']['server']['api_inc'] =
PHPGW_SERVER_ROOT . '/phpgwapi/inc';
}
! include($GLOBALS['phpgw_info']['server']['api_inc'] .
'/class.db_'.$GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'].'.inc.php');
$this->db = new db;
! $this->db->Host =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_host'];
! $this->db->Type =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_type'];
! $this->db->Database =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_name'];
! $this->db->User =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_user'];
! $this->db->Password =
$GLOBALS['phpgw_domain'][$ConfigDomain]['db_pass'];
}
--- 40,50 ----
$GLOBALS['phpgw_info']['server']['api_inc'] =
PHPGW_SERVER_ROOT . '/phpgwapi/inc';
}
! include($GLOBALS['phpgw_info']['server']['api_inc'] .
'/class.db_'.$GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_type'].'.inc.php');
$this->db = new db;
! $this->db->Host =
$GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_host'];
! $this->db->Type =
$GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_type'];
! $this->db->Database =
$GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_name'];
! $this->db->User =
$GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_user'];
! $this->db->Password =
$GLOBALS['phpgw_domain'][$GLOBALS['ConfigDomain']]['db_pass'];
}
***************
*** 56,70 ****
function auth($auth_type = "Config")
{
! global $HTTP_POST_VARS, $HTTP_GET_VARS,
$HTTP_COOKIE_VARS;
!
! $FormLogout = $HTTP_GET_VARS['FormLogout'] ?
$HTTP_GET_VARS['FormLogout'] : $HTTP_POST_VARS['FormLogout'];
! $ConfigLogin = $HTTP_POST_VARS['ConfigLogin'] ?
$HTTP_POST_VARS['ConfigLogin'] : $HTTP_COOKIE_VARS['ConfigLogin'];
! $HeaderLogin = $HTTP_POST_VARS['HeaderLogin'] ?
$HTTP_POST_VARS['HeaderLogin'] : $HTTP_COOKIE_VARS['HeaderLogin'];
! $FormDomain = $HTTP_POST_VARS['FormDomain'];
! $FormPW = $HTTP_POST_VARS['FormPW'];
! $ConfigDomain = $HTTP_POST_VARS['ConfigDomain'] ?
$HTTP_POST_VARS['ConfigDomain'] : $HTTP_COOKIE_VARS['ConfigDomain'];
! $ConfigPW = $HTTP_POST_VARS['ConfigPW'] ?
$HTTP_POST_VARS['ConfigPW'] : $HTTP_COOKIE_VARS['ConfigPW'];
! $HeaderPW = $HTTP_COOKIE_VARS['HeaderPW'] ?
$HTTP_COOKIE_VARS['HeaderPW'] : $HTTP_POST_VARS['HeaderPW'];
! $ConfigLang = $HTTP_POST_VARS['ConfigLang'] ?
$HTTP_POST_VARS['ConfigLang'] : $HTTP_COOKIE_VARS['ConfigLang'];
if (isset($FormLogout) && !empty($FormLogout))
--- 56,68 ----
function auth($auth_type = "Config")
{
! $FormLogout =
@$GLOBALS['HTTP_GET_VARS']['FormLogout'] ?
@$GLOBALS['HTTP_GET_VARS']['FormLogout'] :
@$GLOBALS['HTTP_POST_VARS']['FormLogout'];
! $ConfigLogin =
@$GLOBALS['HTTP_POST_VARS']['ConfigLogin'] ?
@$GLOBALS['HTTP_POST_VARS']['ConfigLogin'] :
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigLogin'];
! $HeaderLogin =
@$GLOBALS['HTTP_POST_VARS']['HeaderLogin'] ?
@$GLOBALS['HTTP_POST_VARS']['HeaderLogin'] :
@$GLOBALS['HTTP_COOKIE_VARS']['HeaderLogin'];
! $FormDomain =
@$GLOBALS['HTTP_POST_VARS']['FormDomain'];
! $FormPW = @$GLOBALS['HTTP_POST_VARS']['FormPW'];
! $ConfigDomain =
@$GLOBALS['HTTP_POST_VARS']['ConfigDomain'] ?
@$GLOBALS['HTTP_POST_VARS']['ConfigDomain'] :
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'];
! $ConfigPW = @$GLOBALS['HTTP_POST_VARS']['ConfigPW']
? @$GLOBALS['HTTP_POST_VARS']['ConfigPW'] :
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigPW'];
! $HeaderPW =
@$GLOBALS['HTTP_COOKIE_VARS']['HeaderPW'] ?
@$GLOBALS['HTTP_COOKIE_VARS']['HeaderPW'] :
@$GLOBALS['HTTP_POST_VARS']['HeaderPW'];
! $ConfigLang =
@$GLOBALS['HTTP_POST_VARS']['ConfigLang'] ?
@$GLOBALS['HTTP_POST_VARS']['ConfigLang'] :
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'];
if (isset($FormLogout) && !empty($FormLogout))
***************
*** 80,83 ****
--- 78,82 ----
setcookie('ConfigLang');
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'You have successfully
logged out';
+
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
return False;
}
***************
*** 86,89 ****
--- 85,89 ----
setcookie('HeaderPW'); /* scrub the
old one */
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'You have successfully
logged out';
+
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
return False;
}
***************
*** 97,100 ****
--- 97,101 ----
setcookie('ConfigLang');
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid session cookie
(cookies must be enabled)';
+
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
return False;
}
***************
*** 120,123 ****
--- 121,125 ----
{
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'Invalid password';
+
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = '';
return False;
}
***************
*** 133,136 ****
--- 135,139 ----
{
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid password';
+
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
return False;
}
***************
*** 143,146 ****
--- 146,150 ----
setcookie('HeaderPW'); /* scrub the
old one */
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid session cookie
(cookies must be enabled)';
+
$GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = '';
return False;
}
***************
*** 199,203 ****
function clear_session_cache()
{
-
$tablenames = @$this->db->table_names();
while(list($key,$val) = @each($tablenames))
--- 203,206 ----
Index: class.setup_html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup_html.inc.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -r1.7 -r1.7.2.1
*** class.setup_html.inc.php 11 Jan 2002 03:40:59 -0000 1.7
--- class.setup_html.inc.php 14 Jan 2002 12:14:17 -0000 1.7.2.1
***************
*** 23,30 ****
$GLOBALS['header_template']->set_file(array('header' =>
'header.inc.php.template'));
while(list($k,$v) = @each($setting))
{
!
$GLOBALS['header_template']->set_var(strtoupper($k),$v);
}
return
$GLOBALS['header_template']->parse('out','header');
}
--- 23,32 ----
$GLOBALS['header_template']->set_file(array('header' =>
'header.inc.php.template'));
+ $var = Array();
while(list($k,$v) = @each($setting))
{
! $var[strtoupper($k)] = $v;
}
+ $GLOBALS['header_template']->set_var($var);
return
$GLOBALS['header_template']->parse('out','header');
}
***************
*** 69,73 ****
$GLOBALS['setup_tpl']->set_var('configdomain','
- ' . lang('Domain') . ': '.$configdomain);
}
!
$GLOBALS['setup_tpl']->set_var('pgw_ver',$phpgw_info['server']['versions']['phpgwapi']);
$GLOBALS['setup_tpl']->set_var('logoutbutton',$btn_logout);
$GLOBALS['setup_tpl']->pparse('out','T_head');
--- 71,75 ----
$GLOBALS['setup_tpl']->set_var('configdomain','
- ' . lang('Domain') . ': '.$configdomain);
}
!
$GLOBALS['setup_tpl']->set_var('pgw_ver',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
$GLOBALS['setup_tpl']->set_var('logoutbutton',$btn_logout);
$GLOBALS['setup_tpl']->pparse('out','T_head');
Index: class.setup_lang.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/class.setup_lang.inc.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** class.setup_lang.inc.php 7 Jan 2002 10:50:42 -0000 1.6
--- class.setup_lang.inc.php 14 Jan 2002 12:14:17 -0000 1.6.2.1
***************
*** 35,39 ****
function phpgw_setup_lang()
{
! $ConfigLang =
$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'] ?
$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'] :
$GLOBALS['HTTP_POST_VARS']['ConfigLang'];
if(!$ConfigLang)
--- 35,39 ----
function phpgw_setup_lang()
{
! $ConfigLang =
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'] ?
@$GLOBALS['HTTP_COOKIE_VARS']['ConfigLang'] :
@$GLOBALS['HTTP_POST_VARS']['ConfigLang'];
if(!$ConfigLang)
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/inc/functions.inc.php,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -C2 -r1.41 -r1.41.2.1
*** functions.inc.php 11 Jan 2002 03:40:59 -0000 1.41
--- functions.inc.php 14 Jan 2002 12:14:17 -0000 1.41.2.1
***************
*** 13,19 ****
/* ######## Start security check ########## */
! $d1 =
strtolower(substr($GLOBALS['phpgw_info']['server']['api_inc'],0,3));
! $d2 =
strtolower(substr($GLOBALS['phpgw_info']['server']['server_root'],0,3));
! $d3 =
strtolower(substr($GLOBALS['phpgw_info']['server']['app_inc'],0,3));
if($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3
== 'htt' || $d3 == 'ftp')
{
--- 13,19 ----
/* ######## Start security check ########## */
! $d1 =
strtolower(substr(@$GLOBALS['phpgw_info']['server']['api_inc'],0,3));
! $d2 =
strtolower(substr(@$GLOBALS['phpgw_info']['server']['server_root'],0,3));
! $d3 =
strtolower(substr(@$GLOBALS['phpgw_info']['server']['app_inc'],0,3));
if($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3
== 'htt' || $d3 == 'ftp')
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: setup/inc class.setup.inc.php,1.19,1.19.2.1 class.setup_html.inc.php,1.7,1.7.2.1 class.setup_lang.inc.php,1.6,1.6.2.1 functions.inc.php,1.41,1.41.2.1,
Mark A Peters <address@hidden> <=