From 85e60ada1558798669b29225aa530b4ba9310cdc Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 10 Nov 2013 08:04:33 -0500
Subject: [PATCH] First version of the local storage compose data saving feature; some behavioral improvements and encrytion are still to be added
---
index.php | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/index.php b/index.php
index 1719abc..03c3f43 100644
--- a/index.php
+++ b/index.php
@@ -193,12 +193,6 @@
$session_error = true;
}
- if ($OUTPUT->ajax_call)
- $OUTPUT->redirect(array('_err' => 'session'), 2000);
-
- if (!empty($_REQUEST['_framed']))
- $OUTPUT->command('redirect', $RCMAIL->url(array('_err' => 'session')));
-
// check if installer is still active
if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) {
$OUTPUT->add_footer(html::div(array('style' => "background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em"),
@@ -211,8 +205,14 @@
);
}
- if ($session_error || $_REQUEST['_err'] == 'session')
+ if ($session_error || $_REQUEST['_err'] == 'session') {
$OUTPUT->show_message('sessionerror', 'error', null, true, -1);
+ }
+
+ if ($OUTPUT->ajax_call || !empty($_REQUEST['_framed'])) {
+ $OUTPUT->command('session_error', $RCMAIL->url(array('_err' => 'session')));
+ $OUTPUT->send('iframe');
+ }
$plugin = $RCMAIL->plugins->exec_hook('unauthenticated', array('task' => 'login', 'error' => $session_error));
--
Gitblit v1.9.1