[Phpgroupware-cvs] CVS: setup manageheader.php,1.45,1.46

[Ralf Becker <address@hidden>]

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

Modified Files:
        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
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** manageheader.php    9 Mar 2003 14:28:26 -0000       1.45
--- manageheader.php    18 May 2003 15:06:15 -0000      1.46
***************
*** 46,50 ****
                        if(!$dom['config_pass'])
                        {
!                               $errors .= '<br>' . lang("You didn't enter a 
config password for domain x",$v);
                        }
                }
--- 46,50 ----
                        if(!$dom['config_pass'])
                        {
!                               $errors .= '<br>' . lang("You didn't enter a 
config password for domain %1",$v);
                        }
                }
***************
*** 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; 
***************
*** 469,473 ****
                                /*
                                $errors .= '<br><font color="red">' . 
lang('Warning!') . '<br>'
!                                       . lang('The db_type in defaults (x) is 
not supported on this server. using first supported 
type.',$GLOBALS['phpgw_info']['server']['db_type'])
                                        . '</font>';
                                */
--- 469,473 ----
                                /*
                                $errors .= '<br><font color="red">' . 
lang('Warning!') . '<br>'
!                                       . lang('The db_type in defaults (%1) is 
not supported on this server. using first supported 
type.',$GLOBALS['phpgw_info']['server']['db_type'])
                                        . '</font>';
                                */
***************
*** 484,488 ****
                        {
                                $errors .= '<br>'
!                                       . lang('Cannot create the 
header.inc.php due to file permission restrictions.<br> Instead you can x the 
file.',
                                        '<input type="submit" name="action" 
value="download">' . lang('or') . '&nbsp;<input type="submit" name="action" 
value="view">')
                                        . '</form>';
--- 484,488 ----
                        {
                                $errors .= '<br>'
!                                       . lang('Cannot create the 
header.inc.php due to file permission restrictions.<br> Instead you can %1 the 
file.',
                                        '<input type="submit" name="action" 
value="download">' . lang('or') . '&nbsp;<input type="submit" name="action" 
value="view">')
                                        . '</form>';