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

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        functions.inc.php 
Log Message:
fix for multidomain support w/reg_globals = off

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.5
retrieving revision 1.121.2.13.2.6
diff -C2 -r1.121.2.13.2.5 -r1.121.2.13.2.6
*** functions.inc.php   18 May 2003 06:22:15 -0000      1.121.2.13.2.5
--- functions.inc.php   18 May 2003 10:01:58 -0000      1.121.2.13.2.6
***************
*** 33,37 ****
        {
                echo 'phpGroupWare now requires PHP 4.1 or greater.<br>';
!               echo 'Please conctact your System Administrator';
                exit;
        }
--- 33,37 ----
        {
                echo 'phpGroupWare now requires PHP 4.1 or greater.<br>';
!               echo 'Please contact your System Administrator';
                exit;
        }
***************
*** 80,84 ****
        * Multi-Domain support                                                  
     *
        
\****************************************************************************/
! 
        /* make them fix their header */
        if (!isset($GLOBALS['phpgw_domain']))
--- 80,85 ----
        * Multi-Domain support                                                  
     *
        
\****************************************************************************/
!       //this really can be done better ... maybe i will come back to it - 
skwashd 18-May-2003
!       
        /* make them fix their header */
        if (!isset($GLOBALS['phpgw_domain']))
***************
*** 95,98 ****
--- 96,101 ----
        $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. */
        if (isset($domain) && $domain)
***************
*** 100,117 ****
                $GLOBALS['phpgw_info']['user']['domain'] = $domain;
        }
!       elseif (isset($GLOBALS['login']) && isset($GLOBALS['logindomain']))
        {
                if (!ereg ("\@", $GLOBALS['login']))
                {
!                       $GLOBALS['login'] = $GLOBALS['login'] . '@' . 
$GLOBALS['logindomain'];
                }
!               $GLOBALS['phpgw_info']['user']['domain'] = 
$GLOBALS['logindomain'];
!               unset ($GLOBALS['logindomain']);
        }
!       elseif (isset($GLOBALS['login']) && !isset($GLOBALS['logindomain']))
        {
                if (ereg ("\@", $GLOBALS['login']))
                {
!                       $login_array = explode('@', $GLOBALS['login']);
                        $GLOBALS['phpgw_info']['user']['domain'] = 
$login_array[1];
                }
--- 103,120 ----
                $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']))
                {
!                       $login_array = explode('@', $_POST['login']);
                        $GLOBALS['phpgw_info']['user']['domain'] = 
$login_array[1];
                }
***************
*** 119,123 ****
                {
                        $GLOBALS['phpgw_info']['user']['domain'] = 
$GLOBALS['phpgw_info']['server']['default_domain'];
!                       $GLOBALS['login'] = $GLOBALS['login'] . '@' . 
$GLOBALS['phpgw_info']['user']['domain'];
                }
        }
--- 122,126 ----
                {
                        $GLOBALS['phpgw_info']['user']['domain'] = 
$GLOBALS['phpgw_info']['server']['default_domain'];
!                       $GLOBALS['login'] = $_POST['login'] . '@' . 
$GLOBALS['phpgw_info']['user']['domain'];
                }
        }