[Phpgroupware-cvs] phpgwapi/inc functions.inc.php, 1.121.2.13.2.26 footer.inc.php, 1.17.2.2.2.9

[skwashd]

Update of phpgwapi/inc

Modified Files:
     Branch: Version-0_9_16-branch
            functions.inc.php lines: +10 -5
            footer.inc.php lines: +8 -8

Log Message:
fix bugs found when using a open_basedir restriction

====================================================
Index: phpgwapi/inc/functions.inc.php
diff -u phpgwapi/inc/functions.inc.php:1.121.2.13.2.25 
phpgwapi/inc/functions.inc.php:1.121.2.13.2.26
--- phpgwapi/inc/functions.inc.php:1.121.2.13.2.25      Mon Sep  5 19:30:24 2005
+++ phpgwapi/inc/functions.inc.php      Fri Sep 23 11:23:52 2005
@@ -474,13 +474,18 @@
                * Load the app include files if the exists                      
          *
                
\*************************************************************************/
                /* Then the include file */
-               if (! preg_match ("/phpgwapi/i", PHPGW_APP_INC) && 
file_exists(PHPGW_APP_INC . '/functions.inc.php') && 
!isset($GLOBALS['phpgw_info']['menuaction']))
+               if ( PHPGW_APP_INC != ''
+                       && strpos(PHPGW_APP_INC, 'phpgwapi') === false
+                       && file_exists(PHPGW_APP_INC . '/functions.inc.php')
+                       && !isset($GLOBALS['phpgw_info']['menuaction']))
                {
                        include_once(PHPGW_APP_INC . '/functions.inc.php');
                }
-               if (address@hidden'phpgw_info']['flags']['noheader'] &&
-                       address@hidden'phpgw_info']['flags']['noappheader'] &&
-                       file_exists(PHPGW_APP_INC . '/header.inc.php') && 
!isset($GLOBALS['phpgw_info']['menuaction']))
+               if ( !(isset($GLOBALS['phpgw_info']['flags']['noheader']) && 
$GLOBALS['phpgw_info']['flags']['noheader'])
+                       && 
!(isset($GLOBALS['phpgw_info']['flags']['noappheader']) && 
$GLOBALS['phpgw_info']['flags']['noappheader'])
+                       && PHPGW_APP_INC != ''
+                       && file_exists(PHPGW_APP_INC . '/header.inc.php')
+                       && !isset($GLOBALS['phpgw_info']['menuaction']))
                {
                        include_once(PHPGW_APP_INC . '/header.inc.php');
                }

====================================================
Index: phpgwapi/inc/footer.inc.php
diff -u phpgwapi/inc/footer.inc.php:1.17.2.2.2.8 
phpgwapi/inc/footer.inc.php:1.17.2.2.2.9
--- phpgwapi/inc/footer.inc.php:1.17.2.2.2.8    Sat Nov  6 15:34:26 2004
+++ phpgwapi/inc/footer.inc.php Fri Sep 23 11:23:52 2005
@@ -20,13 +20,13 @@
        
/**************************************************************************\
        * Include the apps footer files if it exists                            
   *
        
\**************************************************************************/
-       if (PHPGW_APP_INC != PHPGW_API_INC &&   // this prevents an endless 
inclusion on the homepage
-                                                       // (some apps set 
currentapp in hook_home => it's not releyable)
-               (file_exists (PHPGW_APP_INC . '/footer.inc.php') || 
isset($GLOBALS['phpgw_info']['menuaction'])) &&
-               $GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' &&
-               $GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' &&
-               $GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' &&
-               address@hidden'phpgw_info']['flags']['noappfooter'])
+       if ( PHPGW_APP_INC != ''
+               && PHPGW_APP_INC != PHPGW_API_INC // this prevents an endless 
inclusion on the homepage (some apps set currentapp in hook_home => it's not 
reliable)
+               && (file_exists (PHPGW_APP_INC . '/footer.inc.php') || 
isset($GLOBALS['phpgw_info']['menuaction']))
+               && $GLOBALS['phpgw_info']['flags']['currentapp'] != 'home'
+               && $GLOBALS['phpgw_info']['flags']['currentapp'] != 'login'
+               && $GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout'
+               && ! isset($GLOBALS['phpgw_info']['flags']['noappfooter']) && 
$GLOBALS['phpgw_info']['flags']['noappfooter'])
        {
                if ($GLOBALS['phpgw_info']['menuaction'])
                {