Changeset 1395

Show
Ignore:
Timestamp:
06/25/09 15:30:38 (4 years ago)
Author:
benoitg
Message:

* Fix #574
* Fix bug introduced in 2009-06-23 patch for signing up new users.

Location:
trunk/wifidog-auth/wifidog
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • trunk/wifidog-auth/wifidog/classes/AbstractDb.php

    r1352 r1395  
    8888 
    8989        // Build connection string 
    90         $conn_string = "host=".CONF_DATABASE_HOST." dbname=$db_name user=".CONF_DATABASE_USER." password=".CONF_DATABASE_PASSWORD.""; 
     90        $conn_string = "host=".CONF_DATABASE_HOST." port=".CONF_DATABASE_PORT." dbname=$db_name user=".CONF_DATABASE_USER." password=".CONF_DATABASE_PASSWORD.""; 
    9191        // Try connecting and hide warning, errors 
    9292        if ( !dependency::check('pgsql') ) 
    … …  
    9797        // Throw an exception if anything went wrong 
    9898        if ($ptr_connexion == FALSE) 
    99         throw new Exception(sprintf(_("Unable to connect to database on %s"), CONF_DATABASE_HOST)); 
     99        throw new Exception(sprintf(_("Unable to connect to the database at %s"), "host=".CONF_DATABASE_HOST." port=".CONF_DATABASE_PORT." dbname=$db_name user=".CONF_DATABASE_USER." password=*********")); 
    100100 
    101101        return $ptr_connexion; 

  • trunk/wifidog-auth/wifidog/config.php

    r1393 r1395  
    7474define('CONF_DATABASE_HOST', 'localhost'); 
    7575 
     76// Port of the database server. 
     77define('CONF_DATABASE_PORT', '5432'); 
     78 
    7679// Username for database access. 
    7780define('CONF_DATABASE_USER', 'wifidog'); 

  • trunk/wifidog-auth/wifidog/include/schema_validate.php

    r1393 r1395  
    6969    catch (Exception $e) { 
    7070        /* Be quiet */ 
    71     } 
    72  
    73     if (empty ($row)) { 
    7471        echo "<html><body>"; 
    7572        echo "<h1>" . _("I am unable to retrieve the schema version. Either the wifidog database hasn't been created yet, the postgresql server is down, or pg_hba.conf does not allow your web server to connect to the wifidog database.") . "</h1>"; 
    76  
     73        echo "<h2>Error was: ". $e->getMessage() . "</h2>"; 
    7774        echo "<h2>" . _("Try running the") . " <a href='" . BASE_URL_PATH . "install.php'>" . _("installation script") . "</a>.</h2>\n"; 
    7875        echo "</html></body>"; 
    7976        exit (); 
     77    } 
     78 
     79    if (empty ($row)) { 
     80 
    8081    } 
    8182    else { 

  • trunk/wifidog-auth/wifidog/install.php

    r1393 r1395  
    270270# Database connections variables 
    271271$CONF_DATABASE_HOST = $configArray['CONF_DATABASE_HOST']; 
     272$CONF_DATABASE_PORT = $configArray['CONF_DATABASE_PORT']; 
    272273$CONF_DATABASE_NAME = $configArray['CONF_DATABASE_NAME']; 
    273274$CONF_DATABASE_USER = $configArray['CONF_DATABASE_USER']; 
    … …  
    511512<table border="1"> 
    512513  <tr><td>Host</td><td><INPUT type="text" name="CONF_DATABASE_HOST" value="$CONF_DATABASE_HOST"></td></tr> 
     514  <tr><td>Port</td><td><INPUT type="text" name="CONF_DATABASE_PORT" value="$CONF_DATABASE_PORT"></td></tr> 
    513515  <tr><td>DB Name</td><td><INPUT type="text" name="CONF_DATABASE_NAME" value="$CONF_DATABASE_NAME"></td></tr> 
    514516  <tr><td>Username</td><td><INPUT type="text" name="CONF_DATABASE_USER" value="$CONF_DATABASE_USER"></td></tr> 
    … …  
    521523  function submitDatabaseValue() { 
    522524    newConfig("CONF_DATABASE_HOST='" + document.myform.CONF_DATABASE_HOST.value + "'"); 
     525    newConfig("CONF_DATABASE_PORT='" + document.myform.CONF_DATABASE_PORT.value + "'"); 
    523526    newConfig("CONF_DATABASE_NAME='" + document.myform.CONF_DATABASE_NAME.value + "'"); 
    524527    newConfig("CONF_DATABASE_USER='" + document.myform.CONF_DATABASE_USER.value + "'"); 
    … …  
    548551        print "<UL><LI>Trying to open a Postgresql database connection : "; 
    549552 
    550         $conn_string = "host=$CONF_DATABASE_HOST dbname=$CONF_DATABASE_NAME user=$CONF_DATABASE_USER password=$CONF_DATABASE_PASSWORD"; 
     553        $conn_string = "host=$CONF_DATABASE_HOST port=$CONF_DATABASE_PORT dbname=$CONF_DATABASE_NAME user=$CONF_DATABASE_USER password=$CONF_DATABASE_PASSWORD"; 
    551554        $ptr_connexion = pg_connect($conn_string); 
    552555 
    … …  
    555558        } 
    556559        else { 
    557             printf ("<p>Unable to connect to database!  Please make sure the server is online and the database \"%s\" exists. Also 'postgresql.conf' and 'pg_hba.conf' must allow the user \"%s\" to open a connection to it on host \"%s\" to continue.  See the error above for clues on what the problem may be.</p>", $CONF_DATABASE_NAME, $CONF_DATABASE_USER, $CONF_DATABASE_HOST); 
     560            printf ("<p>Unable to connect to database!  Please make sure the server is online and the database \"%s\" exists. Also 'postgresql.conf' and 'pg_hba.conf' must allow the user \"%s\" to open a connection to it on host \"%s\" port %d to continue.  See the error above for clues on what the problem may be.</p>", $CONF_DATABASE_NAME, $CONF_DATABASE_PORT, $CONF_DATABASE_USER, $CONF_DATABASE_HOST); 
    558561            print "<p>Please go back and retry with correct values, or fix your server configuration.</p>"; 
    559562            refreshButton(); 
    … …  
    612615        $file_schema_version = ''; # Schema version from define(REQUIRED_SCHEMA_VERSION) in schema_validate.php 
    613616 
    614         $conn_string = "host=$CONF_DATABASE_HOST dbname=$CONF_DATABASE_NAME user=$CONF_DATABASE_USER password=$CONF_DATABASE_PASSWORD"; 
     617        $conn_string = "host=$CONF_DATABASE_HOST port=$CONF_DATABASE_PORT dbname=$CONF_DATABASE_NAME user=$CONF_DATABASE_USER password=$CONF_DATABASE_PASSWORD"; 
    615618        $connection = pg_connect($conn_string) or die(); # or die("Couldn't Connect ==".pg_last_error()."==<BR>"); 
    616619 
    … …  
    651654            $db_shema_version = $result_array[0]['value']; 
    652655 
    653             print "<p>On <em>$CONF_DATABASE_HOST</em>, Database <em>$CONF_DATABASE_NAME</em> exists and is "; 
     656            print "<p>On <em>$CONF_DATABASE_HOST:$CONF_DATABASE_PORT</em>, Database <em>$CONF_DATABASE_NAME</em> exists and is "; 
    654657            if ($db_shema_version == $file_schema_version) { 
    655658                print "up to date (shema version <em>$db_shema_version</em>)."; 
    … …  
    829832        empty ($_REQUEST['email']) ? $email = $_SERVER['SERVER_ADMIN'] : $email = $_REQUEST['email']; 
    830833 
    831         $conn_string = "host=$CONF_DATABASE_HOST dbname=$CONF_DATABASE_NAME user=$CONF_DATABASE_USER password=$CONF_DATABASE_PASSWORD"; 
     834        $conn_string = "host=$CONF_DATABASE_HOST port=$CONF_DATABASE_PORT dbname=$CONF_DATABASE_NAME user=$CONF_DATABASE_USER password=$CONF_DATABASE_PASSWORD"; 
    832835        $connection = pg_connect($conn_string) or die(); 
    833836 

  • trunk/wifidog-auth/wifidog/signup.php

    r1391 r1395  
    345345        $smarty->assign('SelectNetworkUI', "<input type=\"hidden\" name=\"auth_source\" value='$default_network_param' />"); 
    346346else 
    347         $smarty->assign('SelectNetworkUI', Network::getSelectUI('network_id', array('preSelectedObject' => $network)) ); 
     347        $smarty->assign('SelectNetworkUI', Network::getSelectUI('auth_source', array('preSelectedObject' => $network)) ); 
    348348 
    349349// Compile HTML code