holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional fix to rollback to phpgw_info array for this branch

Browse Source
This commit is contained in:
Miles Lott 2005-08-18 12:43:53 +00:00
parent 6be6611f92
commit 4d53018b08
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpgwapi/inc/class.xmlrpc_client.inc.php
View File

@ -149,7 +149,7 @@
$op = 'POST ' . $this->path . " HTTP/1.0\r\nUser-Agent: PHP XMLRPC 2.0\r\n" $op = 'POST ' . $this->path . " HTTP/1.0\r\nUser-Agent: PHP XMLRPC 2.0\r\n"
. 'Host: '. $this->server . "\r\n" . 'Host: '. $this->server . "\r\n"
. 'X-EGW-Server: ' . $this->server . ' ' . "\r\n" . 'X-EGW-Server: ' . $this->server . ' ' . "\r\n"
. 'X-EGW-Version: ' . $GLOBALS['egw_info']['server']['versions']['phpgwapi'] . "\r\n" . 'X-EGW-Version: ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'] . "\r\n"
. $credentials . $credentials
. "Content-Type: text/xml\r\nContent-Length: " . "Content-Type: text/xml\r\nContent-Length: "
. strlen($msg->payload) . "\r\n\r\n" . strlen($msg->payload) . "\r\n\r\n"
@ -211,7 +211,7 @@
// return the header too // return the header too
curl_setopt($curl, CURLOPT_HTTPHEADER, array( curl_setopt($curl, CURLOPT_HTTPHEADER, array(
'X-EGW-Server: ' . $this->server, 'X-EGW-Server: ' . $this->server,
'X-EGW-Version: ' . $GLOBALS['egw_info']['server']['versions']['phpgwapi'], 'X-EGW-Version: ' . $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
'Content-Type: text/xml' 'Content-Type: text/xml'
)); ));
if ($timeout) if ($timeout)

6
phpgwapi/inc/class.xmlrpc_server.inc.php
View File

@ -170,8 +170,8 @@
} }
} }
if(empty($GLOBALS['egw_info']['server']['xmlrpc_type'])) if(empty($GLOBALS['phpgw_info']['server']['xmlrpc_type']))
{ {
$GLOBALS['egw_info']['server']['xmlrpc_type'] = 'php'; $GLOBALS['phpgw_info']['server']['xmlrpc_type'] = 'php';
} }
include_once(PHPGW_API_INC.SEP.'class.xmlrpc_server_' . $GLOBALS['egw_info']['server']['xmlrpc_type'] . '.inc.php'); include_once(PHPGW_API_INC.SEP.'class.xmlrpc_server_' . $GLOBALS['phpgw_info']['server']['xmlrpc_type'] . '.inc.php');

2
phpgwapi/inc/class.xmlrpc_server_epi.inc.php
View File

@ -69,7 +69,7 @@
{ {
$fp = fopen($this->log,'a+'); $fp = fopen($this->log,'a+');
fwrite($fp,"\n\n" . date('Y-m-d H:i:s') . " authorized=" fwrite($fp,"\n\n" . date('Y-m-d H:i:s') . " authorized="
. ($this->authed ? $GLOBALS['egw_info']['user']['account_lid'] : 'False') . ($this->authed ? $GLOBALS['phpgw_info']['user']['account_lid'] : 'False')
. ", method='$this->last_method'\n"); . ", method='$this->last_method'\n");
fwrite($fp,"==== GOT ============================\n" . $GLOBALS['HTTP_RAW_POST_DATA'] fwrite($fp,"==== GOT ============================\n" . $GLOBALS['HTTP_RAW_POST_DATA']
. "\n==== RETURNED =======================\n"); . "\n==== RETURNED =======================\n");

2
phpgwapi/inc/class.xmlrpc_server_php.inc.php
View File

@ -101,7 +101,7 @@
{ {
$fp = fopen($this->log,'a+'); $fp = fopen($this->log,'a+');
fwrite($fp,"\n\n".date('Y-m-d H:i:s') . " authorized=" fwrite($fp,"\n\n".date('Y-m-d H:i:s') . " authorized="
. ($this->authed?$GLOBALS['egw_info']['user']['account_lid']:'False') . ($this->authed?$GLOBALS['phpgw_info']['user']['account_lid']:'False')
. ", method='$this->last_method'\n"); . ", method='$this->last_method'\n");
fwrite($fp,"==== GOT ============================\n" . $GLOBALS['HTTP_RAW_POST_DATA'] fwrite($fp,"==== GOT ============================\n" . $GLOBALS['HTTP_RAW_POST_DATA']
. "\n==== RETURNED =======================\n"); . "\n==== RETURNED =======================\n");

2
phpgwapi/inc/xml_functions.inc.php
View File

@ -893,7 +893,7 @@
$GLOBALS['_xmlrpcs_phpgw_api_version_doc'] = 'Returns the eGroupWare API version'; $GLOBALS['_xmlrpcs_phpgw_api_version_doc'] = 'Returns the eGroupWare API version';
function _xmlrpcs_phpgw_api_version($server,$m) function _xmlrpcs_phpgw_api_version($server,$m)
{ {
$version = $GLOBALS['egw_info']['server']['versions']['phpgwapi']; $version = $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
return CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$version,'string')); return CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',$version,'string'));
} }