Simplification pass over the installer:

- Flattened the directory structure
- Greatly simplified structure in installer; it now only reports environmental
  checks that fail.  Simplified code that prints exceptions.  Use only mysql
  calls for the installer, but select mysqli automatically if it's available.
  Drop the response file; that's easily replicated with flag support
- Create a random password for the admin user
- Delete unused controllers
- Invert the form of the database config template to be mostly non-PHP
  with just a few PHP calls

1 files changed, 0 insertions, 80 deletions

diff --git a/installer/controllers/installer.php b/installer/controllers/installer.php
deleted file mode 100644
index 9c9491b7..00000000
--- a/installer/controllers/installer.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class Installer_Controller extends Template_Controller {
-  public $template = "welcome.html";
-
-  function index() {
-    $this->template->syscheck = new View("install.html");
-    $this->template->syscheck->errors = $this->_get_config_errors();
-    $this->template->syscheck->modules = array();
-  }
-
-  private function _get_config_errors() {
-    $errors = array();
-    if (!file_exists(VARPATH)) {
-      $error = new stdClass();
-      $error->message = "Missing: " . VARPATH;
-      $error->instructions[] = "mkdir " . VARPATH;
-      $error->instructions[] = "chmod 777 " . VARPATH;
-      $errors[] = $error;
-    } else if (!is_writable(VARPATH)) {
-      $error = new stdClass();
-      $error->message = "Not writable: " . VARPATH;
-      $error->instructions[] = "chmod 777 " . VARPATH;
-      $errors[] = $error;
-    }
-
-    $db_php = VARPATH . "database.php";
-    if (!file_exists($db_php)) {
-      $error = new stdClass();
-      $error->message = "Missing: $db_php <br/> Run the following commands...";
-      $error->instructions[] = "cp " . DOCROOT . "kohana/config/database.php $db_php";
-      $error->instructions[] = "chmod 644 $db_php";
-      $error->message2 = "...then edit this file and enter your database configuration settings.";
-      $errors[] = $error;
-    } else if (!is_readable($db_php)) {
-      $error = new stdClass();
-      $error->message = "Not readable: $db_php";
-      $error->instructions[] = "chmod 644 $db_php";
-      $error->message2 = "Then edit this file and enter your database configuration settings.";
-      $errors[] = $error;
-    } else {
-      $old_handler = set_error_handler(array("Welcome_Controller", "_error_handler"));
-      try {
-        Database::instance()->connect();
-      } catch (Exception $e) {
-        $error = new stdClass();
-        $error->message = "Database error: {$e->getMessage()}";
-        $db_name = Kohana::config("database.default.connection.database");
-        if (strchr($error->message, "Unknown database")) {
-          $error->instructions[] = "mysqladmin -uroot create $db_name";
-        } else {
-          $error->instructions = array();
-          $error->message2 = "Check " . VARPATH . "database.php";
-        }
-        $errors[] = $error;
-      }
-      set_error_handler($old_handler);
-    }
-
-    return $errors;
-  }
-
-}
\ No newline at end of file