From f91ca87aef6a5bf4eb27e7ede8456b96b04ece16 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Mon, 27 Aug 2001 09:42:33 +0000
Subject: [PATCH] Login now attempts to create session based on existence of
server_name OR domain in the request.
---
phpgwapi/inc/xml_functions.inc.php | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/phpgwapi/inc/xml_functions.inc.php b/phpgwapi/inc/xml_functions.inc.php
index c84995a219..9e4da0878c 100644
--- a/phpgwapi/inc/xml_functions.inc.php
+++ b/phpgwapi/inc/xml_functions.inc.php
@@ -681,22 +681,22 @@
{
$server_name = $data['server_name']->scalarval();
}
+ if($data['domain'])
+ {
+ $domain = $data['domain']->scalarval();
+ }
$username = $data['username']->scalarval();
$password = $data['password']->scalarval();
- $sparts = explode('.',$server_name);
- if($sparts[1])
+ if($server_name)
{
- /* we were passed an FQDN */
list($sessionid,$kp3) = $GLOBALS['phpgw']->session->create_server($username.'@'.$server_name,$password);
}
else
{
- /* possible phpgw domain */
- /* Milosch - jengo, does this make sense? */
- if($server_name)
+ if($domain)
{
- $user = $username.'@'.$server_name;
+ $user = $username.'@'.$domain;
}
else
{
@@ -704,10 +704,12 @@
}
$sessionid = $GLOBALS['phpgw']->session->create($user,$password);
$kp3 = $GLOBALS['phpgw']->session->kp3;
+ $domain = $GLOBALS['phpgw']->session->account_domain;
}
if($sessionid && $kp3)
{
+ $rtrn['domain'] = CreateObject('phpgwapi.xmlrpcval',$domain,'string');
$rtrn['sessionid'] = CreateObject('phpgwapi.xmlrpcval',$sessionid,'string');
$rtrn['kp3'] = CreateObject('phpgwapi.xmlrpcval',$kp3,'string');
}