extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 13:41:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

now uses the class var only as a default for the app part of the URL

Browse Source
This commit is contained in:
Miles Lott 2001-10-22 21:13:11 +00:00
parent b673d7c52c
commit 9bebfc89c4
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
phpgwapi/inc/class.interserver.inc.php
View File

@ -131,6 +131,25 @@
{ {
preg_match('/^(.*?\/\/.*?)(\/.*)/',$url,$matches); preg_match('/^(.*?\/\/.*?)(\/.*)/',$url,$matches);
$hostpart = $matches[1]; $hostpart = $matches[1];
$hostpart = ereg_replace('https://','',$hostpart);
$hostpart = ereg_replace('http://','',$hostpart);
switch($this->mode)
{
case 'soap':
if(!ereg('soap.php',$matches[2]))
{
$matches[2] .= $this->urlparts['soap'];
}
break;
case 'xmlrpc':
if(!ereg('xmlrpc.php',$matches[2]))
{
$matches[2] .= $this->urlparts['xmlrpc'];
}
break;
default:
break;
}
$uri = $matches[2]; $uri = $matches[2];
return array($uri,$hostpart); return array($uri,$hostpart);
} }
@ -138,8 +157,6 @@
function _send_xmlrpc_ssl($method_name, $args, $url, $debug=True) function _send_xmlrpc_ssl($method_name, $args, $url, $debug=True)
{ {
list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['xmlrpc']); list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['xmlrpc']);
$hostpart = ereg_replace('https://','',$hostpart);
$hostpart = ereg_replace('http://','',$hostpart);
if(gettype($args) != 'array') if(gettype($args) != 'array')
{ {
$arr[] = CreateObject('phpgwapi.xmlrpcval',$args,'string'); $arr[] = CreateObject('phpgwapi.xmlrpcval',$args,'string');
@ -192,8 +209,6 @@
function _send_xmlrpc_($method_name, $args, $url, $debug=True) function _send_xmlrpc_($method_name, $args, $url, $debug=True)
{ {
list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['xmlrpc']); list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['xmlrpc']);
$hostpart = ereg_replace('https://','',$hostpart);
$hostpart = ereg_replace('http://','',$hostpart);
if(gettype($args) != 'array') if(gettype($args) != 'array')
{ {
$arr[] = CreateObject('phpgwapi.xmlrpcval',$args,'string'); $arr[] = CreateObject('phpgwapi.xmlrpcval',$args,'string');
@ -248,8 +263,6 @@
{ {
$method_name = str_replace('.','_',$method_name); $method_name = str_replace('.','_',$method_name);
list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['soap']); list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['soap']);
$hostpart = ereg_replace('https://','',$hostpart);
$hostpart = ereg_replace('http://','',$hostpart);
if(gettype($args) != 'array') if(gettype($args) != 'array')
{ {
$arr[] = CreateObject('phpgwapi.soapval','','string',$args); $arr[] = CreateObject('phpgwapi.soapval','','string',$args);
@ -295,8 +308,6 @@
{ {
// $method_name = str_replace('.','_',$method_name); // $method_name = str_replace('.','_',$method_name);
list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['soap']); list($uri,$hostpart) = $this->_split_url($url . $this->urlparts['soap']);
$hostpart = ereg_replace('https://','',$hostpart);
$hostpart = ereg_replace('http://','',$hostpart);
$this->build_request($args); $this->build_request($args);
/* /*
if(gettype($args) != 'array') if(gettype($args) != 'array')
@ -612,6 +623,7 @@
return False; return False;
} }
/* TODO - Determine trust level here */
function auth($serverdata='') function auth($serverdata='')
{ {
if(!$serverdata || gettype($serverdata) != 'array') if(!$serverdata || gettype($serverdata) != 'array')