[Openfirst-cvscommit] base/config first.php,1.45,1.46

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

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

Modified Files:
	first.php 
Log Message:
Fixed replacement bug.

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** first.php	6 Jan 2005 23:25:06 -0000	1.45
--- first.php	7 Jan 2005 20:31:06 -0000	1.46
***************
*** 37,41 ****
   }
  
-  var_export(isset($_POST['ostype']));
  
   if(isset($_POST["ostype"])) {
--- 37,40 ----
***************
*** 111,118 ****
                        GetVarValue($_POST['fbasepath']));
       
!      str_replace($find, $replace, $file);
!      $hfile = fopen('./globals.php'); 
!      fwrite($hfile, $file);
!      fclose($hfile);
       include("../config/globals.php");
       include("$header");
--- 110,116 ----
                        GetVarValue($_POST['fbasepath']));
       
!      $file = str_replace($find, $replace, $file);
!      $hfile = fopen('./globals.php','w'); fwrite($hfile, $file); fclose($hfile);
!      
       include("../config/globals.php");
       include("$header");
***************
*** 127,132 ****
       die(include("$footer"));
     } else {
       if(is_readable("config/headers.php")) {
!      include("config/headers.php");
       } else {
         include("../config/headers.php");
--- 125,131 ----
       die(include("$footer"));
     } else {
+      echo "Globals.php is not writable\n";
       if(is_readable("config/headers.php")) {
!        include("config/headers.php");
       } else {
         include("../config/headers.php");
***************
*** 152,156 ****
     // Detect default options
     $basepath = substr($_SERVER["SCRIPT_NAME"], 0, -17);
!    $server = 'http://'.$_SERVER["SERVER_NAME"];
     chdir('..');
     $fbasepath = str_replace("\\", '/', getcwd());
--- 151,155 ----
     // Detect default options
     $basepath = substr($_SERVER["SCRIPT_NAME"], 0, -17);
!    $server = $_SERVER["SERVER_NAME"];
     chdir('..');
     $fbasepath = str_replace("\\", '/', getcwd());
***************
*** 204,209 ****
  ?>
  <h1>Base Configuration</h1>
! <p><form action="<?php echo htmlentities("$server$basepath"); ?>" method="post">
! <!--form action="/globals.php" method="post"-->
    Congratulations on your choice of openFIRST software. Please proceed through
    this setup wizard to get your new openFIRST portal software set up and working
--- 203,207 ----
  ?>
  <h1>Base Configuration</h1>
! <p><form action="<?php echo htmlentities("http://$server$basepath/config/first.php"); ?>" method="post">
    Congratulations on your choice of openFIRST software. Please proceed through
    this setup wizard to get your new openFIRST portal software set up and working