[Phpgroupware-cvs] CVS: phpgroupware login.php,1.76.2.4.2.7,1.76.2.4.2.8

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgroupware
In directory subversions:/tmp/cvs-serv6585

Modified Files:
      Tag: Version-0_9_16-branch
        login.php 
Log Message:
got multidomain-login (with and without domain-selectbox) finaly working for 
register_globals off

Index: login.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/login.php,v
retrieving revision 1.76.2.4.2.7
retrieving revision 1.76.2.4.2.8
diff -C2 -r1.76.2.4.2.7 -r1.76.2.4.2.8
*** login.php   18 May 2003 09:37:07 -0000      1.76.2.4.2.7
--- login.php   18 May 2003 14:04:22 -0000      1.76.2.4.2.8
***************
*** 80,93 ****
        }
  
-       function show_cookie()
-       {
-               global $code, $last_loginid, $login;
-               /* This needs to be this way, because if someone doesnt want to 
use cookies, we shouldnt sneak one in */
-               if ($_GET['cd'] != 5 && $_GET['cd'] != 99 && 
(isset($GLOBALS['phpgw_info']['server']['usecookies']) && 
$GLOBALS['phpgw_info']['server']['usecookies']))
-               {
-                       return $_COOKIE['last_loginid'];
-               }
-       }
- 
        function check_logoutcode($code)
        {
--- 80,83 ----
***************
*** 223,227 ****
                        
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','code=5'));
                }
!               $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($_POST['login'],$_POST['passwd'],$_POST['passwd_type']);
  
                if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
--- 213,222 ----
                        
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/login.php','code=5'));
                }
!               $login = $_POST['login'];
!               if (strstr($login,'@') === False && 
isset($_POST['logindomain']))
!               {
!                       $login .= '@' . $_POST['logindomain'];
!               }
!               $GLOBALS['sessionid'] = 
$GLOBALS['phpgw']->session->create($login,$_POST['passwd'],$_POST['passwd_type']);
  
                if (! isset($GLOBALS['sessionid']) || ! $GLOBALS['sessionid'])
***************
*** 243,247 ****
                        check_langs();
                        
!                       
$GLOBALS['phpgw']->redirect($GLOBALS['phpgw']->link('/home.php','cd=yes' . 
$extra_vars));
                }
        }
--- 238,242 ----
                        check_langs();
                        
!                       $GLOBALS['phpgw']->redirect_link('/home.php','cd=yes' . 
$extra_vars);
                }
        }
***************
*** 265,274 ****
                        }
                        #print 'LANG:' . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] . '<br>';
-                       $GLOBALS['phpgw']->translation->add_app('login');
-                       $GLOBALS['phpgw']->translation->add_app('loginscreen');
-                       if (lang('loginscreen_message') != 
'loginscreen_message*')
-                       {
-                               
$tmpl->set_var('lang_message',stripslashes(lang('loginscreen_message')));
-                       }
                }
                else
--- 260,263 ----
***************
*** 277,304 ****
                        // Change this if you need.
                        
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = 'en';
!                       $GLOBALS['phpgw']->translation->add_app('login');
!                       $GLOBALS['phpgw']->translation->add_app('loginscreen');
!                       if (lang('loginscreen_message') != 
'loginscreen_message*')
!                       {
!                               
$tmpl->set_var('lang_message',stripslashes(lang('loginscreen_message')));
!                       }
                }
        }
  
!       //is this really needed?? skwashd 16-May-2003
!       if (!isset($_GET['cd']) || !$_GET['cd'])
!       {
!               $_GET['cd'] = '';
!       }
! 
        if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
        {
!               reset($phpgw_domain);
!               unset($domain_select);      // For security ... just in case
!               foreach($phpgw_domain as $domain_name => $domain_vars)
                {       
                        $domain_select .= '<option value="' . $domain_name . 
'"';
  
!                       if ($domain_name == $_POST['last_domain'])
                        {
                                $domain_select .= ' selected';
--- 266,287 ----
                        // Change this if you need.
                        
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = 'en';
!               }
!               $GLOBALS['phpgw']->translation->add_app('login');
!               $GLOBALS['phpgw']->translation->add_app('loginscreen');
!               if (lang('loginscreen_message') != 'loginscreen_message*')
!               {
!                       
$tmpl->set_var('lang_message',stripslashes(lang('loginscreen_message')));
                }
        }
  
!       $last_loginid = $_COOKIE['last_loginid'];
        if ($GLOBALS['phpgw_info']['server']['show_domain_selectbox'])
        {
!               $domain_select = '';      // For security ... just in case
!               foreach($GLOBALS['phpgw_domain'] as $domain_name => 
$domain_vars)
                {       
                        $domain_select .= '<option value="' . $domain_name . 
'"';
  
!                       if ($domain_name == $_COOKIE['last_domain'])
                        {
                                $domain_select .= ' selected';
***************
*** 308,311 ****
--- 291,303 ----
                $tmpl->set_var('select_domain',$domain_select);
        }
+       elseif ($last_loginid !== '')
+       {
+               reset($GLOBALS['phpgw_domain']);
+               list($default_domain) = each($GLOBALS['phpgw_domain']);
+               if ($_COOKIE['last_domain'] != $default_domain)
+               {
+                       $last_loginid .= '@' . $_COOKIE['last_domain'];
+               }
+       }
  
        while (list($name,$value) = each($_GET))
***************
*** 326,330 ****
        
$tmpl->set_var('version',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
        $tmpl->set_var('cd',check_logoutcode($_GET['cd']));
!       $tmpl->set_var('cookie',show_cookie());
  
        $tmpl->set_var('lang_username',lang('username'));
--- 318,322 ----
        
$tmpl->set_var('version',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
        $tmpl->set_var('cd',check_logoutcode($_GET['cd']));
!       $tmpl->set_var('cookie',$last_loginid);
  
        $tmpl->set_var('lang_username',lang('username'));