From ccc80d1ca86b8da8bf24fd805443b4c992e2c187 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 14 Oct 2009 04:36:02 -0400
Subject: [PATCH] - Fix login page loading into an iframe when session expires (#1485952)
---
index.php | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/index.php b/index.php
index 9e32fc7..46f8c36 100644
--- a/index.php
+++ b/index.php
@@ -142,7 +142,7 @@
// check client X-header to verify request origin
if ($OUTPUT->ajax_call) {
- if (!$RCMAIL->config->get('devel_mode') && rc_request_header('X-RoundCube-Request') != $RCMAIL->get_request_token()) {
+ if (!$RCMAIL->config->get('devel_mode') && rc_request_header('X-RoundCube-Request') != $RCMAIL->get_request_token() && !empty($RCMAIL->user->ID)) {
header('HTTP/1.1 404 Not Found');
die("Invalid Request");
}
@@ -155,10 +155,12 @@
// not logged in -> show login page
if (empty($RCMAIL->user->ID)) {
-
if ($OUTPUT->ajax_call)
$OUTPUT->redirect(array(), 2000);
+ if (!empty($_REQUEST['_framed']))
+ $OUTPUT->command('redirect', $OUTPUT->app->url());
+
// 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"),
--
Gitblit v1.9.1