[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.27,1.28

[<tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv32121

Modified Files:
	serendipity_admin_installer.inc.php 
Log Message:
100% UNTESTED

We try and check if the table {PREFIX}authors contains users. 
If it does, we assume the database is already correctly installed, and so we skip the database installation...


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_admin_installer.inc.php	9 Aug 2003 12:45:04 -0000	1.27
+++ serendipity_admin_installer.inc.php	16 Aug 2003 21:33:56 -0000	1.28
@@ -270,7 +270,15 @@
 
 function serendipity_installDatabase() {
     global $serendipity;
+    
+    /* Try and check if the database/tables are already installed,
+       if they are... exit the function */
+    $t = serendipity_db_query("SELECT * FROM {$_POST['dbPrefix']}authors");
+    if (is_array($t)) {
+        return false;
+    }
 
+    
     // Create tables
     $queries = serendipity_parse_sql_tables('./db.sql');
     $queries = str_replace('{PREFIX}', $_POST['dbPrefix'], $queries);
@@ -399,10 +407,10 @@
             /* We are good to go, lets install databases etc. */
             echo ATTEMPT_SETUP_DATABASE;
             $res = serendipity_installDatabase();
-            if ( !is_string($res) ) {
+            if ( $res !== false ) {
                 echo ' ' . DONE . '<br />';
             } else {
-                echo '<span style="color: #FF0000">- ' . $res . '</span><br />';
+                echo '<span style="color: #FF0000">- SKIPPED: Database already installed</span><br />';
             }
 
             /* Next are the files, .htaccess */