Changeset 2818

Timestamp:

11/16/08 01:47:42 (8 weeks ago)

Author:

freakerz

Message:

A lot of stuff: removed InstallSchema, renamed install.php, moved the InstallHandler calls to Controller using a constant, new class Installer. This is all experimental so it will change to be much nicer especially the DB stuff.

Location:

branches/081018-handlers/htdocs

Files:

• index.php (modified) (4 diffs)
• system/classes/controller.php (modified) (1 diff)
• system/classes/db.php (modified) (33 diffs)
• system/classes/installer.php (added)
• system/classes/installhandler.php (modified) (1 diff)
• system/classes/installschema.php (deleted)
• system/classes/options.php (modified) (1 diff)
• system/classes/rewriterules.php (modified) (1 diff)
• system/schema/mysql/install/install.js (deleted)
• system/schema/mysql/install/install.php (deleted)
• system/schema/mysql/install/mysqlinstall.js (added)
• system/schema/mysql/install/mysqlinstall.php (added)
• system/schema/pgsql/install/install.js (deleted)
• system/schema/pgsql/install/install.php (deleted)
• system/schema/pgsql/install/pgsqlinstall.js (added)
• system/schema/pgsql/install/pgsqlinstall.php (added)
• system/schema/sqlite/install/install.js (deleted)
• system/schema/sqlite/install/install.php (deleted)
• system/schema/sqlite/install/sqliteinstall.js (added)
• system/schema/sqlite/install/sqliteinstall.php (added)
• system/themes/installer/script.js (modified) (3 diffs)
• system/themes/installer/theme.php (modified) (1 diff)

branches/081018-handlers/htdocs/index.php

@@ -114 +114 @@
 /* Initiate install verifications */
 
-// Retrieve the configuration file's path.
-$config = Site::get_dir( 'config_file' );
 
 /**
@@ -123 +121 @@
  * @todo Call the installer from the database classes.
  */
-if ( file_exists( $config ) ) {
+/*if ( file_exists( $config ) ) {
     require_once $config;
 
@@ -157 +155 @@
     $installer = new InstallHandler();
     $installer->begin_install();
-}
+} */
+
+DB::connect();
 
 /* Habari is installed and we established a connection with the database */
+if ( !defined( 'DEBUG' ) ) define( 'DEBUG', false );
 
 // Set the locale from database or default locale
-if ( Options::get('locale') ) {
-    Locale::set( Options::get('locale') );
-}
-else {
-    Locale::set( 'en-us' );
-}
+Locale::set( Options::get('locale') );
 if ( Options::get( 'system_locale' ) ) {
     Locale::set_system_locale( Options::get( 'system_locale' ) );
@@ -217 +213 @@
 Plugins::act('plugins_loaded');
 
-// Start the session.
-Session::init();
+// Skip session stuff if not installed
+if (!defined('NOT_INSTALLED')) {
+    // Start the session.
+    Session::init();
+}
 
 // Initiating request handling, tell the plugins.

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

@@ -144 +144 @@
         }
 
+        if (defined('NOT_INSTALLED') && $matched_rule->name != 'ajax') {
+            $matched_rule->handler = 'installhandler';
+            $matched_rule->action = 'begin_install';
+        }
+        else {
+            Installer::load_schema_install();
+        }
+        
         /* OK, we have a matching rule.  Set the action and create a handler */
         $controller->action = $matched_rule->action;

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

@@ -48 +48 @@
         }
         else {
-            /* We use the config.php variables */
-            $connect_string = $GLOBALS['db_connection']['connection_string'];
-            $db_user = $GLOBALS['db_connection']['username'];
-            $db_pass = $GLOBALS['db_connection']['password'];
-        }
-        DB::instance()->connection = DatabaseConnection::ConnectionFactory( $connect_string );
+            // Retrieve the configuration file's path.
+            $config = Site::get_dir( 'config_file' );
+            if ( file_exists( $config ) ) {
+                require_once $config;
+                if ( isset($db_connection) ) {
+                    /* We use the config.php variables */
+                    $connect_string = $db_connection['connection_string'];
+                    $db_user = $db_connection['username'];
+                    $db_pass = $db_connection['password'];
+                }
+            }
+        }
+        if (isset($connect_string)) {
+            DB::instance()->connection = DatabaseConnection::ConnectionFactory( $connect_string );
+        }
         if ( NULL != DB::instance()->connection ) {
             return DB::instance()->connection->connect ($connect_string, $db_user, $db_pass);
@@ -59 +68 @@
         else {
             // do some error handling here. The connect string does not have a corresponding DB connection object
-            print _t('Panic! No database connection class appears to be found for the connection string specified. Please check config.php');
+            //print _t('Panic! No database connection class appears to be found for the connection string specified. Please check config.php');
+            define('NOT_INSTALLED', true);
         }
     }
@@ -79 +89 @@
     public static function table( $name )
     {
-        return DB::instance()->connection->table( $name );
+        if ( NULL != DB::instance()->connection ) {
+            echo $name;
+            return DB::instance()->connection->table( $name );
+        }
     }
 
@@ -91 +104 @@
     public static function register_table( $name )
     {
-        DB::instance()->connection->register_table( $name );
+        if ( NULL != DB::instance()->connection ) {
+            DB::instance()->connection->register_table( $name );
+        }
     }
 
@@ -101 +116 @@
     public static function set_fetch_mode( $mode )
     {
-        DB::instance()->connection->set_fetch_mode( $mode );
+        if ( NULL != DB::instance()->connection ) {
+            DB::instance()->connection->set_fetch_mode( $mode );
+        }
     }
 
@@ -111 +128 @@
     public static function set_fetch_class( $class_name )
     {
-        DB::instance()->connection->set_fetch_class( $class_name );
+        if ( NULL != DB::instance()->connection ) {
+            DB::instance()->connection->set_fetch_class( $class_name );
+        }
     }
 
     public static function exec( $query )
     {
-        return DB::instance()->connection->exec( $query );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->exec( $query );
+        }
     }
 
@@ -128 +149 @@
     public static function query( $query, $args = array() )
     {
-         return DB::instance()->connection->query( $query, $args );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->query( $query, $args );
+        }
     }
 
@@ -142 +165 @@
     public static function execute_procedure( $procedure, $args = array() )
     {
-        return DB::instance()->connection->execute_procedure( $procedure, $args );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->execute_procedure( $procedure, $args );
+        }
     }
 
@@ -151 +176 @@
     public static function begin_transaction()
     {
-        DB::instance()->connection->begin_transaction();
+        if ( NULL != DB::instance()->connection ) {
+            DB::instance()->connection->begin_transaction();
+        }
     }
 
@@ -161 +188 @@
     public static function rollback()
     {
-        DB::instance()->connection->rollback();
+        if ( NULL != DB::instance()->connection ) {
+            DB::instance()->connection->rollback();
+        }
     }
 
@@ -168 +197 @@
      */
     public static function commit() {
-        DB::instance()->connection->commit();
+        if ( NULL != DB::instance()->connection ) {
+            DB::instance()->connection->commit();
+        }
     }
 
@@ -178 +209 @@
     public static function get_profiles()
     {
-        return DB::instance()->connection->get_profiles();
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->get_profiles();
+        }
     }
 
@@ -188 +221 @@
     private static function add_error( $error )
     {
-        DB::instance()->connection->add_error( $error );
+        if ( NULL != DB::instance()->connection ) {
+            DB::instance()->connection->add_error( $error );
+        }
     }
 
@@ -197 +232 @@
     public static function get_errors()
     {
-        return DB::instance()->connection->get_errors();
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->get_errors();
+        }
     }
 
@@ -206 +243 @@
     public static function has_errors()
     {
-        return DB::instance()->connection->has_errors();
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->has_errors();
+        }
     }
 
@@ -214 +253 @@
     public static function clear_errors()
     {
-        DB::instance()->connection->clear_errors();
+        if ( NULL != DB::instance()->connection ) {
+            DB::instance()->connection->clear_errors();
+        }
     }
 
@@ -223 +264 @@
     public static function get_last_error()
     {
-        return DB::instance()->connection->get_last_error();
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->get_last_error();
+        }
     }
 
@@ -236 +279 @@
     public static function get_results( $query, $args = array() )
     {
-        if ( func_num_args() == 3 ) {
-            $class_name = func_get_arg( 2 );
-            return DB::instance()->connection->get_results( $query, $args, $class_name );
-        }
-        else {
-            return DB::instance()->connection->get_results( $query, $args );
+        if ( NULL != DB::instance()->connection ) {
+            if ( func_num_args() == 3 ) {
+                $class_name = func_get_arg( 2 );
+                return DB::instance()->connection->get_results( $query, $args, $class_name );
+            }
+            else {
+                return DB::instance()->connection->get_results( $query, $args );
+            }
         }
     }
@@ -255 +300 @@
     public static function get_row( $query, $args = array() )
     {
-        if ( func_num_args() == 3 ) {
-            $class_name = func_get_arg( 2 );
-            return DB::instance()->connection->get_row( $query, $args, $class_name );
-        }
-        else {
-            return DB::instance()->connection->get_row( $query, $args );
+        if ( NULL != DB::instance()->connection ) {
+            if ( func_num_args() == 3 ) {
+                $class_name = func_get_arg( 2 );
+                return DB::instance()->connection->get_row( $query, $args, $class_name );
+            }
+            else {
+                return DB::instance()->connection->get_row( $query, $args );
+            }
         }
     }
@@ -274 +321 @@
     public static function get_column( $query, $args = array() )
     {
-         return DB::instance()->connection->get_column( $query, $args );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->get_column( $query, $args );
+        }
     }
 
@@ -286 +335 @@
     public static function get_value( $query, $args = array() )
     {
-        return DB::instance()->connection->get_value( $query,  $args );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->get_value( $query,  $args );
+        }
     }
 
@@ -299 +350 @@
     public static function get_keyvalue( $query, $args = array() )
     {
-         return DB::instance()->connection->get_keyvalue( $query, $args );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->get_keyvalue( $query, $args );
+        }
     }
 
@@ -311 +364 @@
     public static function insert( $table, $fieldvalues )
     {
-        return DB::instance()->connection->insert( $table, $fieldvalues );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->insert( $table, $fieldvalues );
+        }
     }
 
@@ -323 +378 @@
     public static function exists( $table, $keyfieldvalues )
     {
-        return DB::instance()->connection->exists( $table, $keyfieldvalues );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->exists( $table, $keyfieldvalues );
+        }
     }
 
@@ -338 +395 @@
     public static function update( $table, $fieldvalues, $keyfields )
     {
-         return DB::instance()->connection->update( $table, $fieldvalues, $keyfields );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->update( $table, $fieldvalues, $keyfields );
+        }
     }
 
@@ -350 +409 @@
     public static function delete( $table, $keyfields )
     {
-        return DB::instance()->connection->delete( $table, $keyfields );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->delete( $table, $keyfields );
+        }
     }
 
@@ -364 +425 @@
     public static function last_insert_id()
     {
-        return DB::instance()->connection->last_insert_id( func_num_args() == 1 ? func_get_arg( 0 ) : '' );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->last_insert_id( func_num_args() == 1 ? func_get_arg( 0 ) : '' );
+        }
     }
     
@@ -374 +437 @@
     public static function row_count()
     {
-        return DB::instance()->connection->row_count();
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->row_count();
+        }
     }
 
@@ -387 +452 @@
     public static function dbdelta( $queries, $execute = true, $silent = true, $doinserts = false )
     {
-         return DB::instance()->connection->dbdelta( $queries, $execute, $silent, $doinserts );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->dbdelta( $queries, $execute, $silent, $doinserts );
+        }
     }
 
@@ -397 +464 @@
     public static function upgrade( $old_version )
     {
-         return DB::instance()->connection->upgrade( $old_version );
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->upgrade( $old_version );
+        }
     }
     
     public static function get_driver_name()
     {
-        return DB::instance()->connection->get_driver_name();
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->get_driver_name();
+        }
     }
     
@@ -412 +483 @@
     public static function list_tables()
     {
-        return DB::instance()->connection->list_tables();
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->list_tables();
+        }
     }
     
@@ -422 +495 @@
     public static function is_connected()
     {
-        return DB::instance()->connection->is_connected();
+        if (isset(DB::instance()->connection)) {
+            return DB::instance()->connection->is_connected();
+        }
     }
     
@@ -432 +507 @@
     public static function in_transaction()
     {
-        return DB::instance()->connection->in_transaction();
+        if ( NULL != DB::instance()->connection ) {
+            return DB::instance()->connection->in_transaction();
+        }
     }
 }

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

@@ -284 +284 @@
         
         // Load available schemas' install script
-        foreach ($pdo_drivers as $pdo_driver) {
-            $install_file = HABARI_PATH . '/system/schema/' . $pdo_driver . '/install/install.php';
-            if (file_exists($install_file)) {
-                include_once($install_file);
-            }
-            $classname = $pdo_driver.'Install';
-            if (class_exists($pdo_driver.'Install')) {
-                $this->schemas[$pdo_driver] = new $classname();
-                // Register plugin hooks
-                $this->schemas[$pdo_driver]->load();
-            }
-        }
+        Installer::load_schema_install();
                         
         $pdo_drivers_ok = count( $pdo_drivers );

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

@@ -126 +126 @@
             'pagination' => 10,
             'comments_require_id' => false,
+            'locale' => 'en-us',
+            /* Installer */
+            'next_cron' => date('U') + strtotime('1 year'), // Skip Crontab
+            'db_version' => Version::DB_VERSION, // Skip DB Upgrades
         );
-        $results = DB::get_results( 'SELECT name, value, type FROM ' . DB::table( 'options' ), array(), 'QueryRecord' );
-        foreach($results as $result) {
-            if ( $result->type == 1 ) {
-                $this->options[$result->name]= unserialize( $result->value );
-            }
-            else {
-                $this->options[$result->name]= $result->value;
+        if (DB::is_connected()) {
+            $results = DB::get_results( 'SELECT name, value, type FROM ' . DB::table( 'options' ), array(), 'QueryRecord' );
+            foreach($results as $result) {
+                if ( $result->type == 1 ) {
+                    $this->options[$result->name]= unserialize( $result->value );
+                }
+                else {
+                    $this->options[$result->name]= $result->value;
+                }
             }
         }

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

@@ -79 +79 @@
 
         if(!isset($system_rules)) {
-            $sql = "
-                SELECT rr.rule_id, rr.name, rr.parse_regex, rr.build_str, rr.handler, rr.action, rr.priority, rr.parameters
-                FROM " . DB::table( 'rewrite_rules' ) . " AS rr
-                WHERE rr.is_active= 1
-                ORDER BY rr.priority";
-            $db_rules = DB::get_results( $sql, array(), 'RewriteRule' );
-
+            if (DB::is_connected()) {
+                $sql = "
+                    SELECT rr.rule_id, rr.name, rr.parse_regex, rr.build_str, rr.handler, rr.action, rr.priority, rr.parameters
+                    FROM " . DB::table( 'rewrite_rules' ) . " AS rr
+                    WHERE rr.is_active= 1
+                    ORDER BY rr.priority";
+                $db_rules = DB::get_results( $sql, array(), 'RewriteRule' );
+            }
+            else {
+                $db_rules = array();
+            }
             $system_rules = self::add_system_rules( $db_rules );
         }

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

@@ -10 +10 @@
     setDatabaseType: function () {
         for ( var i in habari.installer.schemas ) {
-            // May use some function per schema (in their class) to show/hide themselves
+            // Any better way of doing this?
             if (habari.installer.schemas[i] != $('#db_type').val()) {
-                $("fieldset[id*='" + habari.installer.schemas[i] + "settings']").hide();
+                $('#' + habari.installer.schemas[i] + 'settings').hide();
             }
             else {
-                $("fieldset[id*='" + habari.installer.schemas[i] + "settings']").show();
+                $('#' + habari.installer.schemas[i] + 'settings').show();
             }
         }
+        habari.installer.checkDBCredentials();
     },
     
     checkDBCredentials: function() {
         var toCall = 'habari.installer.' + $('#db_type').val() + '.checkDBCredentials()';
-        if (eval(toCall)) {
-            $('.installstep:first').removeClass('done');
-            $('#siteconfiguration').children('.options').fadeOut().removeClass('ready').removeClass('done');
-            $('#install').children('.options').fadeOut().removeClass('ready').removeClass('done');
-        }
+        toCall = new Function(toCall);
+        toCall();
     },
     
@@ -90 +88 @@
         clearTimeout(checktimer);
     }
-    checktimer = setTimeout(timer, 500);
+    checktimer = setTimeout(timer, 800);
 }
 
@@ -185 +183 @@
     itemManage.init();
     habari.installer.setDatabaseType();
-    habari.installer.checkDBCredentials();
     habari.installer.checkSiteConfiguration();
     $('#db_type').change(function(){habari.installer.setDatabaseType()});

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

@@ -95 +95 @@
         Habari.') . ' <a href="#">' . _t('Learn More...') . '</a>';
         // Admin Email
-        $form->siteconfiguration_options->append('text', 'admin_email', 'null:null', _t('Username')