[Phpgroupware-cvs] CVS: setup manageheader.php,1.31,1.31.2.1 config.php,1.72,1.72.2.1

[Dan Kuykendall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        manageheader.php config.php 
Log Message:
fixes for windows installs

Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -C2 -r1.31 -r1.31.2.1
*** manageheader.php    8 Jan 2002 02:12:43 -0000       1.31
--- manageheader.php    8 Feb 2002 17:00:33 -0000       1.31.2.1
***************
*** 20,24 ****
        );
        include('./inc/functions.inc.php');
- 
        include('../phpgwapi/setup/setup.inc.php');
        $phpgw_info['server']['versions']['current_header'] = 
$setup_info['phpgwapi']['versions']['current_header'];
--- 20,23 ----
***************
*** 309,314 ****
                        {
                                echo 'Now guessing better values for defaults 
<br>' . "\n";
!                               $this_dir = dirname($SCRIPT_FILENAME);
!                               $updir    = ereg_replace('/setup','',$this_dir);
                                $phpgw_info['server']['server_root'] = $updir; 
                                $phpgw_info['server']['include_root'] = $updir; 
--- 308,321 ----
                        {
                                echo 'Now guessing better values for defaults 
<br>' . "\n";
!                               if (PHP_OS == 'Windows' || PHP_OS == 'WINNT' || 
PHP_OS == 'OS/2')
!                               {
!                                       $this_dir = 
dirname($GLOBALS['PATH_TRANSLATED']);
!                                       $updir    = 
ereg_replace('\setup','',$this_dir);
!                               }
!                               else
!                               {
!                                       $this_dir = dirname($SCRIPT_FILENAME);
!                                       $updir    = 
ereg_replace('/setup','',$this_dir);
!                               }
                                $phpgw_info['server']['server_root'] = $updir; 
                                $phpgw_info['server']['include_root'] = $updir; 

Index: config.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/config.php,v
retrieving revision 1.72
retrieving revision 1.72.2.1
diff -C2 -r1.72 -r1.72.2.1
*** config.php  5 Jan 2002 23:50:18 -0000       1.72
--- config.php  8 Feb 2002 17:00:33 -0000       1.72.2.1
***************
*** 48,55 ****
        /* Guessing default values. */
        $GLOBALS['current_config']['hostname']  = $HTTP_HOST;
!       $GLOBALS['current_config']['files_dir'] = 
ereg_replace('/setup','/files',dirname($SCRIPT_FILENAME));
        if (@is_dir('/tmp'))
        {
                $GLOBALS['current_config']['temp_dir'] = '/tmp';
        }
        else
--- 48,72 ----
        /* Guessing default values. */
        $GLOBALS['current_config']['hostname']  = $HTTP_HOST;
! 
!       if (PHP_OS == 'Windows' || PHP_OS == 'WINNT' || PHP_OS == 'OS/2')
!       {
!               $GLOBALS['current_config']['files_dir'] = 
ereg_replace('\\setup','files',dirname($GLOBALS['PATH_TRANSLATED']));
!       }
!       else
!       {
!               $GLOBALS['current_config']['files_dir'] = 
ereg_replace('/setup','/files',dirname($SCRIPT_FILENAME));
!       }
!       
        if (@is_dir('/tmp'))
        {
                $GLOBALS['current_config']['temp_dir'] = '/tmp';
+       }
+       if (@is_dir('C:\\temp'))
+       {
+               $GLOBALS['current_config']['temp_dir'] = 'C:\\temp';
+       }
+       if (@is_dir('C:\WINNT\\temp'))
+       {
+               $GLOBALS['current_config']['temp_dir'] = 'C:\WINNT\\temp';
        }
        else