Index: wifidog/install.php
===================================================================
--- wifidog/install.php	(revision 1323)
+++ wifidog/install.php	(working copy)
@@ -51,7 +51,30 @@
 empty ($_REQUEST['action']) ? $action = '' : $action = $_REQUEST['action']; # The action to be done (in page)
 empty ($_REQUEST['debug']) ? $debug = 0 : $debug = $_REQUEST['debug']; # Use for MySQL debugging
 empty ($_REQUEST['config']) ? $config = '' : $config = $_REQUEST['config']; # Store data to be saved in config.php
+//The path to the inital sql data directory
+$dirpath = WIFIDOG_ABS_FILE_PATH . "../sql/initaldata/";
 
+
+
+# SQL are executed with PHP, some lines need to be commented out.
+        $file_db_version = 'UNKNOW';
+        $patterns[0] = '/CREATE DATABASE wifidog/';
+        $patterns[1] = '/\\\connect/';
+        //The following is strictly for compatibility with postgresql 7.4
+        $patterns[2] = '/COMMENT/';
+        $patterns[3] = '/^SET /m';
+        $patterns[4] = '/CREATE PROCEDURAL LANGUAGE/';
+        $patterns[5] = '/ALTER SEQUENCE/';
+        $patterns[6] = '/::regclass/';//To fix incompatibility of postgres < 8.1 with later nextval() calling convention
+        $replacements[0] = '-- ';
+        $replacements[1] = '-- ';
+        $replacements[2] = '-- ';
+        $replacements[3] = '-- ';
+        $replacements[4] = '-- ';
+        $replacements[5] = '-- ';
+        $replacements[6] = '::text';
+
+
 # Security : Minimal access validation is use by asking user to retreive a random password in a local file. This prevent remote user to access unprotected installation script. It's dummy, easy to implement and better than nothing.
 
 # Random password generator
@@ -61,7 +84,7 @@
     srand(date("s"));
     $possible_charactors = "abcdefghijklmnopqrstuvwxyz1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ";
     $password = "";
-    while (strlen($random_password) < 8) {
+    while (strlen($random_password) < 16) {
         $random_password .= substr($possible_charactors, rand() % (strlen($possible_charactors)), 1);
     }
     $fd = fopen($password_file, 'w');
@@ -155,8 +178,8 @@
 $pageindex = array("Welcome"=>"Welcome",
 		   "Prerequisites"=>"Prerequisites",
 		   "Permissions"=>"Permissions",
-	           "Dependencies"=> "Dependencies",		   
-	           "Database Access"=> "Database",
+	       "Dependencies"=> "Dependencies",		   
+	       "Database Access"=> "Database",
 		   "Database Connection"=>"testdatabase",
 		   "Database Initialisation"=>"dbinit",
 		   "Global Options"=>"options",
@@ -175,7 +198,7 @@
 print<<<EndHTML
 		</div>
 		<div id="left_area_bottom">
-			<p><a href="../CHANGELOG">Change Log</a><BR>
+		<p><A HREF="#" ONCLICK="javascript: document.myform.page.value='changelog'; document.myform.submit();">Change Log</A><BR>
 			<a href="http://dev.wifidog.org/report/10">Known issues</a></p>
 		</div>
 	</div>
@@ -265,14 +288,13 @@
         $configArray[$key] = $value;
     }
 }
-//echo '<pre>';print_r($configArray);echo '</pre>';
+
 # Database connections variables
 $CONF_DATABASE_HOST = $configArray['CONF_DATABASE_HOST'];
 $CONF_DATABASE_NAME = $configArray['CONF_DATABASE_NAME'];
 $CONF_DATABASE_USER = $configArray['CONF_DATABASE_USER'];
 $CONF_DATABASE_PASSWORD = $configArray['CONF_DATABASE_PASSWORD'];
 
-//foreach($configArray as $key => $value) { print "K=$key V=$value<BR>"; } exit(); # DEBUG
 
 ###################################
 # array (array1(name1, page1), array2(name2, page2), ..., arrayN(nameN, pageN));
@@ -306,16 +328,8 @@
 
 ###################################
 #
-/*function debugButton() {
- print <<<EndHTML
- <p><INPUT TYPE="button" VALUE="Debug" ONCLICK="javascript: window.location.reload(true);"></p>
- EndHTML;
- } */
-
-###################################
-#
 function saveConfig($data) {
-    print "<!-- saveConfig DATA=($data) -->\n"; # DEBUG
+    print "<!-- saveConfig DATA=($data) -->\n";
 
     global $CONFIG_FILE;
 
@@ -328,11 +342,9 @@
     foreach ($defineArrayToken as $nameValue) {
         list ($name, $value) = explode('=', $nameValue);
         $defineArray[$name] = $value; # New define value ($name and value)
-        #print "K=$name V=$value<BR>"; # DEBUG
     }
 
     foreach ($contentArray as $line) {
-        #print "L=$line<BR>\n";
         if (preg_match("/^define\((.+)\);/", $line, $matchesArray)) {
             list ($key, $value) = explode(',', $matchesArray[1]);
             $pattern = array (
@@ -344,11 +356,8 @@
                 ''
                 );
                 $key = preg_replace($pattern, $replacement, trim($key));
-                //$value = preg_replace($pattern, $replacement, trim($value));
 
                 if (array_key_exists($key, $defineArray)) { // A new value is defined
-                    #print "$key EXISTS<BR>";
-                    #print "define => (" . $defineArray[$key] . ")<BR>";
                     $pattern = array (
                     "/^\\\'/",
                     "/\\\'$/"
@@ -358,7 +367,6 @@
                     "'"
                     );
                     $value = preg_replace($pattern, $replacement, trim($defineArray[$key]));
-                    #print "(define('$key', $value);)<BR>";
                     fwrite($fd, "define('$key', $value);\n"); # Write the new define($name, $value)
                 }
                 else { // The key does not exist (no new value to be saved)
@@ -380,8 +388,8 @@
  *********************************************************************************/
 switch ($page) {
     case 'Permissions' :
-        print "<h1>Permissions</h1>";
-
+        print "<h1>Folder Permissions</h1>";
+        
         $process_info_user_id = posix_getpwuid(posix_getuid());
 
         if($process_info_user_id){
@@ -410,7 +418,7 @@
         foreach ($dir_array as $dir) {
             print "<tr><td>$dir</td>";
             if (!file_exists(WIFIDOG_ABS_FILE_PATH . "$dir")) {
-                print "<TD COLSPAN=\"2\" STYLE=\"text-align:center;\">Missing</td></tr>\n";
+                print "<TD COLSPAN=\"2\" STYLE=\"text-align:center; background:red;\">Missing</td></tr>\n";
                 $cmd_mkdir .= WIFIDOG_ABS_FILE_PATH . "$dir ";
                 $cmd_chown .= WIFIDOG_ABS_FILE_PATH . "$dir ";
                 $error = 1;
@@ -428,10 +436,10 @@
             print "<td>$dir_owner_username</td>";
 
             if (is_writable(WIFIDOG_ABS_FILE_PATH . "$dir")) {
-                print "<td>YES</td>";
+                print "<td STYLE='background:lime;'>YES</td>";
             }
             else {
-                print "<td>NO</td>";
+                print "<td STYLE='background:red;'>NO</td>";
                 $cmd_chown .= WIFIDOG_ABS_FILE_PATH . "$dir ";
                 $error = 1;
             }
@@ -494,9 +502,8 @@
 
         ###########################################
     case 'Database' :
-        ### TODO : Valider en javascript que les champs soumit ne sont pas vide
-        #          Pouvoir choisir le port de la DB ???
-        print<<< EndHTML
+        ### TODO : allow choosing the port of the database
+print<<< EndHTML
 <h1>Database Access Configuration</h1>
 <BR>
 <table border="1">
@@ -524,7 +531,7 @@
             "title" => "Back",
             "page" => "Dependencies"
             ),
-            )); #, array("title" => "Next", "page" => "testdatabase")));
+            )); 
             print<<< EndHTML
 <A HREF="#" ONCLICK="javascript: document.myform.page.value='testdatabase'; submitDatabaseValue(); document.myform.submit();" CLASS="submit">Next</A>
 
@@ -534,8 +541,6 @@
             ###########################################
     case 'testdatabase' :
         print "<h1>Database connection</h1>";
-        /* TODO : Tester la version minimale requise de Postgresql                */
-
         print "<UL><LI>Trying to open a Postgresql database connection : ";
 
         $conn_string = "host=$CONF_DATABASE_HOST dbname=$CONF_DATABASE_NAME user=$CONF_DATABASE_USER password=$CONF_DATABASE_PASSWORD";
@@ -557,7 +562,6 @@
         $postgresql_info = pg_version();
         printf ("PostgreSQL server version: %s", $postgresql_info['server']);        print "</li>";
 
-        #        if ($postgresql_info['server'] > $requiredPostgeSQLVersion) { Todo : Do something }
 
 
         print "</UL>";
@@ -576,27 +580,12 @@
             ###########################################
     case 'dbinit' :
         print "<h1>Database Initialisation</h1>";
-        # SQL are executed with PHP, some lines need to be commented out.
-        $file_db_version = 'UNKNOW';
-        $patterns[0] = '/CREATE DATABASE wifidog/';
-        $patterns[1] = '/\\\connect/';
-        //The following is strictly for compatibility with postgresql 7.4
-        $patterns[2] = '/COMMENT/';
-        $patterns[3] = '/^SET /m';
-        $patterns[4] = '/CREATE PROCEDURAL LANGUAGE/';
-        $patterns[5] = '/ALTER SEQUENCE/';
-        $patterns[6] = '/::regclass/';//To fix incompatibility of postgres < 8.1 with later nextval() calling convention
-        $replacements[0] = '-- ';
-        $replacements[1] = '-- ';
-        $replacements[2] = '-- ';
-        $replacements[3] = '-- ';
-        $replacements[4] = '-- ';
-        $replacements[5] = '-- ';
-        $replacements[6] = '::text';
-
+        
         $content_schema_array = file(WIFIDOG_ABS_FILE_PATH . "../sql/wifidog-postgres-schema.sql") or die("<em>Error</em>: Can not open $basepath/../sql/wifidog-postgres-schema.sql"); # Read SQL schema file
         $content_schema = implode("", $content_schema_array);
-        $content_data_array = file(WIFIDOG_ABS_FILE_PATH . "../sql/wifidog-postgres-initial-data.sql"); # Read SQL initial data file
+
+        $content_data_array = file(WIFIDOG_ABS_FILE_PATH . "../sql/initaldata/wifidog-postgres-initial-data.sql"); # Read SQL initial data file
+
         $content_data = implode("", $content_data_array);
 
         $db_schema_version = ''; # Schema version query from database
@@ -619,25 +608,7 @@
 
         # Get current database schema version (if defined)
         $schemaVersionSql = "SELECT * FROM schema_info WHERE tag='schema_version'";
-
-        if (!@ pg_query($connection, $schemaVersionSql)) { # The @ remove warning display
-
-            print "<UL><LI>Database did not exist, creating wifidog database schema : ";
-            $content_schema = preg_replace($patterns, $replacements, $content_schema); # Comment bad SQL lines
-            //echo "<pre>$content_schema</pre>";
-            $result = pg_query($connection, $content_schema) or die("<em>" . pg_last_error() . "</em> <=<BR>");
-            print "OK</li>";
-
-            print "<LI>Adding wifidog initial data to database: ";
-            $content_data = preg_replace($patterns, $replacements, $content_data); # Comment bad SQL lines
-
-            $result = pg_query($connection, $content_data) or die("<em>" . pg_last_error() . "</em> <=<BR>");
-            print "OK</li>";
-            print "</UL>";
-
-        }
-
-        if ($result = @ pg_query($connection, $schemaVersionSql)) { # The @ remove warning display
+            if ($result = @ pg_query($connection, $schemaVersionSql)) { # The @ remove warning display
             $result_array = pg_fetch_all($result);
             $db_shema_version = $result_array[0]['value'];
 
@@ -663,7 +634,58 @@
 
         }
 
-        navigation(array (
+    if (!@ pg_query($connection, $schemaVersionSql)) { # The @ remove warning display
+
+            print "<UL><LI>Database did not exist, creating wifidog database schema : ";
+            $content_schema = preg_replace($patterns, $replacements, $content_schema); # Comment bad SQL lines
+            //echo "<pre>$content_schema</pre>";
+            $result = pg_query($connection, $content_schema) or die("<em>" . pg_last_error() . "</em> <BR>");
+            print "OK</li>";
+
+            print "<LI>Checking the wifidog initial sql data directory: ";
+
+            print "</li></ul><BR><H3>Please select the inital data to populate the database with: </H3><br>";
+            
+
+            //Looks into the directory and returns the files, no subdirectories
+                print "<select name='inital_db_data'>";
+
+                $dh = opendir($dirpath);
+                while (false !== ($file = readdir($dh))) {
+                //Don't list subdirectories
+                        if (!is_dir("$dirpath/$file")) {
+                                if (htmlspecialchars(ucfirst(preg_replace('/\..*$/', '', $file))) == "wifidog-postgres-initial-data.sql") {
+                                    $_selected = (' selected="selected"');
+                                } else {#else leave it alone
+                                    $_selected = "";
+                                }
+                        //Truncate the file extension and capitalize the first letter
+                        echo '<option value="' . $file . '"' . $_selected . '>' . htmlspecialchars(ucfirst(preg_replace('/\..*$/', '', $file))) . '</option>';
+                        }
+                }
+                closedir($dh); 
+            #     echo "<option value='custom'>import a different file</option>";
+        //Close Select
+
+        print "</select><br><br>";
+        
+//OK button to continue installing
+
+print<<<EndHTML
+
+<A HREF='#' ONCLICK='datavalue(document.myform.inital_db_data.value);' CLASS='submit'>ok</A><br><br>
+<DIV style="border:solid black;">If you would like to backup your wifidog database run the following terminal command: <Strong>/usr/bin/pg_dump -h $CONF_DATABASE_HOST -p 5432 -U $CONF_DATABASE_USER -F p -O -d -f "/save_dir/filename.sql" $CONF_DATABASE_NAME</strong>. When you reinstall WiFiDog add the file to the following directory: <strong>$dirpath</strong> </DIV>
+<SCRIPT type="text/javascript">
+function datavalue(data){
+document.myform.action.value = data;
+document.myform.page.value = 'dbinitdata';
+document.myform.submit();  
+}
+</SCRIPT>
+EndHTML;
+    }
+else {
+navigation(array (
         array (
             "title" => "Back",
             "page" => "testdatabase"
@@ -673,7 +695,46 @@
             "page" => "options"
             )
             ));
-            break;
+
+            }
+
+
+
+break;
+         case 'dbinitdata' :   
+print "<UL><LI>Adding wifidog initial data to database... ";
+            $conn_string = "host=$CONF_DATABASE_HOST dbname=$CONF_DATABASE_NAME user=$CONF_DATABASE_USER password=$CONF_DATABASE_PASSWORD";
+            $connection = pg_connect($conn_string) or die(); # or die("Couldn't Connect ==".pg_last_error()."==<BR>");
+        $content_data_array = file("$dirpath$action"); # Read SQL data file
+
+        $content_data = implode("", $content_data_array);
+
+        if (preg_match("/\('schema_version', '(\d+)'\);/", $content_data, $matchesArray)) # Get schema_version from the data file
+        $file_db_version = $matchesArray[1];
+
+        $contentArray = file(WIFIDOG_ABS_FILE_PATH . "include/schema_validate.php");
+        foreach ($contentArray as $line) {
+            if (preg_match("/^define\('REQUIRED_SCHEMA_VERSION', (\d+)\);/", $line, $matchesArray)) {
+                $file_schema_version = $matchesArray[1];
+            }
+        }
+
+            $content_data = preg_replace($patterns, $replacements, $content_data); # Comment bad SQL lines
+
+            $result = pg_query($connection, $content_data) or die("<em>" . pg_last_error() . "</em> <=<BR>");
+            print "OK</li>";
+            print "</UL>";
+ 
+
+ navigation(array (
+            array (
+            "title" => "Next",
+            "page" => "dbinit"
+            )
+            ));
+
+break;
+
             ###########################################
     case 'options' :
         # TODO : Tester que la connection SSL est fonctionnelle
@@ -812,8 +873,7 @@
             ###########################################
     case 'admin' :
         print "<h1>Administration accounts</h1>";
-        # TODO : Allow to create more than one admin account and list the current admin users
-        #        Allow admin to choose to show or not is username
+
         empty ($_REQUEST['username']) ? $username = 'admin' : $username = $_REQUEST['username'];
         empty ($_REQUEST['password']) ? $password = '' : $password = $_REQUEST['password'];
         empty ($_REQUEST['password2']) ? $password2 = '' : $password2 = $_REQUEST['password2'];
@@ -875,7 +935,7 @@
         </tr>
         </table>
 
-        <script type="text/javascript"> // TODO: check whether user already exists
+        <script type="text/javascript">
           function submitValue() {
 	    if (document.myform.username.value == '') {
               alert('Please enter a username');
@@ -944,22 +1004,23 @@
                |\   /|              _
                |A\_/A|            z   z
             ___|     |           ( (o) )
-           o    6     \           z _ z
+           o    @     \           z _ z
            |___        \           /|
                |        \         / |
                 \        \_______/  |
                 |                   |
-                |      WIFIDOG      |
+                |      WiFiDog      |
                 |   Captive Portal  |
                 |   _____________   |
                 |  /             \  |
                 |  |             |  |
                 |  |             |  |
               _/   |           _/   |
-             ?_____|          ?_____|
+             #_____|          #_____|
 </pre>
 EndHTML;
         navigation(array(array("title" => "Back", "page" => "admin")));
+        $auth = false;
         break;
         ###########################################
     case 'review' :
@@ -1010,6 +1071,22 @@
                 break;
 
                 ###########################################
+
+    case 'changelog' :
+        echo "<h1>Change log</h1>";
+
+print"<pre>";
+        include WIFIDOG_ABS_FILE_PATH . '../CHANGELOG';
+print"</pre>";
+
+        navigation(array (
+        array (
+                "title" => "Back",
+                "page" => "Welcome"
+                ),
+               ));
+               break;
+                ###########################################
     default :
         $WIFIDOG_VERSION = $configArray['WIFIDOG_VERSION'];
         print<<<EndHTML
@@ -1020,7 +1097,7 @@
 
 <h3>THIS PROGRAM IS STILL IN A BETA STAGE, PLEASE REPORT ANY BUGS AT <a href="http://dev.wifidog.org">http://dev.wifidog.org</a></h3>
 
-<p>To Continue this installation you will need to enter the password found in the file: <em>$password_file</em> on your server's filesystem. Please enter it when prompted. This is to stop accidental or malicious activity from users gaining access to the install.php file if you dont move it from the base directory. <strong>PLEASE LEAVE THE USERNAME FIELD BLANK</strong></p>
+<p>To Continue this installation you will need to enter the password found in the file: <em>$password_file</em> on your servers filesystem. Please enter it when prompted. This is to stop accidental or malicious activity from users gaining access to the install.php file if you dont move it from the base directory. <strong>PLEASE LEAVE THE USERNAME FIELD BLANK</strong></p>
 
 EndHTML;