openfirst-cvscommit

[Astronouth7303 <ast...@us...>]

Update of /cvsroot/openfirst/base/config
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23645/config

Modified Files:
	first.php 
Log Message:
Corrected the defaults so that home would not point to the same dir as basepath

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** first.php	13 Mar 2005 01:43:41 -0000	1.50
--- first.php	13 Mar 2005 19:06:34 -0000	1.51
***************
*** 142,146 ****
     }
  
!    // Detect default options
     $basepath = substr($_SERVER["SCRIPT_NAME"], 0, -17);
     $server = $_SERVER["SERVER_NAME"];
--- 142,146 ----
     }
  
!  // Detect default options
     $basepath = substr($_SERVER["SCRIPT_NAME"], 0, -17);
     $server = $_SERVER["SERVER_NAME"];
***************
*** 150,166 ****
     
     if (!$windows) {
!      $windows = (strstr(getcwd(), "\\")) ? true : false;
     } 
     if (!$windows && isset($_SERVER['SERVER_SIGNATURE'])) {
!      $windows = (strstr($_SERVER['SERVER_SIGNATURE'], '(win32)')) ? true : false;
     } 
     if (!$windows && isset($_SERVER['PATH'])) {
!      $windows = (strstr($_SERVER['PATH'], "\\")) ? true : false;
     } 
     if (!$windows && isset($_SERVER['SystemRoot'])) {
!      $windows = (strstr($_SERVER['SystemRoot'], "\\")) ? true : false;
     } 
     if (!$windows && isset($_SERVER['SystemRoot'])) {
!      $windows = (substr($_SERVER['SystemRoot'], 0, 1) == "C:") ? true : false;
     } 
     
--- 150,166 ----
     
     if (!$windows) {
!      $windows = (strstr(getcwd(), "\\")) ? true : false; // Contains backslash
     } 
     if (!$windows && isset($_SERVER['SERVER_SIGNATURE'])) {
!      $windows = (strstr($_SERVER['SERVER_SIGNATURE'], '(win32)')) ? true : false; // contains (win32)
     } 
     if (!$windows && isset($_SERVER['PATH'])) {
!      $windows = (strstr($_SERVER['PATH'], "\\")) ? true : false; // Contains backslash
     } 
     if (!$windows && isset($_SERVER['SystemRoot'])) {
!      $windows = (strstr($_SERVER['SystemRoot'], "\\")) ? true : false; // Contains backslash
     } 
     if (!$windows && isset($_SERVER['SystemRoot'])) {
!      $windows = (substr($_SERVER['SystemRoot'], 1, 1) == ':') ? true : false; // begins with a windows drive
     } 
     
***************
*** 263,267 ****
          to your main page) <em>Note:</em> Do not place a slash after the link
          ie. http://www.yoursite.com</font></td>
!       <td> <input type="text" name="home" value="<?php echo htmlentities("http://$server$basepath"); ?>" ></td>
      </tr>
      <tr>
--- 263,267 ----
          to your main page) <em>Note:</em> Do not place a slash after the link
          ie. http://www.yoursite.com</font></td>
!       <td> <input type="text" name="home" value="<?php echo htmlentities("http://$server"); ?>" ></td>
      </tr>
      <tr>