[Openfirst-cvscommit] base/config first.php,1.37.2.4,1.37.2.5

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

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

Modified Files:
      Tag: REL1_1_BRANCH
	first.php 
Log Message:
Fixed installation?

Index: first.php
===================================================================
RCS file: /cvsroot/openfirst/base/config/first.php,v
retrieving revision 1.37.2.4
retrieving revision 1.37.2.5
diff -C2 -d -r1.37.2.4 -r1.37.2.5
*** first.php	25 Aug 2005 00:30:17 -0000	1.37.2.4
--- first.php	25 Aug 2005 01:15:44 -0000	1.37.2.5
***************
*** 34,39 ****
   // Initialize header/footer vars
   $title = 'openFIRST Installation';
-  $stylepath = 'http://openfirst.sourceforge.net/';
-  
   
   if(isset($_POST["login"])) {
--- 34,37 ----
***************
*** 49,52 ****
--- 47,51 ----
  
   if(isset($_POST["sqlserver"])) {
+    echo "Post found\n";
     $sqlserver = $_POST["sqlserver"];
     $sqluser = $_POST["sqluser"];
***************
*** 54,61 ****
     $sqldatabase = $_POST["sqldatabase"];
     $fbasepath = realpath($_POST['fbasepath']);
!    include_once("$fbasepath/includes/globals.php");
  
     #HACK: Change when module installationg code is written
!    if (!ofirst_dbcreate())
       echo 'DB/tables creation error: '.ofirst_dberror();
  
--- 53,60 ----
     $sqldatabase = $_POST["sqldatabase"];
     $fbasepath = realpath($_POST['fbasepath']);
!    include_once("$fbasepath/includes/dbase.php");
  
     #HACK: Change when module installationg code is written
!    if (!ofirst_dbcreate($sqlserver, $sqluser, $sqlpassword, $sqldatabase))
       echo 'DB/tables creation error: '.ofirst_dberror();
  
***************
*** 71,75 ****
     // options.
     $ConfigFile = "$fbasepath/includes/sitesettings.php";
!    if ( (file_exists($ConfigFile) && is_writable($ConfigFile)) || is_writable(dirname($ConfigFile)) ) {
       $file = file_get_contents('../includes/sitesettings.tpl');
       $cookielogins = ((isset($_POST["cookielogins"]) && $_POST["cookielogins"]=="yes") ? true : false);
--- 70,76 ----
     // options.
     $ConfigFile = "$fbasepath/includes/sitesettings.php";
!    if ( ( file_exists($ConfigFile) && is_writable($ConfigFile) ) || 
!         ( !file_exists($ConfigFile) && is_writable(dirname($ConfigFile)) )
!       ) {
       $file = file_get_contents('../includes/sitesettings.tpl');
       $cookielogins = ((isset($_POST["cookielogins"]) && $_POST["cookielogins"]=="yes") ? true : false);
***************
*** 117,120 ****
--- 118,122 ----
       $hfile = fopen("$ConfigFile",'w'); fwrite($hfile, $file); fclose($hfile);
       
+      include_once("$fbasepath/includes/globals.php");
       include_once($header);
       echo("<div class=\"success\"><h1>openFIRST Software Configured</h1>
***************
*** 144,148 ****
  // Do form
     include("../includes/globals.php");
!    include($Header);
  
   // Detect default options
--- 146,150 ----
  // Do form
     include("../includes/globals.php");
!    include($header);
  
   // Detect default options
***************
*** 223,227 ****
       <input type="text" name="sqldatabase" value="openfirst" />
      </dd>
!     <dt>(I this database does not already exist, the user entered above must have access to create it.</dt>
     </dl>
    </fieldset>
--- 225,229 ----
       <input type="text" name="sqldatabase" value="openfirst" />
      </dd>
!     <dt>(If this database does not already exist, the user entered above must have access to create it.</dt>
     </dl>
    </fieldset>