[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.auth_sqlssl.inc.php, 1.4.2.1, 1.4.
|
From: |
Dave Hall <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.auth_sqlssl.inc.php, 1.4.2.1, 1.4.2.1.2.1 class.browser.inc.php, 1.14.2.2.2.2, 1.14.2.2.2.3 class.common.inc.php, 1.123.2.9.2.16, 1.123.2.9.2.17 class.graphics.inc.php, 1.5, 1.5.4.1 class.menutree.inc.php, 1.18, 1.18.4.1 class.nextmatchs.inc.php, 1.43.2.6.2.5, 1.43.2.6.2.6 class.phpgw.inc.php, 1.42.4.4, 1.42.4.5 class.soap_server.inc.php, 1.10.4.1, 1.10.4.2 class.xmlrpc_server.inc.php, 1.22.4.1, 1.22.4.2 common_functions.inc.php, 1.16.2.4, 1.16.2.5 |
|
Date: |
Thu, 09 Oct 2003 08:18:48 +0000 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv29037
Modified Files:
Tag: Version-0_9_16-branch
class.auth_sqlssl.inc.php class.browser.inc.php
class.common.inc.php class.graphics.inc.php
class.menutree.inc.php class.nextmatchs.inc.php
class.phpgw.inc.php class.soap_server.inc.php
class.xmlrpc_server.inc.php common_functions.inc.php
Log Message:
global and sql fixes
Index: common_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/common_functions.inc.php,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -C2 -d -r1.16.2.4 -r1.16.2.5
*** common_functions.inc.php 23 Sep 2003 01:41:54 -0000 1.16.2.4
--- common_functions.inc.php 9 Oct 2003 08:18:45 -0000 1.16.2.5
***************
*** 495,506 ****
case 'COOKIE':
case 'SERVER':
! if(phpversion() >= '4.1.0')
! {
! $meth =
'_'.strtoupper($method[$i]);
! }
! else
! {
! $meth =
'HTTP_'.strtoupper($method[$i]).'_VARS';
! }
if(@isset($GLOBALS[$meth][$varname]))
{
--- 495,499 ----
case 'COOKIE':
case 'SERVER':
! $meth = '_'.strtoupper($method[$i]);
if(@isset($GLOBALS[$meth][$varname]))
{
Index: class.graphics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/Attic/class.graphics.inc.php,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -C2 -d -r1.5 -r1.5.4.1
*** class.graphics.inc.php 26 Jul 2001 11:25:35 -0000 1.5
--- class.graphics.inc.php 9 Oct 2003 08:18:44 -0000 1.5.4.1
***************
*** 82,92 ****
}
! global $HTTP_POST_VARS;
!
! if (is_array($HTTP_POST_VARS))
{
! while( list($key, $val) =
each($HTTP_POST_VARS))
{
! if (ereg("(.*)_x",$key,$varName) &&
$HTTP_POST_VARS[$varName[1]."_y"])
{
$name = $varName[1];
--- 82,90 ----
}
! if (is_array($_POST))
{
! while( list($key, $val) = each($_POST))
{
! if (ereg("(.*)_x",$key,$varName) &&
$_POST[$varName[1]."_y"])
{
$name = $varName[1];
Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.43.2.6.2.5
retrieving revision 1.43.2.6.2.6
diff -C2 -d -r1.43.2.6.2.5 -r1.43.2.6.2.6
*** class.nextmatchs.inc.php 29 Sep 2003 00:13:14 -0000 1.43.2.6.2.5
--- class.nextmatchs.inc.php 9 Oct 2003 08:18:45 -0000 1.43.2.6.2.6
***************
*** 557,561 ****
else
{
! $filter = $GLOBALS['HTTP_POST_VARS']['filter']
? $GLOBALS['HTTP_POST_VARS']['filter'] : $GLOBALS['HTTP_GET_VARS']['filter'];
}
--- 557,561 ----
else
{
! $filter = $_POST['filter'] ? $_POST['filter'] :
$_GET]['filter'];
}
Index: class.soap_server.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.soap_server.inc.php,v
retrieving revision 1.10.4.1
retrieving revision 1.10.4.2
diff -C2 -d -r1.10.4.1 -r1.10.4.2
*** class.soap_server.inc.php 30 May 2003 02:34:26 -0000 1.10.4.1
--- class.soap_server.inc.php 9 Oct 2003 08:18:45 -0000 1.10.4.2
***************
*** 63,70 ****
function parseRequest($data="")
{
- global $HTTP_SERVER_VARS;
-
$this->debug("entering parseRequest() on ".date("H:i
Y-m-d"));
! $request_uri = $HTTP_SERVER_VARS["REQUEST_URI"];
$this->debug("request uri: $request_uri");
// get headers
--- 63,68 ----
function parseRequest($data="")
{
$this->debug("entering parseRequest() on ".date("H:i
Y-m-d"));
! $request_uri = $_SERVER['REQUEST_URI'];
$this->debug("request uri: $request_uri");
// get headers
Index: class.browser.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.browser.inc.php,v
retrieving revision 1.14.2.2.2.2
retrieving revision 1.14.2.2.2.3
diff -C2 -d -r1.14.2.2.2.2 -r1.14.2.2.2.3
*** class.browser.inc.php 9 Oct 2003 06:17:45 -0000 1.14.2.2.2.2
--- class.browser.inc.php 9 Oct 2003 08:18:44 -0000 1.14.2.2.2.3
***************
*** 36,44 ****
function browser()
{
- $HTTP_USER_AGENT = $_SERVER['HTTP_USER_AGENT'];
/*
Determine browser and version
*/
! if(ereg('MSIE
([0-9].[0-9]{1,2})',$SERVER['HTTP_USER_AGENT'],$log_version))
{
$this->BROWSER_VER = $log_version[1];
--- 36,43 ----
function browser()
{
/*
Determine browser and version
*/
! if(ereg('MSIE
([0-9].[0-9]{1,2})',$_SERVER['HTTP_USER_AGENT'],$log_version))
{
$this->BROWSER_VER = $log_version[1];
Index: class.auth_sqlssl.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.auth_sqlssl.inc.php,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.1.2.1
diff -C2 -d -r1.4.2.1 -r1.4.2.1.2.1
*** class.auth_sqlssl.inc.php 10 Mar 2002 18:41:44 -0000 1.4.2.1
--- class.auth_sqlssl.inc.php 9 Oct 2003 08:18:44 -0000 1.4.2.1.2.1
***************
*** 42,46 ****
# Certificate (chain) verification occurs inside mod_ssl
# see http://www.modssl.org/docs/2.8/ssl_howto.html#ToC6
!
if(!isset($GLOBALS['HTTP_SERVER_VARS']['SSL_CLIENT_S_DN']))
{
# if we're not doing SSL authentication, behave
like auth_sql
--- 42,46 ----
# Certificate (chain) verification occurs inside mod_ssl
# see http://www.modssl.org/docs/2.8/ssl_howto.html#ToC6
! if(!isset($_SERVER['SSL_CLIENT_S_DN']))
{
# if we're not doing SSL authentication, behave
like auth_sql
***************
*** 52,56 ****
{
# use username only for authentication, ignore
X.509 subject in $passwd for now
! $db->query("SELECT * FROM phpgw_accounts WHERE
account_lid = '$username' AND account_status ='A'",__LINE__,__FILE__);
$db->next_record();
}
--- 52,58 ----
{
# use username only for authentication, ignore
X.509 subject in $passwd for now
! $db->query('SELECT * FROM phpgw_accounts'
! . " WHERE account_lid = '" .
$db->db_addslashes($username) . "'"
! . "AND account_status
='A'",__LINE__,__FILE__);
$db->next_record();
}
***************
*** 75,80 ****
$encrypted_passwd = md5($new_passwd);
! $GLOBALS['phpgw']->db->query("UPDATE phpgw_accounts SET
account_pwd='" . md5($new_passwd) . "',"
! . "account_lastpwd_change='" . time() . "'
WHERE account_id='" . $account_id . "'",__LINE__,__FILE__);
$GLOBALS['phpgw']->session->appsession('password','phpgwapi',$new_passwd);
--- 77,84 ----
$encrypted_passwd = md5($new_passwd);
! $GLOBALS['phpgw']->db->query('UPDATE phpgw_accounts'
! . " SET account_pwd='" .
md5($new_passwd) . "',"
! . ' account_lastpwd_change=' .
time()
! . ' WHERE account_id=' .
intval($account_id),__LINE__,__FILE__);
$GLOBALS['phpgw']->session->appsession('password','phpgwapi',$new_passwd);
***************
*** 85,95 ****
function update_lastlogin($account_id, $ip)
{
! $GLOBALS['phpgw']->db->query("SELECT account_lastlogin
FROM phpgw_accounts WHERE account_id='$account_id'",__LINE__,__FILE__);
$GLOBALS['phpgw']->db->next_record();
$this->previous_login =
$GLOBALS['phpgw']->db->f('account_lastlogin');
! $GLOBALS['phpgw']->db->query("UPDATE phpgw_accounts SET
account_lastloginfrom='"
! . "$ip', account_lastlogin='" . time()
! . "' WHERE
account_id='$account_id'",__LINE__,__FILE__);
}
}
--- 89,102 ----
function update_lastlogin($account_id, $ip)
{
! $GLOBALS['phpgw']->db->query('SELECT account_lastlogin'
! . ' FROM phpgw_accounts'
! . ' WHERE account_id=' .
intval($account_id),__LINE__,__FILE__);
$GLOBALS['phpgw']->db->next_record();
$this->previous_login =
$GLOBALS['phpgw']->db->f('account_lastlogin');
! $GLOBALS['phpgw']->db->query('UPDATE phpgw_accounts'
! . " SET account_lastloginfrom='" .
$db->db_addslashes($ip) . "',"
! . ' account_lastlogin=' . time()
! . ' WHERE account_id=' .
intval($account_id),__LINE__,__FILE__);
}
}
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.123.2.9.2.16
retrieving revision 1.123.2.9.2.17
diff -C2 -d -r1.123.2.9.2.16 -r1.123.2.9.2.17
*** class.common.inc.php 29 Sep 2003 00:13:14 -0000 1.123.2.9.2.16
--- class.common.inc.php 9 Oct 2003 08:18:44 -0000 1.123.2.9.2.17
***************
*** 195,199 ****
{
// create a array of languages the user is accepting
! $userLanguages =
explode(',',$GLOBALS['HTTP_ACCEPT_LANGUAGE']);
$supportedLanguages = $this->getInstalledLanguages();
--- 195,199 ----
{
// create a array of languages the user is accepting
! $userLanguages =
explode(',',$_SERVER['HTTP_ACCEPT_LANGUAGE']);
$supportedLanguages = $this->getInstalledLanguages();
Index: class.xmlrpc_server.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xmlrpc_server.inc.php,v
retrieving revision 1.22.4.1
retrieving revision 1.22.4.2
diff -C2 -d -r1.22.4.1 -r1.22.4.2
*** class.xmlrpc_server.inc.php 26 Mar 2003 22:55:48 -0000 1.22.4.1
--- class.xmlrpc_server.inc.php 9 Oct 2003 08:18:45 -0000 1.22.4.2
***************
*** 46,50 ****
function xmlrpc_server($dispMap='', $serviceNow=0)
{
! global $HTTP_RAW_POST_DATA;
// dispMap is a despatch array of methods
--- 46,50 ----
function xmlrpc_server($dispMap='', $serviceNow=0)
{
! global $_SERVER['RAW_POST_DATA'];
// dispMap is a despatch array of methods
***************
*** 77,82 ****
function service()
{
- global $HTTP_RAW_POST_DATA;
-
$r = $this->parseRequest();
$payload = "<?xml version=\"1.0\"?>\n" .
$this->serializeDebug() . $r->serialize();
--- 77,80 ----
***************
*** 239,247 ****
function parseRequest($data='')
{
- global $HTTP_RAW_POST_DATA;
-
if ($data == '')
{
! $data = $HTTP_RAW_POST_DATA;
}
$parser =
xml_parser_create($GLOBALS['xmlrpc_defencoding']);
--- 237,243 ----
function parseRequest($data='')
{
if ($data == '')
{
! $data = $_SERVER['RAW_POST_DATA'];
}
$parser =
xml_parser_create($GLOBALS['xmlrpc_defencoding']);
***************
*** 446,460 ****
function echoInput()
{
- global $HTTP_RAW_POST_DATA;
-
// a debugging routine: just echos back the input
// packet as a string value
! $r =
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',"'Aha said
I: '" . $HTTP_RAW_POST_DATA,'string'));
//echo $r->serialize();
$fp = fopen('/tmp/xmlrpc_debug.in','w');
fputs($fp,$r->serialize);
! fputs($fp,$HTTP_RAW_POST_DATA);
fclose($fp);
}
--- 442,454 ----
function echoInput()
{
// a debugging routine: just echos back the input
// packet as a string value
! $r =
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',"'Aha said
I: '" . $_SERVER['RAW_POST_DATA'],'string'));
//echo $r->serialize();
$fp = fopen('/tmp/xmlrpc_debug.in','w');
fputs($fp,$r->serialize);
! fputs($fp,$_SERVER['RAW_POST_DATA']);
fclose($fp);
}
Index: class.phpgw.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.phpgw.inc.php,v
retrieving revision 1.42.4.4
retrieving revision 1.42.4.5
diff -C2 -d -r1.42.4.4 -r1.42.4.5
*** class.phpgw.inc.php 29 Sep 2003 23:02:42 -0000 1.42.4.4
--- class.phpgw.inc.php 9 Oct 2003 08:18:45 -0000 1.42.4.5
***************
*** 143,153 ****
function redirect($url = '')
{
! /* global $HTTP_ENV_VARS; */
!
! $iis =
@strpos($GLOBALS['HTTP_ENV_VARS']['SERVER_SOFTWARE'], 'IIS', 0);
if ( !$url )
{
! $url = $GLOBALS['PHP_SELF'];
}
if ( $iis )
--- 143,151 ----
function redirect($url = '')
{
! $iis = @strpos($_SERVER['SERVER_SOFTWARE'], 'IIS', 0);
if ( !$url )
{
! $url = $SERVER['PHP_SELF'];
}
if ( $iis )
Index: class.menutree.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.menutree.inc.php,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -C2 -d -r1.18 -r1.18.4.1
*** class.menutree.inc.php 17 Sep 2001 00:43:35 -0000 1.18
--- class.menutree.inc.php 9 Oct 2003 08:18:44 -0000 1.18.4.1
***************
*** 51,56 ****
function showtree($treefile, $expandlevels='', $num_menus = 50,
$invisible_menus = Null)
{
! $SCRIPT_FILENAME =
$GLOBALS['HTTP_SERVER_VARS']['SCRIPT_FILENAME'];
! $REQUEST_URI =
$GLOBALS['HTTP_SERVER_VARS']['REQUEST_URI'];
$img_expand =
$GLOBALS['phpgw']->common->image('manual','tree_expand.gif');
--- 51,56 ----
function showtree($treefile, $expandlevels='', $num_menus = 50,
$invisible_menus = Null)
{
! $SCRIPT_FILENAME = $_SERVER['SCRIPT_FILENAME'];
! $REQUEST_URI = $_SERVER['REQUEST_URI'];
$img_expand =
$GLOBALS['phpgw']->common->image('manual','tree_expand.gif');
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.auth_sqlssl.inc.php, 1.4.2.1, 1.4.2.1.2.1 class.browser.inc.php, 1.14.2.2.2.2, 1.14.2.2.2.3 class.common.inc.php, 1.123.2.9.2.16, 1.123.2.9.2.17 class.graphics.inc.php, 1.5, 1.5.4.1 class.menutree.inc.php, 1.18, 1.18.4.1 class.nextmatchs.inc.php, 1.43.2.6.2.5, 1.43.2.6.2.6 class.phpgw.inc.php, 1.42.4.4, 1.42.4.5 class.soap_server.inc.php, 1.10.4.1, 1.10.4.2 class.xmlrpc_server.inc.php, 1.22.4.1, 1.22.4.2 common_functions.inc.php, 1.16.2.4, 1.16.2.5,
Dave Hall <address@hidden> <=