Changeset 1711 for branches/3.4/lib/install.php

Timestamp:

08/30/08 12:49:26 (4 months ago)

Author:

vollmerk

Message:

improve error reporting on install and add in use existing database option

Files:

• branches/3.4/lib/install.php (modified) (3 diffs)

branches/3.4/lib/install.php

@@ -107 +107 @@
         } 
 
-
         $data['database_username'] = $username; 
         $data['database_password'] = $password; 
@@ -113 +112 @@
         $data['database_name']     = $database;
 
-        if (!strlen($data['database_password'])) { 
-                Error::add('general','Error: Password required for Database creation'); 
-                return false; 
-        } 
-        
         Config::set_by_array($data,'1'); 
         
@@ -133 +127 @@
         $db_selected = @mysql_select_db($database, $dbh);
 
-        if ($db_selected && !$_POST['overwrite_db']) { 
+        if ($db_selected && $_POST['existing_db']) { 
+                // Rien a faire, we've got the db just blow through
+        } 
+        elseif ($db_selected && !$_POST['overwrite_db']) { 
                 Error::add('general','Error: Database Already exists and Overwrite not checked'); 
                 return false;