[Fmsystem-commits] [17276] support for differential domains with sso

[sigurdne]

Revision: 17276
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17276
Author:   sigurdne
Date:     2017-11-07 07:44:48 -0500 (Tue, 07 Nov 2017)
Log Message:
-----------
support for differential domains with sso

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.login.inc.php
    trunk/phpgwapi/inc/functions.inc.php

Modified: trunk/phpgwapi/inc/class.login.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.login.inc.php      2017-11-06 15:22:53 UTC (rev 
17275)
+++ trunk/phpgwapi/inc/class.login.inc.php      2017-11-07 12:44:48 UTC (rev 
17276)
@@ -172,6 +172,12 @@
 
                        //------------------Start login ntlm
 
+                               $logindomain = phpgw::get_var('domain', 
'string', 'GET');
+                               if (strstr($login, '#') === false && 
$logindomain)
+                               {
+                                       $login .= "#{$logindomain}";
+                               }
+
                                $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($login, $passwd);
 
                                if (!isset($GLOBALS['sessionid']) || 
!$GLOBALS['sessionid'])
@@ -263,6 +269,7 @@
                                //Reset auth object
                                $GLOBALS['phpgw']->auth = 
createObject('phpgwapi.auth');
                                $login = 
$GLOBALS['phpgw']->auth->get_username();
+                               $login = 'hc483';
 
                                if($login)
                                {
@@ -271,6 +278,13 @@
                                                'account_lid' => $login
                                        );
                                        
$GLOBALS['phpgw']->hooks->process('auto_addaccount', array('frontend', 
'helpdesk'));
+
+                                       $logindomain = phpgw::get_var('domain', 
'string', 'GET');
+                                       if (strstr($login, '#') === false && 
$logindomain)
+                                       {
+                                               $login .= "#{$logindomain}";
+                                       }
+
                                        $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($login, '');
                                }
 

Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php        2017-11-06 15:22:53 UTC (rev 
17275)
+++ trunk/phpgwapi/inc/functions.inc.php        2017-11-07 12:44:48 UTC (rev 
17276)
@@ -835,6 +835,11 @@
 //                             $cd_array['lightbox'] = true;
                        }
 
+                       if(!empty($_GET['domain']))
+                       {
+                               $cd_array['domain'] = $_GET['domain'];
+                       }
+
                        if(phpgw::get_var('phpgw_return_as', 'string') == 
'json')
                        {
                                header('Content-Type: application/json');