[Phpgroupware-cvs] CVS: phpgwapi/inc functions.inc.php,1.121.2.13.2.6,1.121.2.13.2.7

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv1624

Modified Files:
      Tag: Version-0_9_16-branch
        functions.inc.php 
Log Message:
yes, i am a doofus

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.6
retrieving revision 1.121.2.13.2.7
diff -C2 -r1.121.2.13.2.6 -r1.121.2.13.2.7
*** functions.inc.php   18 May 2003 10:01:58 -0000      1.121.2.13.2.6
--- functions.inc.php   18 May 2003 10:16:51 -0000      1.121.2.13.2.7
***************
*** 96,100 ****
        $GLOBALS['logindomain'] = @$_POST['logindomain'];
  
!       $domain = get_var('domain', array('GET', 'COOKIE', 'POST'), FALSE);
  
        /* This code will handle virtdomains so that is a user logins with 
address@hidden, it will switch into virtualization mode. */
--- 96,100 ----
        $GLOBALS['logindomain'] = @$_POST['logindomain'];
  
!       $domain = get_var('domain', array('GET', 'COOKIE'), FALSE);
  
        /* This code will handle virtdomains so that is a user logins with 
address@hidden, it will switch into virtualization mode. */
***************
*** 103,116 ****
                $GLOBALS['phpgw_info']['user']['domain'] = $domain;
        }
!       elseif (isset($_POST['login']) && isset($_COOKIE['logindomain']))
        {
                if (!ereg ("\@", $GLOBALS['login']))
                {
!                       $GLOBALS['login'] = $_POST['login'] . '@' . 
$_COOKIE['logindomain'];
                }
!               $GLOBALS['phpgw_info']['user']['domain'] = 
$_COOKIE['logindomain'];
                unset ($_POST['logindomain']);
        }
!       elseif (isset($_POST['login']) && !isset($COOKIE['logindomain']))
        {
                if (ereg ("\@", $GLOBALS['login']))
--- 103,116 ----
                $GLOBALS['phpgw_info']['user']['domain'] = $domain;
        }
!       elseif (isset($_POST['login']) && isset($_POST['logindomain']))
        {
                if (!ereg ("\@", $GLOBALS['login']))
                {
!                       $GLOBALS['login'] = $_POST['login'] . '@' . 
$_POST['logindomain'];
                }
!               $GLOBALS['phpgw_info']['user']['domain'] = 
$_POST['logindomain'];
                unset ($_POST['logindomain']);
        }
!       elseif (isset($_POST['login']) && !isset($POST['logindomain']))
        {
                if (ereg ("\@", $GLOBALS['login']))