Changeset 1499 for trunk/gregarius/install.php

Timestamp:

06/15/06 15:43:33 (2 years ago)

Author:

mdodoo

Message:

Streamlined installer (instantly go to the admin section after successful writing of dbinit.php!). Fixes #372.

Files:

• trunk/gregarius/install.php (modified) (6 diffs)

trunk/gregarius/install.php

@@ -26 +26 @@
 ###############################################################################
 
-define('GREGARIUS_RELEASE', '0.5.4');
-define('GREGARIUS_CODENAME', 'Coots');
+define('GREGARIUS_RELEASE', '0.5.5');
+define('GREGARIUS_CODENAME', 'null');
 
 define('DBINIT', dirname(__FILE__) . '/dbinit.php');
@@ -50 +50 @@
 define('ADMIN_PASSWORD_HELP', 'The administrator password used to connect to the database. Make sure this user has GRANT privileges!');
 define('WEBSERVER_HELP', 'The location of the webserver. If in doubt, leave the default. Default: ' . WEB_SERVER_DEFAULT . '');
+
+global $hasWritePerm;
 
 function install_main() {
@@ -246 +248 @@
     . "<p><input type=\"hidden\" name=\"process\" value=\"1\" /></p>\n"
     . "</form>\n"
-    . "<form method=\"post\" action=\"" . $_SERVER['PHP_SELF'] . "\">\n"
-    . "<h2>Step 5: Activate mod-rewrite (optional)</h2>\n"
-    . "<p><input type=\"submit\" name=\"action\" value=\"" . ($hasWritePerm ? "Activate mod-rewrite" : "Download .htaccess file") . "\" /></p>\n"
-    . "<p><input type=\"hidden\" name=\"process\" value=\"2\" /></p>\n"
-    . "</form>\n"
-    . "<form method=\"post\" action=\"" . $_SERVER['PHP_SELF'] . "\">\n"
-    . "<h2>Step 6: Goto Admin Section</h2>\n"
-    . "<p><input type=\"submit\" name=\"action\" value=\"Start Using Gregarius!\" /></p>\n"
-    . "<p><input type=\"hidden\" name=\"process\" value=\"3\" /></p>\n"
-    . "</form>\n"
     . "</div>\n"
     . "</body>\n"
@@ -261 +253 @@
 }
 
-if(file_exists(DBINIT)) {
+if(file_exists(DBINIT) && empty($_POST['process'])) {
     print("The dbinit.php file already exists in the Gregarius directory! Please remove it if you would like to use this installer.");
-} else if(!empty($_POST['process'])){
-// process the post data
-    if(3 == $_POST['process']) {
-        header('Location: admin/');
-        exit();
-    } else if(2 == $_POST['process']) {
-        $success = @rename('.htaccess.disabled', '.htaccess');
-        if(false == $success) {
-            $htaccess = file('.htaccess.disabled', 'r');
-            header('Content-type: application/text');
-            header('Content-Disposition: attachment; filename=".htaccess"');
-            echo($htaccess);
-        }
-
-        exit();
-    } else if(1 == $_POST['process']) {
+} else if(1 == $_POST['process']) {
         if(empty($_POST['server']) ||
             empty($_POST['database']) ||
@@ -304 +281 @@
                 if(!$sql) {
                     print("Unable to connect to database! Please create manually.");
-                } else {
-            }
+                }
             } else {
                 print("Invalid SQL Type!");
@@ -382 +358 @@
                 fclose($fp);
 
-                exit();
-            }
-        }
+                header('Location: admin/');
+                exit();
+            }
     }
 } else { // dbinit.php does not exist and we are not asked to process