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

[Dave Hall <address@hidden>]

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

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

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.121.2.13.2.4
retrieving revision 1.121.2.13.2.5
diff -C2 -r1.121.2.13.2.4 -r1.121.2.13.2.5
*** functions.inc.php   5 May 2003 19:02:32 -0000       1.121.2.13.2.4
--- functions.inc.php   18 May 2003 06:22:15 -0000      1.121.2.13.2.5
***************
*** 32,36 ****
        if (floor(phpversion()) == 3)
        {
!               include(PHPGW_API_INC.'/php3_support_functions.inc.php');
        }
  
--- 32,38 ----
        if (floor(phpversion()) == 3)
        {
!               echo 'phpGroupWare now requires PHP 4.1 or greater.<br>';
!               echo 'Please conctact your System Administrator';
!               exit;
        }
  
***************
*** 90,95 ****
        unset ($default_domain); // we kill this for security reasons
  
!       $GLOBALS['login'] = @$GLOBALS['HTTP_POST_VARS']['login'];
!       $GLOBALS['logindomain'] = @$GLOBALS['HTTP_POST_VARS']['logindomain'];
  
        /* This code will handle virtdomains so that is a user logins with 
address@hidden, it will switch into virtualization mode. */
--- 92,97 ----
        unset ($default_domain); // we kill this for security reasons
  
!       $GLOBALS['login'] = @$_POST['login'];
!       $GLOBALS['logindomain'] = @$_POST['logindomain'];
  
        /* This code will handle virtdomains so that is a user logins with 
address@hidden, it will switch into virtualization mode. */
***************
*** 144,148 ****
        unset ($domain); // we kill this to save memory
  
!       print_debug('domain',$GLOBALS['phpgw_info']['user']['domain'],'api');
  
         
/****************************************************************************\
--- 146,150 ----
        unset ($domain); // we kill this to save memory
  
!       print_debug('domain',@$GLOBALS['phpgw_info']['user']['domain'],'api');
  
         
/****************************************************************************\
***************
*** 220,224 ****
        if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && !$HTTPS)
        {
!               Header('Location: https://' . 
$GLOBALS['phpgw_info']['server']['hostname'] . 
$GLOBALS['phpgw_info']['server']['webserver_url'] . $REQUEST_URI);
                exit;
        }
--- 222,226 ----
        if(@isset($GLOBALS['phpgw_info']['server']['enforce_ssl']) && !$HTTPS)
        {
!               Header('Location: https://' . 
$GLOBALS['phpgw_info']['server']['hostname'] . 
$GLOBALS['phpgw_info']['server']['webserver_url'] . $_SERVER['REQUEST_URI']);
                exit;
        }
***************
*** 271,277 ****
                if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'login')
                {
!                       if (@$login != '')
                        {
!                               $login_array = explode("@",$login);
                                print_debug('LID',$login_array[0],'app');
                                $login_id = 
$GLOBALS['phpgw']->accounts->name2id($login_array[0]);
--- 273,279 ----
                if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'login')
                {
!                       if (@$_POST['login'] != '')
                        {
!                               $login_array = explode("@",$_POST['login']);
                                print_debug('LID',$login_array[0],'app');
                                $login_id = 
$GLOBALS['phpgw']->accounts->name2id($login_array[0]);
***************
*** 446,450 ****
                
\*************************************************************************/
                /* Then the include file */
!               if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && 
file_exists(PHPGW_APP_INC . '/functions.inc.php') && 
!isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
                {
                        include(PHPGW_APP_INC . '/functions.inc.php');
--- 448,452 ----
                
\*************************************************************************/
                /* Then the include file */
!               if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && 
file_exists(PHPGW_APP_INC . '/functions.inc.php') && 
!isset($_GET['menuaction']))
                {
                        include(PHPGW_APP_INC . '/functions.inc.php');