[Fmsystem-commits] [6646] Login: change domain on the fly

[Sigurd Nes]

Revision: 6646
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6646
Author:   sigurdne
Date:     2010-12-06 14:02:34 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
Login: change domain on the fly

Modified Paths:
--------------
    trunk/login.php
    trunk/phpgwapi/setup/phpgw_no.lang

Modified: trunk/login.php
===================================================================
--- trunk/login.php     2010-12-06 12:25:26 UTC (rev 6645)
+++ trunk/login.php     2010-12-06 14:02:34 UTC (rev 6646)
@@ -177,13 +177,18 @@
                        $login .= "@{$logindomain}";
                }
 
+               $receipt = array();
                if ( isset($GLOBALS['phpgw_info']['server']['usecookies'])
                        && $GLOBALS['phpgw_info']['server']['usecookies'] )
                {
                        if(isset($_COOKIE['domain']) && $_COOKIE['domain'] != 
$logindomain)
                        {
-                               
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", array('cd' =>22)); // 
already within a session
-                               exit;
+                               
$GLOBALS['phpgw']->session->phpgw_setcookie('kp3');
+                               
$GLOBALS['phpgw']->session->phpgw_setcookie('domain');
+//                             
$GLOBALS['phpgw']->redirect_link("/{$partial_url}", array('cd' =>22)); // 
already within a session
+//                             exit;
+
+                               $receipt['message'][]=array('msg'=> lang('Info: 
you have changed domain from "%1" to "%2"' ,$_COOKIE['domain'],$logindomain));
                        }
                }
 
@@ -202,6 +207,11 @@
                        exit;
                }
 
+               if($receipt)
+               {
+                       phpgwapi_cache::session_set('phpgwapi', 
'phpgw_messages', $receipt);
+               }
+
                $forward = phpgw::get_var('phpgw_forward');
                if($forward)
                {

Modified: trunk/phpgwapi/setup/phpgw_no.lang
===================================================================
--- trunk/phpgwapi/setup/phpgw_no.lang  2010-12-06 12:25:26 UTC (rev 6645)
+++ trunk/phpgwapi/setup/phpgw_no.lang  2010-12-06 14:02:34 UTC (rev 6646)
@@ -128,3 +128,4 @@
 use a valid username and password to gain access to %1 login   no      Angi et 
gyldig brukernavn og passord for få tilgang til %1
 version        common  no      versjon
 you have been successfully logged out  login   no      Du har nå logget ut
+Info: you have changed domain from "%1" to "%2"        login   no      
Informasjon: Du har endret domene fra "%1" til "%2"