Changeset 2819

Timestamp:

11/17/08 02:30:09 (8 weeks ago)

Author:

freakerz

Message:

Removing the index.php installer calls, fix the default form values, also fix the locale change. Will probably cache the FormUI since we call locale-form twice... and probably more during install. Oh and fixed the class change of installstep rather than options.

Location:

branches/081018-handlers/htdocs

Files:

• index.php (modified) (2 diffs)
• system/classes/installhandler.php (modified) (3 diffs)
• system/schema/mysql/install/mysqlinstall.php (modified) (4 diffs)
• system/schema/pgsql/install/pgsqlinstall.php (modified) (4 diffs)
• system/schema/sqlite/install/sqliteinstall.php (modified) (2 diffs)
• system/themes/installer/locale_dropdown.php (deleted)
• system/themes/installer/script.js (modified) (1 diff)
• system/themes/installer/theme.php (modified) (11 diffs)

branches/081018-handlers/htdocs/index.php

@@ -20 +20 @@
 date_default_timezone_set( 'UTC' );
 
+define('MIN_PHP_VERSION', '5.2.0');
+
 // Compares PHP version against our requirement.
-if ( ! version_compare( PHP_VERSION, '5.2.0', '>=' ) ) {
+if ( ! version_compare( PHP_VERSION, MIN_PHP_VERSION, '>=' ) ) {
     die ( 'Habari needs PHP 5.2.x or higher to run. You are currently running PHP ' . PHP_VERSION . '.' );
 }
@@ -112 +114 @@
 Error::handle_errors();
 
-/* Initiate install verifications */
-
-
-/**
- * We make sure the configuration file exist.
- * If it does, we load it and check it's validity.
- *
- * @todo Call the installer from the database classes.
- */
-/*if ( file_exists( $config ) ) {
-    require_once $config;
-
-    if ( !defined( 'DEBUG' ) ) define( 'DEBUG', false );
-
-    // Make sure we have a DSN string and database credentials.
-    // $db_connection is an array with necessary informations to connect to the database.
-    if ( ! isset($db_connection) ) {
-        $installer = new InstallHandler();
-        $installer->begin_install();
-    }
-
-    // Try to connect to the database.
-    if (DB::connect()) {
-        // Make sure Habari is installed properly.
-        // If the 'installed' option is missing, we assume the database tables are missing or corrupted.
-        // @todo Find a decent solution, we have to compare tables and restore or upgrade them.
-        if (! @ Options::get('installed')) {
-            $installer = new InstallHandler();
-            $installer->begin_install();
-        }
-    }
-    else {
-        $installer = new InstallHandler();
-        $installer->begin_install();
-    }
-}
-else
-{
-    if ( !defined( 'DEBUG' ) ) define( 'DEBUG', false );
-    // The configuration file does not exist.
-    // Therefore we load the installer to create the configuration file and install a base database.
-    $installer = new InstallHandler();
-    $installer->begin_install();
-} */
-
 DB::connect();
 

branches/081018-handlers/htdocs/system/classes/installhandler.php

@@ -1 +1 @@
 <?php
-define('MIN_PHP_VERSION', '5.2.0');
-
 /**
  * The class which responds to installer actions
@@ -28 +26 @@
          * Set user selected Locale or default
          */
-        $this->theme->locales = Locale::list_all();
         if ( isset($_POST['locale']) && $_POST['locale'] != null ) {
             Locale::set($_POST['locale']);
             $this->theme->locale = $_POST['locale'];
             $this->handler_vars['locale'] = $_POST['locale'];
-        }
-        else {
-            Locale::set( 'en-us' );
-            $this->theme->locale = 'en-us';
-            $this->handler_vars['locale'] = 'en_us';
         }
 
@@ -137 +129 @@
         EventLog::log(_t('Habari successfully installed.'), 'info', 'default', 'habari');
         return true;
-    }
-    
-    /*
-     * Helper function to grab list of plugins
-     */
-    public function get_plugins() {
-        $all_plugins = Plugins::list_all();
-        $recommended_list = array(
-            'coredashmodules.plugin.php',
-            'habarisilo.plugin.php',
-            'pingback.plugin.php',
-            'spamchecker.plugin.php',
-            'undelete.plugin.php'
-        );
-
-        foreach ( $all_plugins as $file ) {
-            $plugin = array();
-            $plugin_id = Plugins::id_from_file( $file );
-            $plugin['plugin_id']= $plugin_id;
-            $plugin['file']= $file;
-
-            $error = '';
-            if ( Utils::php_check_file_syntax( $file, $error ) ) {
-                $plugin['debug']= false;
-                // instantiate this plugin
-                // in order to get its info()
-                include_once( $file );
-                Plugins::get_plugin_classes();
-                $pluginobj = Plugins::load( $file, false );
-                $plugin['active']= false;
-                $plugin['verb']= _t( 'Activate' );
-                $plugin['actions']= array();
-                $plugin['info']= $pluginobj->info;
-                $plugin['recommended'] = in_array( basename($file), $recommended_list );
-            }
-            else {
-                $plugin['debug']= true;
-                $plugin['error']= $error;
-                $plugin['active']= false;
-            }
-            
-            $plugins[$plugin_id]= $plugin;
-        }
-        
-        return $plugins;
     }
     

branches/081018-handlers/htdocs/system/schema/mysql/install/mysqlinstall.php

@@ -22 +22 @@
         
         $form->mysqlsettings->append('text', 'mysqldatabasehost', 'null:null', _t('Database Host'));
-        $form->mysqldatabasehost->value = $theme->mysqldatabasehost;
+        $form->mysqldatabasehost->value = 'localhost';
         $form->mysqldatabasehost->required = true;
         $form->mysqldatabasehost->help = _t('<strong>Database Host</strong> is the host (domain) name or server IP
@@ -31 +31 @@
         
         $form->mysqlsettings->append('text', 'mysqldatabaseuser', 'null:null', _t('Username'));
-        $form->mysqldatabaseuser->value = $theme->mysqldatabaseuser;
         $form->mysqldatabaseuser->required = true;
         $form->mysqldatabaseuser->help = _t('<strong>Database User</strong> is the username used to connect Habari
@@ -37 +36 @@
         
         $form->mysqlsettings->append('text', 'mysqldatabasepass', 'null:null', _t('Password'));
-        $form->mysqldatabasepass->value = $theme->mysqldatabasepass;
         $form->mysqldatabasepass->required = true;
         $form->mysqldatabasepass->help = _t('<strong>Database Password</strong> is the password used to connect
@@ -43 +41 @@
         
         $form->mysqlsettings->append('text', 'mysqldatabasename', 'null:null', _t('Database Name'));
-        $form->mysqldatabasename->value = $theme->mysqldatabasename;
+        $form->mysqldatabasename->value = 'habari';
         $form->mysqldatabasename->required = true;
         $form->mysqldatabasename->help = _t('<strong>Database Name</strong> is the name of the MySQL database to

branches/081018-handlers/htdocs/system/schema/pgsql/install/pgsqlinstall.php

@@ -22 +22 @@
         
         $form->pgsqlsettings->append('text', 'pgsqldatabasehost', 'null:null', _t('Database Host'));
-        $form->pgsqldatabasehost->value = $theme->pgsqldatabasehost;
+        $form->pgsqldatabasehost->value = 'localhost';
         $form->pgsqldatabasehost->required = true;
         $form->pgsqldatabasehost->help = _t('<strong>Database Host</strong> is the host (domain) name or server IP
@@ -31 +31 @@
         
         $form->pgsqlsettings->append('text', 'pgsqldatabaseuser', 'null:null', _t('Username'));
-        $form->pgsqldatabaseuser->value = $theme->pgsqldatabaseuser;
         $form->pgsqldatabaseuser->required = true;
         $form->pgsqldatabaseuser->help = _t('<strong>Database User</strong> is the username used to connect Habari
@@ -37 +36 @@
         
         $form->pgsqlsettings->append('text', 'pgsqldatabasepass', 'null:null', _t('Password'));
-        $form->pgsqldatabasepass->value = $theme->pgsqldatabasepass;
         $form->pgsqldatabasepass->required = true;
         $form->pgsqldatabasepass->help = _t('<strong>Database Password</strong> is the password used to connect
@@ -43 +41 @@
         
         $form->pgsqlsettings->append('text', 'pgsqldatabasename', 'null:null', _t('Database Name'));
-        $form->pgsqldatabasename->value = $theme->pgsqldatabasename;
+        $form->pgsqldatabasename->value = 'habari';
         $form->pgsqldatabasename->required = true;
         $form->pgsqldatabasename->help = _t('<strong>Database Name</strong> is the name of the PostgreSQL database to

branches/081018-handlers/htdocs/system/schema/sqlite/install/sqliteinstall.php

@@ -22 +22 @@
         
         $form->sqlitesettings->append('text', 'databasefile', 'null:null', _t('Data file'));
-        $form->databasefile->value = $theme->databasefile;
+        $form->databasefile->value = 'habari.db';
         $form->databasefile->required = true;
         $form->databasefile->help = _t('<strong>Data file</strong> is the SQLite file that will store 
@@ -45 +45 @@
         $theme->handler_vars['db_file']= $remainder;
     }
+    
+    /**
+     * Checks for the existance of a SQLite datafile
+     * tries to create it if it does not exist
+    **/
+    private function check_sqlite() {
+        $db_file = $this->db_file;
+        if ( file_exists( $db_file ) && is_writable( $db_file ) && is_writable( dirname( $db_file ) ) ) {
+            // the file exists, and is writable.  We're all set
+            return true;
+        }
+
+        // try to figure out what the problem is.
+        if ( file_exists( $db_file ) ) {
+            // the DB file exists, why can't we access it?
+            if ( ! is_writable( $db_file ) ) {
+                $this->assign('form_errors', array('db_file'=>_t('The SQLite data file is not writable by the web server.') ) );
+                return false;
+            }
+            if ( ! is_writable( dirname( $db_file ) ) ) {
+                $this->assign('form_errors', array('db_file'=>_t('SQLite requires that the directory that holds the DB file be writable by the web server.') ) );
+                return false;
+            }
+        }
+
+        if ( ! file_exists( $db_file ) ) {
+            // let's see if the directory is writable
+            // so that we could create the file
+            if ( ! is_writable( dirname( $db_file ) ) ) {
+                $this->assign('form_errors', array('db_file'=>_t('The SQLite data file does not exist, and it cannot be created in the specified directory.  SQLite requires that the directory containing the database file be writable by the web server.')) );
+                return false;
+            }
+        }
+        return true;
+    }
+    
 
     /**

branches/081018-handlers/htdocs/system/themes/installer/script.js

@@ -56 +56 @@
         if(installok) {
             $('#siteconfiguration').addClass('done');
-            $('#install').children('.options').fadeIn().addClass('ready').addClass('done');
-            $('#pluginactivation').children('.options').fadeIn().addClass('ready').addClass('done');
+            $('#install').children('.options').fadeIn().parent().addClass('ready').addClass('done');
+            $('#pluginactivation').children('.options').fadeIn().parent().addClass('ready').addClass('done');
             $('#pluginactivation').children('.help-me').show();
             $('#submitinstall').removeAttr( 'disabled' );

branches/081018-handlers/htdocs/system/themes/installer/theme.php

@@ -4 +4 @@
 class DefaultInstaller extends Theme
 {
-        
+            
     public function filter_control_theme_dir( $dirs )
     {
@@ -10 +10 @@
     }
     
+    public function add_template_vars()
+    {
+        Locale::set( $this->form_locales()->locales->value );
+        $this->plugins = $this->get_plugins();
+    }
+    
     public function form_locales()
     {
-        $locs= array();
-        foreach ($this->locales as $loc) {
-            $locs[$loc]= $loc;
+        $locales= array();
+        foreach (Locale::list_all() as $locale) {
+            $locales[$locale]= $locale;
         }
         
@@ -24 +30 @@
                 
         $form->locale->append('wrapper', 'locale_options', null, 'installer_options');
-        $form->locale_options->append('select', 'locales', 'null:null', _t('Language'), $locs);
-        $form->locales->selected = $this->locale;
+        $form->locale_options->append('select', 'locales', 'null:null', _t('Language'), $locales);
+        $form->locales->value = Options::get('locale');
         $form->locales->required = false;
         $form->locales->help = '';
@@ -31 +37 @@
         $form->append('wrapper', 'locale_nextstep', null, 'installer_nextstep');
 
+        $form->on_success( array($this, 'set_locale') );
+        
         Plugins::act('install_form_localeform', $form, $this);
         return $form;
@@ -47 +55 @@
         // Database Type
         $form->databasesetup_options->append('select', 'db_type', 'null:null', _t('Database Type'));
-        $form->db_type->selected = $this->db_type;
+        $form->db_type->value = 'mysql';
         $form->db_type->required = true;
         $form->db_type->help = _t('<strong>Database Type</strong> specifies the type of database to which
@@ -57 +65 @@
         // Table Prefix
         $form->databasesetup_advancedoptions->append('text', 'table_prefix', 'null:null', _t('Table Prefix'));
-        $form->table_prefix->value = $this->table_prefix;
+        $form->table_prefix->value = 'habari__';
         $form->table_prefix->help = _t('<strong>Table Prefix</strong> is a prefix that will be appended to
         each table that Habari creates in the database, making it easy to
@@ -73 +81 @@
         // Blog Title
         $form->siteconfiguration_options->append('text', 'blog_title', 'null:null', _t('Site Name'));
-        $form->blog_title->value = $this->blog_title;
+        $form->blog_title->value = 'My Habari';
         $form->blog_title->required = true;
         $form->blog_title->help = _t('<strong>Site Name</strong> is the name of your site as it will appear
@@ -79 +87 @@
         // Admin Username
         $form->siteconfiguration_options->append('text', 'admin_username', 'null:null', _t('Username'));
-        $form->admin_username->value = $this->admin_username;
+        $form->admin_username->value = 'admin';
         $form->admin_username->required = true;
         $form->admin_username->help = _t('<strong>Username</strong> is the username of the initial user in 
@@ -86 +94 @@
         $form->siteconfiguration_options->append('wrapper', 'admin_pass_wrapper', null, 'installer_password_wrapper');
         $form->admin_pass_wrapper->append('password', 'admin_pass1', 'null:null', _t('Password'), 'installer_password');
-        $form->admin_pass1->value = $this->admin_pass1;
         $form->admin_pass1->required = true;
         $form->admin_pass_wrapper->append('password', 'admin_pass2', 'null:null', _t('Password (again)'), 'installer_password');
-        $form->admin_pass2->value = $this->admin_pass2;
         $form->admin_pass2->required = true;
         $form->admin_pass_wrapper->message = '';
@@ -96 +102 @@
         // Admin Email
         $form->siteconfiguration_options->append('text', 'admin_email', 'null:null', _t('E-mail'));
-        $form->admin_email->value = $this->admin_email;
         $form->admin_email->required = true;
         $form->admin_email->help = _t('<strong>Admin Email</strong> is the email address of the first user
@@ -130 +135 @@
     }
     
+    /*
+     * Helper function to grab list of plugins
+     */
+    public function get_plugins() {
+        $all_plugins = Plugins::list_all();
+        $recommended_list = array(
+            'coredashmodules.plugin.php',
+            'habarisilo.plugin.php',
+            'pingback.plugin.php',
+            'spamchecker.plugin.php',
+            'undelete.plugin.php'
+        );
+
+        foreach ( $all_plugins as $file ) {
+            $plugin = array();
+            $plugin_id = Plugins::id_from_file( $file );
+            $plugin['plugin_id']= $plugin_id;
+            $plugin['file']= $file;
+
+            $error = '';
+            if ( Utils::php_check_file_syntax( $file, $error ) ) {
+                $plugin['debug']= false;
+                // instantiate this plugin
+                // in order to get its info()
+                include_once( $file );
+                Plugins::get_plugin_classes();
+                $pluginobj = Plugins::load( $file, false );
+                $plugin['active']= false;
+                $plugin['verb']= _t( 'Activate' );
+                $plugin['actions']= array();
+                $plugin['info']= $pluginobj->info;
+                $plugin['recommended'] = in_array( basename($file), $recommended_list );
+            }
+            else {
+                $plugin['debug']= true;
+                $plugin['error']= $error;
+                $plugin['active']= false;
+            }
+            
+            $plugins[$plugin_id]= $plugin;
+        }
+        
+        return $plugins;
+    }
+    
 }
 ?>