From 72c7fed975ce797da1f33ea82651c5a91ce3957e Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 8 Mar 2009 21:21:09 +0000
Subject: Log the user in as admin after running the web installer, and give
 them a nice "Welcome to Gallery 3" dialog.  The text in there needs a little
 work but it's a start.

In the process, re-build the install.sql using the scaffolding code.
---
 core/helpers/core_installer.php | 8 ++++----
 core/helpers/core_theme.php     | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'core/helpers')

diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index 06cd8d91..5c3b9ff0 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -82,7 +82,7 @@ class core_installer {
                    PRIMARY KEY (`id`),
                    KEY `parent_id` (`parent_id`),
                    KEY `type` (`type`),
-                   KEY `random` (`rand_key` DESC))
+                   KEY `random` (`rand_key`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
       $db->query("CREATE TABLE {logs} (
@@ -122,7 +122,7 @@ class core_installer {
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`name`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-      
+
       $db->query("CREATE TABLE {permissions} (
                    `id` int(9) NOT NULL auto_increment,
                    `name` varchar(64) default NULL,
@@ -195,9 +195,9 @@ class core_installer {
       access::register_permission("edit", "Edit");
 
       $root = ORM::factory("item");
-      $root->type = 'album';
+      $root->type = "album";
       $root->title = "Gallery";
-      $root->description = "Welcome to your Gallery3";
+      $root->description = "";
       $root->left = 1;
       $root->right = 2;
       $root->parent_id = 0;
diff --git a/core/helpers/core_theme.php b/core/helpers/core_theme.php
index db40f368..eed64ded 100644
--- a/core/helpers/core_theme.php
+++ b/core/helpers/core_theme.php
@@ -88,6 +88,10 @@ class core_theme_Core {
     if (Session::instance()->get("l10n_mode", false)) {
       return L10n_Client_Controller::l10n_form();
     }
+
+    if (Input::instance()->get("after_install")) {
+      return new View("after_install_loader.html");
+    }
   }
 
   static function admin_page_bottom($theme) {
-- 
cgit v1.2.3