Changeset 25

Timestamp:

2007-11-23 15:57:17 (4 years ago)

Author:

hannes

Message:

made failures of the installer less fatal (ticket #11):

• template files are only deleted once everything is done
  
• database is emptied again on failure
  

Files:

• trunk/db/clean.sql (added)
• trunk/includes/lang/en.php (modified) (1 diff)
• trunk/install.php (modified) (4 diffs)

trunk/includes/lang/en.php

@@ -397 +397 @@
-$LANG['installer_database_success'] = 'The database has been set up successfully.';
-$LANG['installer_overall_success'] = "Congratulations! Your Spam Board has been fully set up. If you didn't see any error messages or warnings, it should now be fully functional.<br /><br />You still have some work to do, of course:<ol><li>delete this installer script</li><li>go to <a href=\"%boardurl%\">your board</a></li><li>log in with the admin account you just created</li><li>go to the Administration Panel</li><li>set up at least one category and one forum</li><li>set appropriate permissions on this forum</li><li>deactive maintainance mode in the settings</li></ol>";
+$LANG['installer_warning_cleanup_failed'] = "Warning: Although the installation of your board has been finished successfully, the install script didn't manage to clean every up. This isn't fatal at all, it just meant there are still a few pre-install files floating around your directory tree. If you like to have it completely clean, delete all .tmpl files in includes/config/.";
-
-/* error messages */

trunk/install.php

@@ -169 +169 @@
-                    // include new settings again
-                    require('includes/config/settings.php');
-                    // remove settings.tmpl
-                    unlink('includes/config/settings.tmpl');
-                } else { $ok = 0; }
-                /* initialize crypto module */
@@ -187 +185 @@
-                            // set permissions
-                            @chmod('includes/config/crypt.php', 0660);
-                            // remove template
-                            unlink('includes/config/crypt.tmpl');
-                            // get new crypto settings
-                            require('includes/config/crypt.php');
@@ -194 +190 @@
-                    } else { $ok = 0; }
-                } else { $ok = 0; }
-move
-rename
+copy
+copy
-                    @chmod('includes/config/bans.php', 0660);
-                } else { $ok = 0; }
-rename
+copy
-                    @chmod('includes/config/logins.php', 0660);
-                } else { $ok = 0; }
-rename
+copy
-                    @chmod('includes/config/memberstages.php', 0660);
-                } else { $ok = 0; }
@@ -297 +293 @@
-            }
-        }
+        /* clean up */
+        if ($ok == 1) {
+            // remove settings.tmpl
+            if (@unlink('includes/config/settings.tmpl')) {
+            } else { $ok = 2; }
+            // remove crypt.tmpl
+            if (@unlink('includes/config/crypt.tmpl')) {
+            } else { $ok = 2; }
+            // remove bans.tmpl
+            if (@unlink('includes/config/bans.tmpl')) {
+            } else { $ok = 2; }
+            // remove logins.tmpl
+            if (@unlink('includes/config/logins.tmpl')) {
+            } else { $ok = 2; }
+            // remove memberstages.tmpl
+            if (@unlink('includes/config/memberstages.tmpl')) {
+            } else { $ok = 2; }
+        } else {
+            // something went wrong, so remove everything from the database again
+            if ($db = @file_get_contents('db/clean.sql')) {
+                // one SQL query at a time
+                $db = explode(';', $db);
+                foreach ($db as $query) {
+                    $C->query(str_replace('%prefix%', $SETTINGS['dbtableprefix'], $query));
+                }
+            }
+        }
-        /* everything done */
-
+
+
+
+
-            print(str_replace('%boardurl%', 'http://' . $_SERVER['HTTP_HOST'] . $SETTINGS['webpath'] , $LANG['installer_overall_success']));
-        }