* redirect.php
* Derived from webmail.php by Ralf Kraudelt <kraude@wiwi.uni-rostock.de>
*
-* Copyright (c) 1999-2002 The SquirrelMail Project Team
+* Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Prevents users from reposting their form data after a successful logout.
exit;
}
-if (!session_is_registered('user_is_logged_in')) {
+if (!sqsession_is_registered('user_is_logged_in')) {
do_hook ('login_before');
$onetimepad = OneTimePadCreate(strlen($secretkey));
}
$imapConnection = sqimap_login($login_username, $key, $imapServerAddress, $imapPort, 0);
- if (!$imapConnection) {
- $errTitle = _("There was an error contacting the mail server.");
- $errString = $errTitle . "<br>\n".
- _("Contact your administrator for help.");
- include_once( '../functions/display_messages.php' );
- logout_error( $errString, $errTitle );
- exit;
- } else {
- $sqimap_capabilities = sqimap_capability($imapConnection);
- sqsession_register($sqimap_capabilities, 'sqimap_capabilities');
- $delimiter = sqimap_get_delimiter ($imapConnection);
- }
+
+ $sqimap_capabilities = sqimap_capability($imapConnection);
+ sqsession_register($sqimap_capabilities, 'sqimap_capabilities');
+ $delimiter = sqimap_get_delimiter ($imapConnection);
+
sqimap_logout($imapConnection);
sqsession_register($delimiter, 'delimiter');
$debug = false;
-if (isset($_SERVER['HTTP_ACCEPT']) &&
- !isset($attachment_common_types_parsed[$_SERVER['HTTP_ACCEPT']])) {
- attachment_common_parse($_SERVER['HTTP_ACCEPT'], $debug);
-}
if (isset($_SERVER['HTTP_ACCEPT']) &&
!isset($attachment_common_types_parsed[$_SERVER['HTTP_ACCEPT']])) {
attachment_common_parse($_SERVER['HTTP_ACCEPT'], $debug);
/* Update the prefs */
setPref($data_dir, $username, 'javascript_on', $js_pref);
-global $attachments;
-$attachments = unserialize(getPref($data_dir, $username, 'attachments', 0));
/* Compute the URL to forward the user to. */
- global $session_expired_location, $session_expired_post;
- if (isset($session_expired_location) && $session_expired_location) {
- $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
- if ($compose_new_win) {
- $redirect_url = $session_expired_location;
- } else {
- $redirect_url = 'webmail.php?right_frame='.urldecode($session_expired_location);
- }
- sqsession_unregister('session_expired_location');
- unset($session_expired_location);
- if (is_array($compose_messages)) {
- sqsession_register('compose_messages');
- }
- } else {
-/* need to be adapted to compose_messages.
- if (is_array($attachments)) {
- $hashed_attachment_dir = getHashedDir($username, $attachment_dir);
- foreach ($attachments as $attachment) {
- $attached_file = $hashed_attachment_dir.'/'.$attachment['localfilename'];
- if (file_exists($attached_file)) {
- unlink($attached_file);
- }
- }
- removePref($data_dir, $username, 'attachments');
- }
-*/
- $redirect_url = 'webmail.php';
+$redirect_url = 'webmail.php';
+
+if ( sqgetGlobalVar('session_expired_location', $session_expired_location, SQ_SESSION) ) {
+ sqsession_unregister('session_expired_location');
+ $compose_new_win = getPref($data_dir, $username, 'compose_new_win', 0);
+ if ($compose_new_win) {
+ $redirect_url = $session_expired_location;
+ } elseif ( strpos($session_expired_location, 'webmail.php') === FALSE ) {
+ $redirect_url = 'webmail.php?right_frame='.urldecode($session_expired_location);
}
+ unset($session_expired_location);
+}
-/* Send them off to the appropriate page. */
+/* Write session data and send them off to the appropriate page. */
+session_write_close();
header("Location: $redirect_url");
/* --------------------- end main ----------------------- */
global $attachment_common_types, $attachment_common_types_parsed;
$attachment_common_types_parsed[$str] = true;
- $types = explode(', ', $str);
+
+ /*
+ * Replace ", " with "," and explode on that as Mozilla 1.x seems to
+ * use "," to seperate whilst IE, and earlier versions of Mozilla use
+ * ", " to seperate
+ */
+
+ $str = str_replace( ', ' , ',' , $str );
+ $types = explode(',', $str);
foreach ($types as $val) {
// Ignore the ";q=1.0" stuff