attachment_common_parse($http_accept);
}
+// having just logged in, need to synch the template file cache
+// so the right template set is displayed (per user prefs)
+require(SM_PATH . 'include/load_prefs.php');
+global $sTemplateID;
+Template::cache_template_file_hierarchy($sTemplateID, TRUE);
+
/* Complete autodetection of Javascript. */
checkForJavascript();
if ($compose_new_win) {
// do not prefix $location here because $session_expired_location is set to the PAGE_NAME
// of the last page
- $redirect_url = $location . $session_expired_location . '.php';
+ $redirect_url = $location . '/' . $session_expired_location . '.php';
} else {
- $redirect_url = $location . '/webmail.php?right_frame=compose.php';
+ $redirect_url = $location . '/webmail.php?right_frame=' . urlencode($session_expired_location . '.php');
}
- } else {
- $redirect_url = $location . '/webmail.php?right_frame=' . urlencode($session_expired_location) . '.php';
+ } else if ($session_expired_location != 'webmail'
+ && $session_expired_location != 'left_main') {
+ $redirect_url = $location . '/webmail.php?right_frame=' . urlencode($session_expired_location . '.php');
}
unset($session_expired_location);
}