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

Login now attempts to create session based on existence of server_name OR domain in

Browse Source 
the request.
This commit is contained in:
Miles Lott 2001-08-27 09:42:33 +00:00
parent 878aae8025
commit f91ca87aef
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -681,22 +681,22 @@
{ {
$server_name = $data['server_name']->scalarval(); $server_name = $data['server_name']->scalarval();
} }
if($data['domain'])
{
$domain = $data['domain']->scalarval();
}
$username = $data['username']->scalarval(); $username = $data['username']->scalarval();
$password = $data['password']->scalarval(); $password = $data['password']->scalarval();
$sparts = explode('.',$server_name); if($server_name)
if($sparts[1])
{ {
/* we were passed an FQDN */
list($sessionid,$kp3) = $GLOBALS['phpgw']->session->create_server($username.'@'.$server_name,$password); list($sessionid,$kp3) = $GLOBALS['phpgw']->session->create_server($username.'@'.$server_name,$password);
} }
else else
{ {
/* possible phpgw domain */ if($domain)
/* Milosch - jengo, does this make sense? */
if($server_name)
{ {
$user = $username.'@'.$server_name; $user = $username.'@'.$domain;
} }
else else
{ {
@ -704,10 +704,12 @@
} }
$sessionid = $GLOBALS['phpgw']->session->create($user,$password); $sessionid = $GLOBALS['phpgw']->session->create($user,$password);
$kp3 = $GLOBALS['phpgw']->session->kp3; $kp3 = $GLOBALS['phpgw']->session->kp3;
$domain = $GLOBALS['phpgw']->session->account_domain;
} }
if($sessionid && $kp3) if($sessionid && $kp3)
{ {
$rtrn['domain'] = CreateObject('phpgwapi.xmlrpcval',$domain,'string');
$rtrn['sessionid'] = CreateObject('phpgwapi.xmlrpcval',$sessionid,'string'); $rtrn['sessionid'] = CreateObject('phpgwapi.xmlrpcval',$sessionid,'string');
$rtrn['kp3'] = CreateObject('phpgwapi.xmlrpcval',$kp3,'string'); $rtrn['kp3'] = CreateObject('phpgwapi.xmlrpcval',$kp3,'string');
} }