From 42b11351497ce67e96a0465c76694632cdfb3ecb Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 07 Oct 2005 10:17:08 -0400
Subject: [PATCH] Several bugfixes and feature improvements
---
index.php | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/index.php b/index.php
index 31c39ea..6422a2e 100644
--- a/index.php
+++ b/index.php
@@ -48,9 +48,10 @@
// set environment first
-ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.'program'.PATH_SEPARATOR.'program/lib');
+ini_set('include_path', ini_get('include_path').PATH_SEPARATOR.$INSTALL_PATH.PATH_SEPARATOR.'program'.PATH_SEPARATOR.'program/lib');
ini_set('session.name', 'sessid');
ini_set('session.use_cookies', 1);
+ini_set('error_reporting', E_ALL&~E_NOTICE);
//ini_set('session.save_path', $INSTALL_PATH.'session');
@@ -72,6 +73,10 @@
$_task = !empty($_POST['_task']) ? $_POST['_task'] : (!empty($_GET['_task']) ? $_GET['_task'] : 'mail');
$_action = !empty($_POST['_action']) ? $_POST['_action'] : (!empty($_GET['_action']) ? $_GET['_action'] : '');
$_framed = (!empty($_GET['_framed']) || !empty($_POST['_framed']));
+
+if (!empty($_GET['_remote']))
+ $REMOTE_REQUEST = TRUE;
+
// start session with requested task
rcmail_startup($_task);
@@ -136,7 +141,7 @@
{
if ($_auth !== $sess_auth || $_auth != rcmail_auth_hash($_SESSION['client_id'], $_SESSION['auth_time']))
{
- show_message('sessionerror', 'error');
+ $message = show_message('sessionerror', 'error');
rcmail_kill_session();
}
}
@@ -156,7 +161,15 @@
// not logged in -> set task to 'login
if (empty($_SESSION['user_id']))
+ {
+ if ($REMOTE_REQUEST)
+ {
+ $message .= "setTimeout(\"location.href='\"+this.env.comm_path+\"'\", 2000);";
+ rcube_remote_response($message);
+ }
+
$_task = 'login';
+ }
--
Gitblit v1.9.1