extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 12:51:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Undo oops in session->verify_server() and make soap auth/verify work

Browse Source
This commit is contained in:
Miles Lott 2001-08-18 21:32:22 +00:00
parent dc7ad12eeb
commit b2ef2fb0e5
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,9 +228,9 @@
if($r = $soap->send($soap_message,$method_name)) if($r = $soap->send($soap_message,$method_name))
{ {
$this->debug('<hr>I got this value back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug); $this->debug('<hr>I got this value back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
/* _debug_array($soap); */ $v = $r->decode();
/* echo $soap->debug_str; */ $this->result = $v['return'];
return $r; return $v;
} }
else else
{ {
@ -255,9 +255,9 @@
if($r = $soap->send($soap_message,$method_name)) if($r = $soap->send($soap_message,$method_name))
{ {
$this->debug('<hr>I got this value back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug); $this->debug('<hr>I got this value back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
/* _debug_array($soap); */ $v = $r->decode();
/* echo $soap->debug_str; */ $this->result = $v['return'];
return $r; return $v;
} }
else else
{ {

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

@ -353,7 +353,7 @@
$phpgw_info['user']['account_id'] = $this->account_id; $phpgw_info['user']['account_id'] = $this->account_id;
//$this->read_repositories(@$phpgw_info['server']['cache_phpgw_info']); $this->read_repositories(@$phpgw_info['server']['cache_phpgw_info']);
$phpgw_info['user'] = $this->user; $phpgw_info['user'] = $this->user;
$phpgw_info['hooks'] = $this->hooks; $phpgw_info['hooks'] = $this->hooks;

20
phpgwapi/inc/soap_functions.inc.php
View File

@ -85,13 +85,15 @@
} }
else else
{ {
$rtrn = array(CreateObject('phpgwapi.soapval','GOAWAY','string','XOXO')); $rtrn = array(
CreateObject('phpgwapi.soapval','GOAWAY','string','XOXO')
);
} }
$r = CreateObject('phpgwapi.soapmsg','system_authResponse',$rtrn); //$r = CreateObject('phpgwapi.soapmsg','system_authResponse',$rtrn);
return $r; return $rtrn;
} }
function _soap_auth_verify($m1,$m2,$m3) function system_auth_verify($m1,$m2,$m3)
{ {
$server_name = $m1; $server_name = $m1;
$sessionid = $m2; $sessionid = $m2;
@ -102,14 +104,16 @@
if($verified) if($verified)
{ {
$rtrn = array( $rtrn = array(
CreateObject('phpgwapi.xmlrpcval','HELO','string',$sessionid) CreateObject('phpgwapi.soapval','HELO','string',$sessionid)
); );
} }
else else
{ {
$rtrn = array(CreateObject('phpgwapi.soapval','GOAWAY','string','XOXO')); $rtrn = array(
CreateObject('phpgwapi.soapval','GOAWAY','string','XOXO')
);
} }
$r = CreateObject('phpgwapi.soapmsg','system_auth_verifyResponse',$rtrn); //$r = CreateObject('phpgwapi.soapmsg','system_auth_verifyResponse',$rtrn);
return $r; return $rtrn;
} }
?> ?>