phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] phpgroupware header.inc.php.template


From: Dave Hall
Subject: [Phpgroupware-cvs] phpgroupware header.inc.php.template
Date: Sun, 17 Sep 2006 11:35:59 +0000

CVSROOT:        /cvsroot/phpgroupware
Module name:    phpgroupware
Changes by:     Dave Hall <skwashd>     06/09/17 11:35:59

Modified files:
        .              : header.inc.php.template 

Log message:
        new header - unset the info array for security, add dynamic path 
detection support, add phpdocs, don't include xmlrpc/soap functions when using 
the webgui

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/header.inc.php.template?cvsroot=phpgroupware&r1=1.49&r2=1.50

Patches:
Index: header.inc.php.template
===================================================================
RCS file: /cvsroot/phpgroupware/phpgroupware/header.inc.php.template,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- header.inc.php.template     9 Sep 2006 11:35:16 -0000       1.49
+++ header.inc.php.template     17 Sep 2006 11:35:59 -0000      1.50
@@ -5,13 +5,13 @@
        * phpgroupware header
        * @author Dan Kuykendall <address@hidden>
        * @author Joseph Engo <address@hidden>
-       * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
+       * @author Dave Hall skwash at phpgroupware.org
+       * @copyright Copyright (C) 2000-2006 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgroupware
-       * @version $Id: header.inc.php.template,v 1.49 2006/09/09 11:35:16 
skwashd Exp $
+       * @version $Id: header.inc.php.template,v 1.50 2006/09/17 11:35:59 
skwashd Exp $
        */
 
-
        // 
**************************************************************************
        // !!!!!!! EDIT THESE LINES !!!!!!!!
        // This setting allows you to easily move the include directory and the
@@ -22,12 +22,25 @@
        /**
        * Server root directory
        */
-       define('PHPGW_SERVER_ROOT','{SERVER_ROOT}');
+       define('PHPGW_SERVER_ROOT', dirname(__FILE__) );
+       
+       /**
+       * Include root directory - legacy support
+       */
+       define('PHPGW_INCLUDE_ROOT', PHPGW_SERVER_ROOT);
        
+       //We only let preset flags remain everything else is killed
+       $flags = array();
+       if ( isset($GLOBALS['phpgw_info']['flags']) )
+       {
+               $flags = $GLOBALS['phpgw_info']['flags'];
+       }
+       unset($GLOBALS['phpgw_info']);
        /**
-       * Include root directory
+       * @global array $phpgw_info the phpgroupware information array
        */
-       define('PHPGW_INCLUDE_ROOT','{INCLUDE_ROOT}');
+       $GLOBALS['phpgw_info'] = array('flags' => $flags);
+       unset($flags);
 
        /**
        * @global string 
$GLOBALS['phpgw_info']['server']['header_admin_password'] Setup administrator 
password
@@ -161,7 +174,7 @@
        * @global string $GLOBALS['phpgw_info']['server']['versions']['header']
        * Version of this header file
        */
-       $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.24';
+       $GLOBALS['phpgw_info']['server']['versions']['header'] = '1.25';
        
        
        // This is a fix for NT
@@ -171,16 +184,6 @@
                * Include global general functions
                */
                include(PHPGW_API_INC . '/functions.inc.php');
-               
-               /**
-               * Include global XML functions
-               */
-               include(PHPGW_API_INC . '/xml_functions.inc.php');
-               
-               /**
-               * Include global SOAP functions
-               */
-               include(PHPGW_API_INC . '/soap_functions.inc.php');
        }
 
        // Leave off the final php closing tag, some editors will add




reply via email to

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