[Phpgroupware-cvs] setup config.php

[Caeies]

CVSROOT:        /cvsroot/phpgroupware
Module name:    setup
Changes by:     Caeies <Caeies> 06/09/03 15:27:44

Modified files:
        .              : config.php 

Log message:
        E_ALL fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/setup/config.php?cvsroot=phpgroupware&r1=1.87&r2=1.88

Patches:
Index: config.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/config.php,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- config.php  6 Aug 2006 10:03:24 -0000       1.87
+++ config.php  3 Sep 2006 15:27:44 -0000       1.88
@@ -5,7 +5,7 @@
        * @copyright Copyright (C) 2000-2005 Free Software Foundation, Inc. 
http://www.fsf.org/
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package setup
-       * @version $Id: config.php,v 1.87 2006/08/06 10:03:24 skwashd Exp $
+       * @version $Id: config.php,v 1.88 2006/09/03 15:27:44 Caeies Exp $
        */
 
        if ( isset($_POST['cancel']) && $_POST['cancel'] )
@@ -36,7 +36,7 @@
        }
 
        $tpl_root = $GLOBALS['phpgw_setup']->html->setup_tpl_dir('setup');
-       $setup_tpl =& CreateObject('phpgwapi.Template',$tpl_root);
+       $setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
 
        /**
         * Test if $path lies within the webservers document-root
@@ -117,8 +117,9 @@
 
        $setup_info = $GLOBALS['phpgw_setup']->detection->get_db_versions();
        $newsettings = get_var('newsettings',Array('POST'));
-       $files_in_docroot = in_docroot($_POST['newsettings']['files_dir']);
-       if(@get_var('submit',Array('POST')) && @$newsettings && 
!$files_in_docroot)
+       
+       $files_in_docroot = (isset($newsettings['files_dir']))? 
in_docroot($newsettings['files_dir']) : false ;
+       if(get_var('submit',Array('POST')) && is_array($newsettings) && 
!$files_in_docroot)
        {
                $datetime = CreateObject('phpgwapi.datetime');
                switch (intval($newsettings['daytime_port']))
@@ -184,7 +185,7 @@
                }
        }
 
-       if($newsettings['auth_type'] != 'ldap')
+       if(!isset($newsettings['auth_type']) || $newsettings['auth_type'] != 
'ldap')
        {
                
$GLOBALS['phpgw_setup']->html->show_header(lang('Configuration'),False,'config',$ConfigDomain
 . '(' . $phpgw_domain[$ConfigDomain]["db_type"] . ')');
        }
@@ -196,7 +197,7 @@
        }
        
        // are we here because of an error: files-dir in docroot
-       if (is_array($_POST['newsettings']) && $files_in_docroot)
+       if (isset($_POST['newsettings']) && is_array($_POST['newsettings']) && 
$files_in_docroot)
        {
                echo '<p align="center" style="color: 
red;"><strong>'.lang('Path to user and group files HAS TO BE OUTSIDE of the 
webservers document-root!!!')."</strong></p>\n";
 
@@ -206,7 +207,7 @@
                }
        }
 
-       if($GLOBALS['error'] == 'badldapconnection')
+       if(isset($GLOBALS['error']) && $GLOBALS['error'] == 'badldapconnection')
        {
                // Please check the number and dial again :)
                $GLOBALS['phpgw_setup']->html->show_alert_msg('Error',
@@ -248,7 +249,7 @@
                var $db;
        }
        $GLOBALS['phpgw'] = new phpgw;
-       $GLOBALS['phpgw']->common =& CreateObject('phpgwapi.common');
+       $GLOBALS['phpgw']->common = CreateObject('phpgwapi.common');
        $GLOBALS['phpgw']->db     =& $GLOBALS['phpgw_setup']->db;
 
        $setup_tpl->set_unknowns('keep');