error_reporting(E_ALL);
+/**
+ * Make sure we have a page name
+ *
+ */
+if ( !defined('PAGE_NAME') ) define('PAGE_NAME', NULL);
+
+
/**
* If register_globals are on, unregister globals.
* Second test covers boolean set as string (php_value register_globals off).
$color[16] = '#ff9933'; /* (orange) Highlight color */
require(SM_PATH . 'functions/global.php');
+require(SM_PATH . 'functions/strings.php');
require(SM_PATH . 'functions/arrays.php');
/* load default configuration */
}
/**
- * if session.auto_start is On then close the session
+ * When on login page or if session.auto_start is On
+ * we want to destroy/close the session (save off
+ * possible session restoration values first)
*/
+if (!sqGetGlobalVar('session_expired_post', $sep, SQ_SESSION))
+ $sep = '';
+if (!sqGetGlobalVar('session_expired_location', $sel, SQ_SESSION))
+ $sel = '';
$sSessionAutostartName = session_name();
$sCookiePath = null;
-if ((isset($sSessionAutostartName) || $sSessionAutostartName == '') &&
- $sSessionAutostartName !== $session_name) {
+if (PAGE_NAME == 'login'
+ || (isset($sSessionAutostartName) && $sSessionAutostartName !== $session_name)) {
$sCookiePath = ini_get('session.cookie_path');
$sCookieDomain = ini_get('session.cookie_domain');
// reset the cookie
setcookie($sSessionAutostartName,'',time() - 604800,$sCookiePath,$sCookieDomain);
@session_destroy();
session_write_close();
+
+ /**
+ * in some rare instances, the session seems to stick
+ * around even after destroying it (!!), so if it does,
+ * we'll manually flatten the $_SESSION data
+ */
+ if (!empty($_SESSION))
+ $_SESSION = array();
}
/**
$SQM_INTERNAL_VERSION[2] = intval($SQM_INTERNAL_VERSION[2]);
+/* load prefs system; even when user not logged in, should be OK to do this here */
+require(SM_PATH . 'functions/prefs.php');
+
+$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/db_prefs.php');
+} else {
+ require(SM_PATH . 'functions/file_prefs.php');
+}
+
+
/* if plugins are disabled only for one user and
* the current user is NOT that user, turn them
* back on
$squirrelmail_language = '';
}
+
/**
* Do something special for some pages. This is based on the PAGE_NAME constand
* set at the top of every page.
*/
-if ( !defined('PAGE_NAME') ) define('PAGE_NAME', NULL);
switch (PAGE_NAME) {
case 'style':
break;
case 'redirect':
- /**
- * directory hashing functions are needed for all setups in case
- * 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('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/db_prefs.php');
- } else {
- require(SM_PATH . 'functions/file_prefs.php');
- }
//nobreak;
+
case 'login':
require(SM_PATH . 'functions/display_messages.php' );
require(SM_PATH . 'functions/page_header.php');
require(SM_PATH . 'functions/html.php');
+ // put session restore data back into session if necessary
+ if (!empty($sel)) {
+ sqsession_register($sel, 'session_expired_location');
+ if (!empty($sep))
+ sqsession_register($sep, 'session_expired_post');
+ }
+
// reset template file cache
//
$sTemplateID = Template::get_default_template_set();
require(SM_PATH . 'functions/display_messages.php' );
require(SM_PATH . 'functions/page_header.php');
require(SM_PATH . 'functions/html.php');
- require(SM_PATH . 'functions/strings.php');
/**
require(SM_PATH . 'functions/auth.php');
if ( !sqsession_is_registered('user_is_logged_in') ) {
+
+ // use $message to indicate what logout text the user
+ // will see... if 0, typical "You must be logged in"
+ // if 1, information that the user session was saved
+ // and will be resumed after (re)login
+ //
+ $message = 0;
+
// First we store some information in the new session to prevent
// information-loss.
//
$session_expired_post = $_POST;
- $session_expired_location = $PHP_SELF;
+ $session_expired_location = PAGE_NAME;
if (!sqsession_is_registered('session_expired_post')) {
sqsession_register($session_expired_post,'session_expired_post');
}
if (!sqsession_is_registered('session_expired_location')) {
sqsession_register($session_expired_location,'session_expired_location');
+ if ($session_expired_location == 'compose')
+ $message = 1;
}
// signout page will deal with users who aren't logged
// in on its own; don't show error here
$oTemplate = Template::construct_template($sTemplateID);
set_up_language($squirrelmail_language, true);
- logout_error( _("You must be logged in to access this page.") );
+ if (!$message)
+ logout_error( _("You must be logged in to access this page.") );
+ else
+ logout_error( _("Your session has expired, but will be resumed after logging in again.") );
exit;
}
$prefs_cache = false; //array();
}
- /* see 'redirect' case */
- require(SM_PATH . 'functions/prefs.php');
-
- $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/db_prefs.php');
- } else {
- require(SM_PATH . 'functions/file_prefs.php');
- }
-
/**
* initializing user settings
*/
return $javascript_on;
$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) )
+ if ( $reset || !isset($javascript_setting) )
$javascript_setting = getPref($data_dir, $username, 'javascript_setting', SMPREF_JS_AUTODETECT);
if ( !sqGetGlobalVar('new_js_autodetect_results', $js_autodetect_results) &&
projects / squirrelmail.git / blobdiff