[Phpgroupware-cvs] setup config.php [Version-0_9_16-branch]

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    setup
Branch:         Version-0_9_16-branch
Changes by:     Sigurd Nes <address@hidden>     06/05/19 07:30:27

Modified files:
        .              : config.php 

Log message:
        Change from $GLOBALS['HTTP_SERVER_VARS'] to $_SERVER

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/setup/config.php.diff?only_with_tag=Version-0_9_16-branch&tr1=1.78.2.6&tr2=1.78.2.7&r1=text&r2=text

Patches:
Index: setup/config.php
diff -u setup/config.php:1.78.2.6 setup/config.php:1.78.2.7
--- setup/config.php:1.78.2.6   Sat Nov  6 16:13:46 2004
+++ setup/config.php    Fri May 19 07:30:27 2006
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: config.php,v 1.78.2.6 2004/11/06 16:13:46 powerstat Exp $ */
+  /* $Id: config.php,v 1.78.2.7 2006/05/19 07:30:27 sigurdne Exp $ */
 
        $phpgw_info = array();
        $GLOBALS['phpgw_info']['flags'] = array(
@@ -37,8 +37,8 @@
        //
        function in_docroot($path)
        {
-               $docroots = 
array(PHPGW_SERVER_ROOT,$GLOBALS['HTTP_SERVER_VARS']['DOCUMENT_ROOT']);
-               
+               $docroots = array(PHPGW_SERVER_ROOT,$_SERVER['DOCUMENT_ROOT']);
+
                foreach ($docroots as $docroot)
                {
                        $len = strlen($docroot);
@@ -64,6 +64,8 @@
                'T_config_post_script' => 'config_post_script.tpl'
        ));
 
+       $setup_tpl->set_var('lang_cookies_must_be_enabled', lang('<b>NOTE:</b> 
You must have cookies enabled to use setup and header admin!') );
+
        /* Following to ensure windows file paths are saved correctly */
        set_magic_quotes_runtime(0);
 
@@ -107,7 +109,7 @@
        }
 
        $newsettings = get_var('newsettings',Array('POST'));
-       $files_in_docroot = 
in_docroot($GLOBALS['HTTP_POST_VARS']['newsettings']['files_dir']);
+       $files_in_docroot = in_docroot($_POST['newsettings']['files_dir']);
 
        if(@get_var('submit',Array('POST')) && @$newsettings && 
!$files_in_docroot)
        {
@@ -133,6 +135,7 @@
                $GLOBALS['phpgw_setup']->db->query("DELETE FROM $configtbl 
WHERE config_name='useframes'");
                $GLOBALS['phpgw_setup']->db->query("INSERT INTO $configtbl 
(config_app,config_name, config_value) values 
('phpgwapi','useframes','never')");
 
+
                while(list($setting,$value) = @each($newsettings))
                {
                        /* echo '<br />Updating: ' . $setting . '=' . $value; */