diff options
author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-03-19 03:30:40 +0300 |
---|---|---|
committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-03-19 03:30:40 +0300 |
commit | 83ffd7749e726b91f38abc31fb81c20f61054ab2 (patch) | |
tree | d6c74c5aa39651845907c98f8bf9d4f9912f1c55 /modules/FrontController.php | |
parent | 55d8a3ad0bcb68a5c0da0c0b81c873d3d317b41e (diff) |
- new login screen design (thanks wordpress 2.5!!)
- misc changes
- plugins can now be loaded by default all the time (ex. Home, AdminHome, PluginsAdmin)
- improved admin design
Diffstat (limited to 'modules/FrontController.php')
-rw-r--r-- | modules/FrontController.php | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/modules/FrontController.php b/modules/FrontController.php index f77d8ae978..0f7fccc115 100644 --- a/modules/FrontController.php +++ b/modules/FrontController.php @@ -85,6 +85,14 @@ class Piwik_FrontController throw new Exception("Invalid module name '$module'"); } + + // check that the plugin is enabled + if( ! Piwik_PluginsManager::getInstance()->isPluginEnabled( $module )) + { + throw new Exception_PluginDeactivated($module); + } + + $controllerClassName = "Piwik_".$module."_Controller"; if(!class_exists($controllerClassName)) @@ -98,12 +106,6 @@ class Piwik_FrontController require_once $moduleController; } - // check that the plugin is enabled - if( ! Piwik_PluginsManager::getInstance()->isPluginEnabled( $module )) - { - throw new Exception_PluginDeactivated($module); - } - $controller = new $controllerClassName; if($action === false) @@ -282,10 +284,6 @@ class Piwik_FrontController Piwik::prefixTable('log_profiling'), ); - //Piwik::dropTables($doNotDrop); - //Piwik::createTables(); - //Piwik_PluginsManager::getInstance()->installPlugins(); - // Setup the auth object Piwik_PostEvent('FrontController.authSetCredentials'); @@ -293,7 +291,10 @@ class Piwik_FrontController $authAdapter = Zend_Registry::get('auth'); } catch(Exception $e){ - throw new Exception("Object 'auth' cannot be found in the Registry. Maybe the Login plugin is not enabled?"); + throw new Exception("Object 'auth' cannot be found in the Registry. Maybe the Login plugin is not enabled? + <br>You can enable the plugin by adding:<br> + <code>Plugins[] = Login</code><br> + under the <code>[Plugins]</code> section in your config/config.inc.php"); } // Perform the authentication query, saving the result |