[Phpgroupware-cvs] CVS: setup manageheader.php,1.45.2.1,1.45.2.2

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv23100

Modified Files:
      Tag: Version-0_9_16-branch
        manageheader.php 
Log Message:
fix to correct guess the pathes with register globals off,
set mcrypt_enabled to extension_loaded('mcrypt') (default on if it's installed)

Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.45.2.1
retrieving revision 1.45.2.2
diff -C2 -r1.45.2.1 -r1.45.2.2
*** manageheader.php    8 Apr 2003 20:10:06 -0000       1.45.2.1
--- manageheader.php    18 May 2003 15:04:17 -0000      1.45.2.2
***************
*** 381,386 ****
                                /* These are a few of the advanced settings */
                                
$GLOBALS['phpgw_info']['server']['db_persistent'] = True;
!                               
$GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = False;
!                               
$GLOBALS['phpgw_info']['server']['mcrypt_version'] = '2.6.3';
  
                                srand((double)microtime()*1000000);
--- 381,386 ----
                                /* These are a few of the advanced settings */
                                
$GLOBALS['phpgw_info']['server']['db_persistent'] = True;
!                               
$GLOBALS['phpgw_info']['server']['mcrypt_enabled'] = extension_loaded('mcrypt');
!                               
$GLOBALS['phpgw_info']['server']['versions']['mcrypt'] = '';
  
                                srand((double)microtime()*1000000);
***************
*** 402,407 ****
                        {
                                $detected .= lang('Now guessing better values 
for defaults...') . '<br>' . "\n";
!                               $this_dir = dirname($SCRIPT_FILENAME);
!                               $updir    = ereg_replace('/setup','',$this_dir);
                                $GLOBALS['phpgw_info']['server']['server_root'] 
= $updir; 
                                
$GLOBALS['phpgw_info']['server']['include_root'] = $updir; 
--- 402,407 ----
                        {
                                $detected .= lang('Now guessing better values 
for defaults...') . '<br>' . "\n";
!                               $this_dir = 
dirname($_SERVER['SCRIPT_FILENAME']);
!                               $updir    = str_replace('/setup','',$this_dir);
                                $GLOBALS['phpgw_info']['server']['server_root'] 
= $updir; 
                                
$GLOBALS['phpgw_info']['server']['include_root'] = $updir;