phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] CVS: phpgwapi/inc functions.inc.php,1.148,1.149 commo


From: Miles Lott <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgwapi/inc functions.inc.php,1.148,1.149 common_functions.inc.php,1.10,1.11
Date: Tue, 20 Aug 2002 08:41:50 -0400

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

Modified Files:
        functions.inc.php common_functions.inc.php 
Log Message:
Remove stray whitespace



Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -r1.148 -r1.149
*** functions.inc.php   20 Jul 2002 13:16:33 -0000      1.148
--- functions.inc.php   20 Aug 2002 12:41:48 -0000      1.149
***************
*** 5,9 ****
         * and Joseph Engo <address@hidden>                                 *
         * Has a few functions, but primary role is to load the phpgwapi        
    *
!        * Copyright (C) 2000, 2001, 2002 Dan Kuykendall                        
          *
         * 
-------------------------------------------------------------------------*
         * This library is part of the phpGroupWare API                         
    *
--- 5,9 ----
         * and Joseph Engo <address@hidden>                                 *
         * Has a few functions, but primary role is to load the phpgwapi        
    *
!        * Copyright (C) 2000, 2001, 2002 Dan Kuykendall                        
    *
         * 
-------------------------------------------------------------------------*
         * This library is part of the phpGroupWare API                         
    *
***************
*** 222,226 ****
                        {
                                $cache_query = "DELETE FROM phpgw_app_sessions 
WHERE sessionid='0' and loginid='0' and app='phpgwapi' and location='config'";
!                               
$GLOBALS['phpgw']->db->query($cache_query,__LINE__,__FILE__);                   
        
                        }
                        $cache_query = 'INSERT INTO 
phpgw_app_sessions(sessionid,loginid,app,location,content) VALUES('
--- 222,226 ----
                        {
                                $cache_query = "DELETE FROM phpgw_app_sessions 
WHERE sessionid='0' and loginid='0' and app='phpgwapi' and location='config'";
!                               
$GLOBALS['phpgw']->db->query($cache_query,__LINE__,__FILE__);
                        }
                        $cache_query = 'INSERT INTO 
phpgw_app_sessions(sessionid,loginid,app,location,content) VALUES('
***************
*** 388,395 ****
                }
  //$GLOBALS['phpgw_info']['server']['useframes'] = 'always';
!               
if(((isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'])
 &&     
                        
$GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'] && 
                        $GLOBALS['phpgw_info']['server']['useframes'] == 
'allowed') || 
!                       $GLOBALS['phpgw_info']['server']['useframes'] == 
'always') &&   
                        PHPGW_FRAME_PART != 'unsupported')
                {
--- 388,395 ----
                }
  //$GLOBALS['phpgw_info']['server']['useframes'] = 'always';
!               
if(((isset($GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'])
 &&
                        
$GLOBALS['phpgw_info']['user']['preferences']['common']['useframes'] && 
                        $GLOBALS['phpgw_info']['server']['useframes'] == 
'allowed') || 
!                       $GLOBALS['phpgw_info']['server']['useframes'] == 
'always') &&
                        PHPGW_FRAME_PART != 'unsupported')
                {
***************
*** 447,451 ****
                unset($enable_class);
                reset($GLOBALS['phpgw_info']['flags']);
- 
  
                
/***************************************************************************\
--- 447,450 ----

Index: common_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/common_functions.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** common_functions.inc.php    30 May 2002 09:44:38 -0000      1.10
--- common_functions.inc.php    20 Aug 2002 12:41:48 -0000      1.11
***************
*** 354,358 ****
                for($i=0;$i<$cnt;$i++)
                {
- 
                        switch(strtoupper($method[$i]))
                        {
--- 354,357 ----
***************
*** 403,407 ****
                        $value = $default_value;
                }
!       
                if (@!is_array($value))
                {
--- 402,406 ----
                        $value = $default_value;
                }
! 
                if (@!is_array($value))
                {





reply via email to

[Prev in Thread] Current Thread [Next in Thread]