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

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        functions.inc.php 
Log Message:
a fix for a fix of a fix of a fix of a ....

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.7
retrieving revision 1.121.2.13.2.8
diff -C2 -r1.121.2.13.2.7 -r1.121.2.13.2.8
*** functions.inc.php   18 May 2003 10:16:51 -0000      1.121.2.13.2.7
--- functions.inc.php   18 May 2003 10:23:51 -0000      1.121.2.13.2.8
***************
*** 26,31 ****
        
        
/****************************************************************************\
!       * If running in PHP3, then load up the support functions file for       
     *
!       * transparent support.                                                  
     *
        
\****************************************************************************/
  
--- 26,30 ----
        
        
/****************************************************************************\
!       * If running in PHP3, then force admin to upgrade                       
     *
        
\****************************************************************************/
  
***************
*** 80,84 ****
        * 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 */
--- 79,82 ----
***************
*** 105,109 ****
        elseif (isset($_POST['login']) && isset($_POST['logindomain']))
        {
!               if (!ereg ("\@", $GLOBALS['login']))
                {
                        $GLOBALS['login'] = $_POST['login'] . '@' . 
$_POST['logindomain'];
--- 103,107 ----
        elseif (isset($_POST['login']) && isset($_POST['logindomain']))
        {
!               if (!ereg ("\@", $_POST['login']))
                {
                        $GLOBALS['login'] = $_POST['login'] . '@' . 
$_POST['logindomain'];
***************
*** 114,118 ****
        elseif (isset($_POST['login']) && !isset($POST['logindomain']))
        {
!               if (ereg ("\@", $GLOBALS['login']))
                {
                        $login_array = explode('@', $_POST['login']);
--- 112,116 ----
        elseif (isset($_POST['login']) && !isset($POST['logindomain']))
        {
!               if (ereg ("\@", $_POST['login']))
                {
                        $login_array = explode('@', $_POST['login']);