From 46d010e89d280d391935648f1f713fc784042050 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Mon, 19 Jan 2009 03:31:13 +0000 Subject: 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 --- installer/views/database.php.php | 44 -------------------------------- installer/views/installer.html.php | 49 ------------------------------------ installer/views/installer.txt.php | 51 -------------------------------------- 3 files changed, 144 deletions(-) delete mode 100644 installer/views/database.php.php delete mode 100644 installer/views/installer.html.php delete mode 100644 installer/views/installer.txt.php (limited to 'installer/views') diff --git a/installer/views/database.php.php b/installer/views/database.php.php deleted file mode 100644 index 42268422..00000000 --- a/installer/views/database.php.php +++ /dev/null @@ -1,44 +0,0 @@ - 'mysql://dbuser:secret@localhost/kohana'\n"; -print " * character_set - Database character set\n"; -print " * table_prefix - Database table prefix\n"; -print " * object - Enable or disable object results\n"; -print " * cache - Enable or disable query caching\n"; -print " * escape - Enable automatic query builder escaping\n"; -print " */\n"; -print "\$config['default'] = array(\n"; -print " 'benchmark' => FALSE,\n"; -print " 'persistent' => FALSE,\n"; -print " 'connection' => array(\n"; -print " 'type' => '{$data['type']}',\n"; -print " 'user' => '{$data['user']}',\n"; -print " 'pass' => '{$data['password']}',\n"; -print " 'host' => '{$data['host']}',\n"; -print " 'port' => FALSE,\n"; -print " 'socket' => FALSE,\n"; -print " 'database' => '{$data['database']}'\n"; -print " ),\n"; -print " 'character_set' => 'utf8',\n"; -print " 'table_prefix' => '{$data['prefix']}',\n"; -print " 'object' => TRUE,\n"; -print " 'cache' => FALSE,\n"; -print " 'escape' => TRUE\n"; -print ");\n"; diff --git a/installer/views/installer.html.php b/installer/views/installer.html.php deleted file mode 100644 index 43692846..00000000 --- a/installer/views/installer.html.php +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - Gallery3 Requirements Verification - - - - - - -

- -

- -
- - - $msg): ?> - - - - - - -
"> - -
-
- - - \ No newline at end of file diff --git a/installer/views/installer.txt.php b/installer/views/installer.txt.php deleted file mode 100644 index 986b9297..00000000 --- a/installer/views/installer.txt.php +++ /dev/null @@ -1,51 +0,0 @@ - - $msg) { - print_msg($header, $msg["text"], $msg["error"]); - } -} - -echo "+", str_repeat("-", 98), "+\n"; - -if (self::$config_errors) { - printf("| %-96.96s |\n", magenta_start() . - "Please fix the identified issues before attempting the install" . color_end()); - echo "+", str_repeat("-", 98), "+\n"; -} -flush(); \ No newline at end of file -- cgit v1.2.3