openfirst-cvscommit

[Openfirst-cvscommit] SF.net SVN: openfirst: [179] trunk/src/config/first.php

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

Revision: 179
Author:   astronouth7303
Date:     2006-06-21 19:17:18 -0700 (Wed, 21 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/openfirst/?rev=179&view=rev

Log Message:
-----------
Double check that connection is good. Fixes bug #162.

Modified Paths:
--------------
    trunk/src/config/first.php
Modified: trunk/src/config/first.php
===================================================================
--- trunk/src/config/first.php	2006-06-21 23:08:28 UTC (rev 178)
+++ trunk/src/config/first.php	2006-06-22 02:17:18 UTC (rev 179)
@@ -110,7 +110,9 @@
      include_once($ogHeader);
      // This a series of statements, each of which are executed. If an error condition occurs, that
      // branch is ran.
-     if (!$ogDB->createDB($ogSQLDatabase, $ogSQLTablePrefix)) {
+     if (!$ogDB->check()) {
+       echo '<p class="error">DB error: was unable to connect to the server.</p>';
+     } else if (!$ogDB->createDB($ogSQLDatabase, $ogSQLTablePrefix)) {
        // Do this as an optional root user?
        echo '<p class="error">DB creation error: '.htmlentities($ogDB->errorString()).'</p>';
      } else if (($err = $base->install()) !== true) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Openfirst-cvscommit] SF.net SVN: openfirst: [184] trunk/src/config/first.php

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

Revision: 184
Author:   astronouth7303
Date:     2006-06-22 15:18:39 -0700 (Thu, 22 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/openfirst/?rev=184&view=rev

Log Message:
-----------
Fixed some undefined variable warnings.

Modified Paths:
--------------
    trunk/src/config/first.php
Modified: trunk/src/config/first.php
===================================================================
--- trunk/src/config/first.php	2006-06-22 22:07:08 UTC (rev 183)
+++ trunk/src/config/first.php	2006-06-22 22:18:39 UTC (rev 184)
@@ -150,7 +150,7 @@
    define('OPENFIRST_NO_INSTALLATION', true); 
 // Do form
    include("../includes/globals.php");
-   include($Header);
+   include($ogHeader);
 
  // Detect default options
    $basepath = substr($_SERVER["SCRIPT_NAME"], 0, -17);
@@ -348,10 +348,6 @@
   <div class="center big"><button class="center big" type="submit">Set up openFIRST!</button></div>
 </form>
 <?php
- }
- if(is_readable("style/footers.php")) {
-   include_once("style/footers.php");
- } else {
-   include_once("../style/footers.php");
- }
+}
+include_once($ogFooter);
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.