Fix incorrect template assignment.

[squirrelmail.git] / include / init.php

diff --git a/include/init.php b/include/init.php
index b0331772da1b03ee94fd3a24624201903c4e6936..0e00ac2477fe8d9d2d00f994692cb7e92b91f9a6 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -134,7 +134,26 @@ $color[15] = '#002266';  /* (dark blue)   Unselectable folders */
 $color[16] = '#ff9933';  /* (orange)      Highlight color */
 
 require(SM_PATH . 'functions/global.php');
+
+/* load default configuration */
+require(SM_PATH . 'config/config_default.php');
+/* reset arrays in default configuration */
+$ldap_server = array();
+$plugins = array();
+$fontsets = array();
+$theme = array();
+$theme[0]['PATH'] = SM_PATH . 'themes/default_theme.php';
+$theme[0]['NAME'] = 'Default';
+$aTemplateSet = array();
+$aTemplateSet[0]['PATH'] = SM_PATH . 'templates/default/';
+$aTemplateSet[0]['NAME'] = 'Default template';
+/* load site configuration */
 require(SM_PATH . 'config/config.php');
+/* load local configuration overrides */
+if (file_exists(SM_PATH . 'config/config_local.php')) {
+    require(SM_PATH . 'config/config_local.php');
+}
+
 require(SM_PATH . 'functions/plugin.php');
 require(SM_PATH . 'include/constants.php');
 require(SM_PATH . 'include/languages.php');
@@ -388,7 +407,6 @@ switch ($sInitLocation) {
          */
         require(SM_PATH . 'include/load_prefs.php');
 
-
 // i do not understand the frames language cookie story
         /**
          * We'll need this to later have a noframes version
@@ -472,17 +490,23 @@ switch ($sInitLocation) {
  * Initialize the template object
  */
 require(SM_PATH . 'class/template/template.class.php');
+
 /*
  * $sTplDir is not initialized when a user is not logged in, so we will use
  * the config file defaults here.  If the neccesary variables are net set,
  * force a default value.
+ * 
+ * If the user is logged in, $sTplDir will be set in load_prefs.php, so we
+ * shouldn't change it here.
  */
-$aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
-$templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
-
-$sTplDir = ( !isset($aTemplateSet[$templateset_default]['PATH']) ?
-             SM_PATH . 'templates/default/' :
-             $aTemplateSet[$templateset_default]['PATH'] );
+if (!isset($sTplDir)) {
+    $aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
+    $templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
+    
+    $sTplDir = ( !isset($aTemplateSet[$templateset_default]['PATH']) ?
+                 SM_PATH . 'templates/default/' :
+                 $aTemplateSet[$templateset_default]['PATH'] );
+}
 $oTemplate = new Template($sTplDir);
 
 /**