unset($GLOBALS['value']);
}
+/**
+ * Used as a dummy value, e.g., for passing as an empty
+ * hook argument.
+ */
+global $null;
+$null = NULL;
+
/**
* [#1518885] session.use_cookies = off breaks SquirrelMail
*
- * When session cookies are not used, all http redirects, meta refreshes,
- * src/download.php and javascript URLs are broken. Setting must be set
+ * When session cookies are not used, all http redirects, meta refreshes,
+ * src/download.php and javascript URLs are broken. Setting must be set
* before session is started.
*/
if (!(bool)ini_get('session.use_cookies') ||
$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';
+$aTemplateSet[0]['ID'] = 'default';
+$aTemplateSet[0]['NAME'] = 'Default';
+
/* load site configuration */
require(SM_PATH . 'config/config.php');
/* load local configuration overrides */
require(SM_PATH . 'functions/plugin.php');
require(SM_PATH . 'include/constants.php');
require(SM_PATH . 'include/languages.php');
+require(SM_PATH . 'class/template/Template.class.php');
+require(SM_PATH . 'class/error.class.php');
/**
* If magic_quotes_runtime is on, SquirrelMail breaks in new and creative ways.
session_set_cookie_params (0, $base_uri);
sqsession_is_active();
-/**
- * DISABLED.
- * Remove globalized session data in rg=on setups
- *
- * Code can be utilized when session is started, but data is not loaded.
- * We have already loaded configuration and other important vars. Can't
- * clean session globals here.
-if ((bool) @ini_get('register_globals') &&
- strtolower(ini_get('register_globals'))!='off') {
- foreach ($_SESSION as $key => $value) {
- unset($GLOBALS[$key]);
- }
-}
-*/
-
-sqsession_register(SM_BASE_URI,'base_uri');
-
/**
* SquirrelMail version number -- DO NOT CHANGE
*/
-$version = '1.5.2 [CVS]';
+$version = '1.5.2 [SVN]';
/**
* SquirrelMail internal version number -- DO NOT CHANGE
*/
$SQM_INTERNAL_VERSION = array(1,5,2);
-/**
- * Retrieve the language cookie
+
+/* if plugins are disabled only for one user and
+ * the current user is NOT that user, turn them
+ * back on
*/
-if (! sqgetGlobalVar('squirrelmail_language',$squirrelmail_language,SQ_COOKIE)) {
- $squirrelmail_language = '';
+sqgetGlobalVar('username',$username,SQ_SESSION);
+if ($disable_plugins && !empty($disable_plugins_user)
+ && $username != $disable_plugins_user) {
+ $disable_plugins = false;
+}
+
+/* remove all plugins if they are disabled */
+if ($disable_plugins) {
+ $plugins = array();
}
/**
- * @var $sInitlocation From where do we include.
+ * Include Compatibility plugin if available.
*/
-if (!isset($sInitLocation)) {
- $sInitLocation=NULL;
-}
+if (!$disable_plugins && 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 (!$disable_plugins && file_exists(SM_PATH . 'config/plugin_hooks.php')) {
+ require(SM_PATH . 'config/plugin_hooks.php');
+}
/**
- * Include Compatibility plugin if available.
+ * allow plugins to override main configuration; hook is placed
+ * here to allow plugins to use session information to do their work
*/
-if (file_exists(SM_PATH . 'plugins/compatibility/functions.php'))
- include_once(SM_PATH . 'plugins/compatibility/functions.php');
-$squirrelmail_plugin_hooks = array();
+do_hook('config_override', $null);
-/* On init, register all plugins configured for use. */
-if (isset($plugins) && is_array($plugins)) {
- // turn on output buffering in order to prevent output of new lines
- ob_start();
- foreach ($plugins as $name) {
- use_plugin($name);
- }
- // get output and remove whitespace
- $output = trim(ob_get_contents());
- ob_end_clean();
- // if plugins output more than newlines and spacing, stop script execution.
- if (!empty($output)) {
- die($output);
+/**
+ * DISABLED.
+ * Remove globalized session data in rg=on setups
+ *
+ * Code can be utilized when session is started, but data is not loaded.
+ * We have already loaded configuration and other important vars. Can't
+ * clean session globals here.
+if ((bool) @ini_get('register_globals') &&
+ strtolower(ini_get('register_globals'))!='off') {
+ foreach ($_SESSION as $key => $value) {
+ unset($GLOBALS[$key]);
}
}
+*/
+
+sqsession_register(SM_BASE_URI,'base_uri');
/**
- * 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
- * loaded before plugins are initialized.
- * @since 1.2.0
+ * Retrieve the language cookie
*/
-do_hook('loading_constants');
+if (! sqgetGlobalVar('squirrelmail_language',$squirrelmail_language,SQ_COOKIE)) {
+ $squirrelmail_language = '';
+}
+
+
+/**
+ * @var $sInitlocation From where do we include.
+ */
+if (!isset($sInitLocation)) {
+ $sInitLocation=NULL;
+}
switch ($sInitLocation) {
- case 'style':
+ case 'style':
// need to get the right template set up
- sqGetGlobalVar('templatedir', $templatedir, SQ_GET);
+ //
+ sqGetGlobalVar('templateid', $templateid, SQ_GET);
// sanitize just in case...
- $templatedir = preg_replace('/(\.\.\/){1,}/', '', $templatedir);
-
- // could also conceivably make sure given templatedir is in $aTemplateSet
+ //
+ $templateid = preg_replace('/(\.\.\/){1,}/', '', $templateid);
+
+ // make sure given template actually is available
+ //
+ $found_templateset = false;
+ for ($i = 0; $i < count($aTemplateSet); ++$i) {
+ if ($aTemplateSet[$i]['ID'] == $templateid) {
+ $found_templateset = true;
+ break;
+ }
+ }
- // set template directory only if what was given is valid
- if (is_dir(SM_PATH . 'templates/' . $templatedir . '/')) {
- $sTplDir = SM_PATH . 'templates/' . $templatedir . '/';
+// FIXME: do we need/want to check here for actual (physical) presence of template sets?
+ // selected template not available, fall back to default template
+ //
+ if (!$found_templateset) {
+ $sTemplateID = Template::get_default_template_set();
+ } else {
+ $sTemplateID = $templateid;
}
session_write_close();
- sqsetcookieflush();
break;
case 'redirect':
* plugins use own pref files.
*/
require(SM_PATH . 'functions/prefs.php');
+ require(SM_PATH . 'functions/auth.php');
/* hook loads custom prefs backend plugins */
- $prefs_backend = do_hook_function('prefs_backend');
+ $prefs_backend = do_hook('prefs_backend', $null);
if (isset($prefs_backend) && !empty($prefs_backend) && file_exists(SM_PATH . $prefs_backend)) {
require(SM_PATH . $prefs_backend);
} elseif (isset($prefs_dsn) && !empty($prefs_dsn)) {
require(SM_PATH . 'functions/display_messages.php' );
require(SM_PATH . 'functions/page_header.php');
require(SM_PATH . 'functions/html.php');
+
+ // reset template file cache
+ //
+ $sTemplateID = Template::get_default_template_set();
+ Template::cache_template_file_hierarchy(TRUE);
+
+ /**
+ * Make sure icon variables are setup for the login page.
+ */
+ $icon_theme = $icon_themes[$icon_theme_def]['PATH'];
+ /*
+ * NOTE: The $icon_theme_path var should contain the path to the icon
+ * theme to use. If the admin has disabled icons, or the user has
+ * set the icon theme to "None," no icons will be used.
+ */
+ $icon_theme_path = (!$use_icons || $icon_theme=='none') ? NULL : ($icon_theme == 'template' ? SM_PATH . Template::calculate_template_images_directory($sTemplateID) : $icon_theme);
+
/**
* cleanup old cookies with a cookie path the same as the standard php.ini
* cookie path. All previous SquirrelMail version used the standard php.ini
* because they probably belong to other php apps
*/
if (ini_get('session.name') !== $sSessionAutostartName) {
- sqsetcookie(ini_get('session.name'),'',0,$sCookiePath);
+ // This does not work. Sometimes the cookie with SQSESSID=deleted and path /
+ // is picked up in webmail.php => login will fail
+ //sqsetcookie(ini_get('session.name'),'',0,$sCookiePath);
}
}
break;
/**
* Initialize the template object (logout_error uses it)
*/
- 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.
+ * $sTemplateID 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.
*/
- $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);
+ $sTemplateID = Template::get_default_template_set();
+ $oTemplate = Template::construct_template($sTemplateID);
set_up_language($squirrelmail_language, true);
logout_error( _("You must be logged in to access this page.") );
exit;
}
+//FIXME: remove next line if the placement of the copy of this line above does not prove to be problematic
sqgetGlobalVar('username',$username,SQ_SESSION);
+ sqgetGlobalVar('authz',$authz,SQ_SESSION);
/**
* Setting the prefs backend
/* see 'redirect' case */
require(SM_PATH . 'functions/prefs.php');
- $prefs_backend = do_hook_function('prefs_backend');
+ $prefs_backend = do_hook('prefs_backend', $null);
if (isset($prefs_backend) && !empty($prefs_backend) && file_exists(SM_PATH . $prefs_backend)) {
require(SM_PATH . $prefs_backend);
} elseif (isset($prefs_dsn) && !empty($prefs_dsn)) {
* Set up the language.
*/
$err=set_up_language(getPref($data_dir, $username, 'language'));
- /* this is the last cookie we set so flush it. */
- sqsetcookieflush();
// Japanese translation used without mbstring support
if ($err==2) {
} else {
// interface runs on server's time zone. Remove php E_STRICT complains
$default_timezone = @date_default_timezone_get();
- date_default_timezone_set($default_timezone);
+ date_default_timezone_set($default_timezone);
}
}
break;
}
-/**
- * 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 not 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.
+ * $sTemplateID is not initialized when a user is not logged in, so we
+ * will use the config file defaults here. If the neccesary variables
+ * are not set, force a default value.
+ *
+ * If the user is logged in, $sTemplateID will be set in load_prefs.php,
+ * so we shouldn't change it here.
*/
-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'];
- $icon_theme_path = !$use_icons ? NULL : $sTplDir . 'images/';
+if (!isset($sTemplateID)) {
+ $sTemplateID = Template::get_default_template_set();
+ $icon_theme_path = !$use_icons ? NULL : Template::calculate_template_images_directory($sTemplateID);
+}
+
+// template object may have already been constructed in load_prefs.php
+//
+if (empty($oTemplate)) {
+ $oTemplate = Template::construct_template($sTemplateID);
}
-$oTemplate = new Template($sTplDir);
// We want some variables to always be available to the template
-$always_include = array('sTplDir', 'icon_theme_path');
+$oTemplate->assign('javascript_on', checkForJavascript());
+$oTemplate->assign('base_uri', sqm_baseuri());
+$always_include = array('sTemplateID', 'icon_theme_path');
foreach ($always_include as $var) {
$oTemplate->assign($var, (isset($$var) ? $$var : NULL));
}
/**
* Initialize our custom error handler object
*/
-require(SM_PATH . 'class/error.class.php');
$oErrorHandler = new ErrorHandler($oTemplate,'error_message.tpl');
/**
if ( !$reset && sqGetGlobalVar('javascript_on', $javascript_on, SQ_SESSION) )
return $javascript_on;
- if ( $reset || !isset($javascript_setting) )
+ if ( ( $reset || !isset($javascript_setting) )
+ // getPref() not defined (nor is it meaningful) when user not
+ // logged in, but that begs the question if $javascript_on is
+ // not in the session in that case, where do we get it from?
+ && ( sqGetGlobalVar('user_is_logged_in', $user_is_logged_in, SQ_SESSION)
+ && $user_is_logged_in) )
$javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
if ( !sqGetGlobalVar('new_js_autodetect_results', $js_autodetect_results) &&
projects / squirrelmail.git / blobdiff