case 'key':
case 'value':
break;
- case 'sInitLocation':
- // FIXME: variable must be set only in src/login.php
- break;
default:
unset($GLOBALS[$key]);
}
/**
* Used as a dummy value, e.g., for passing as an empty
- * hook argument.
+ * hook argument (where the value is passed by reference,
+ * and therefore NULL itself is not acceptable).
*/
-global $null;
+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') ||
* if session.auto_start is On then close the session
*/
$sSessionAutostartName = session_name();
+$sCookiePath = null;
if ((isset($sSessionAutostartName) || $sSessionAutostartName == '') &&
$sSessionAutostartName !== $session_name) {
$sCookiePath = ini_get('session.cookie_path');
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);
+$SQM_INTERNAL_VERSION = explode('.', SM_VERSION, 3);
+$SQM_INTERNAL_VERSION[2] = intval($SQM_INTERNAL_VERSION[2]);
-/* if plugins are disabled only for one user and
+/* if plugins are disabled only for one user and
* the current user is NOT that user, turn them
* back on
*/
/**
* MAIN PLUGIN LOADING CODE HERE
- * On init, we no longer need to load all plugin setup files.
+ * 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.
*/
/**
* 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
+ * 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') {
$squirrelmail_language = '';
}
-
/**
- * @var $sInitlocation From where do we include.
+ * Do something special for some pages. This is based on the PAGE_NAME constand
+ * set at the top of every page.
*/
-if (!isset($sInitLocation)) {
- $sInitLocation=NULL;
-}
-
-switch ($sInitLocation) {
- case 'style':
+if ( !defined('PAGE_NAME') ) define('PAGE_NAME', NULL);
+switch (PAGE_NAME) {
+ case 'style':
// need to get the right template set up
//
}
session_write_close();
- sqsetcookieflush();
break;
case 'redirect':
* 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;
// signout page will deal with users who aren't logged
// in on its own; don't show error here
//
- if (strpos($PHP_SELF, 'signout.php') !== FALSE) {
- return;
+ if ( PAGE_NAME == 'signout' ) {
+ return;
}
/**
* Initialize the template object (logout_error uses it)
*/
/*
- * $sTemplateID is not initialized when a user is not logged in, so we
- * will use the config file defaults here. If the neccesary variables
+ * $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.
*/
$sTemplateID = Template::get_default_template_set();
* 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;
}
/*
- * $sTemplateID is not initialized when a user is not logged in, so we
- * will use the config file defaults here. If the neccesary variables
+ * $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,
+ *
+ * If the user is logged in, $sTemplateID will be set in load_prefs.php,
* so we shouldn't change it here.
*/
if (!isset($sTemplateID)) {
}
// We want some variables to always be available to the template
-$always_include = array('sTemplateID', 'icon_theme_path', 'javascript_on');
+$oTemplate->assign('javascript_on',
+ (sqGetGlobalVar('user_is_logged_in', $user_is_logged_in, SQ_SESSION)
+ ? checkForJavascript() : 0));
+$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));
}
if ( !$reset && sqGetGlobalVar('javascript_on', $javascript_on, SQ_SESSION) )
return $javascript_on;
- if ( $reset || !isset($javascript_setting) )
+ $user_is_logged_in = FALSE;
+ 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