From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sat, 14 Oct 2006 15:57:13 +0000 (+0000)
Subject: Reorg placement of plugin loading and add config_override hook.  Wondering why we... 
X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=5aed95beb4ec642453cda7b647d8674019689b92;hp=f94f306d2612ca37a97a3e6d3bae3e13e964eba4

Reorg placement of plugin loading and add config_override hook.  Wondering why we can't move SM version constants to top of file.  Also considering removal of loading_constants hook.  Anyone know what plugins use it?


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11917 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/include/init.php b/include/init.php
index 5586ff19..8be6cdad 100644
--- a/include/init.php
+++ b/include/init.php
@@ -214,6 +214,40 @@ ini_set('session.name' , $session_name);
 session_set_cookie_params (0, $base_uri);
 sqsession_is_active();
 
+/**
+ * SquirrelMail version number -- DO NOT CHANGE
+ */
+$version = '1.5.2 [CVS]';
+
+/**
+ * SquirrelMail internal version number -- DO NOT CHANGE
+ * $sm_internal_version = array (release, major, minor)
+ */
+$SQM_INTERNAL_VERSION = array(1,5,2);
+
+/**
+ * Include Compatibility plugin if available.
+ */
+if (file_exists(SM_PATH . 'plugins/compatibility/functions.php'))
+    include_once(SM_PATH . 'plugins/compatibility/functions.php');
+
+/**
+ * MAIN PLUGIN LOADING CODE HERE
+ * On init, we no longer need to load all plugin setup files. 
+ * Now, we load the statically generated hook registrations here
+ * and let the hook calls include only the plugins needed.
+ */
+$squirrelmail_plugin_hooks = array();
+if (file_exists(SM_PATH . 'config/plugin_hooks.php')) {
+    require(SM_PATH . 'config/plugin_hooks.php');
+}
+
+/**
+ * allow plugins to override main configuration; hook is placed
+ * here to allow plugins to use session information to do their work
+ */
+do_hook('config_override');
+
 /**
  * DISABLED.
  * Remove globalized session data in rg=on setups
@@ -231,17 +265,6 @@ if ((bool) @ini_get('register_globals') &&
 
 sqsession_register(SM_BASE_URI,'base_uri');
 
-/**
- * SquirrelMail version number -- DO NOT CHANGE
- */
-$version = '1.5.2 [CVS]';
-
-/**
- * SquirrelMail internal version number -- DO NOT CHANGE
- * $sm_internal_version = array (release, major, minor)
- */
-$SQM_INTERNAL_VERSION = array(1,5,2);
-
 /**
  * Retrieve the language cookie
  */
@@ -257,26 +280,6 @@ if (!isset($sInitLocation)) {
     $sInitLocation=NULL;
 }
 
-/**
- * MAIN PLUGIN LOADING CODE HERE
- */
-
-/**
- * Include Compatibility plugin if available.
- */
-if (file_exists(SM_PATH . 'plugins/compatibility/functions.php'))
-    include_once(SM_PATH . 'plugins/compatibility/functions.php');
-$squirrelmail_plugin_hooks = array();
-
-/**
- * On init, we no longer need to load all plugin setup files. 
- * Now, we load the statically generated hook registrations here
- * and let the hook calls include only the plugins needed.
- */
-if (file_exists(SM_PATH . 'config/plugin_hooks.php')) {
-    require(SM_PATH . 'config/plugin_hooks.php');
-}
-
 /**
  * Before 1.5.2 version hook was part of functions/constants.php.
  * After init layout changes, hook had to be moved because include/constants.php is