From 88f66ec89cf87328536757ac33e508a9614bdc09 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 13 Aug 2007 16:15:27 -0400
Subject: [PATCH] Fix bugs introduced with latest changes
---
index.php | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/index.php b/index.php
index bde2234..34b5f8b 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
/*
+-----------------------------------------------------------------------+
| RoundCube Webmail IMAP Client |
- | Version 0.1-20070518 |
+ | Version 0.1-20070809 |
| |
| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
@@ -41,7 +41,7 @@
*/
// application constants
-define('RCMAIL_VERSION', '0.1-20070517');
+define('RCMAIL_VERSION', '0.1-20070809');
define('RCMAIL_CHARSET', 'UTF-8');
define('JS_OBJECT_NAME', 'rcmail');
@@ -81,8 +81,6 @@
require_once('include/rcube_imap.inc');
require_once('include/bugs.inc');
require_once('include/main.inc');
-require_once('include/cache.inc');
-require_once('lib/html2text.inc');
require_once('PEAR.php');
@@ -144,21 +142,6 @@
// error steps
if ($_action=='error' && !empty($_GET['_code']))
raise_error(array('code' => hexdec($_GET['_code'])), FALSE, TRUE);
-
-
-// handle HTML->text conversion
-if ($_action=='html2text')
-{
- $htmlText = $HTTP_RAW_POST_DATA;
- $converter = new html2text($htmlText);
-
- // TODO possibly replace with rcube_remote_response()
- header('Content-Type: text/plain');
- $plaintext = $converter->get_text();
- print $plaintext;
-
- exit;
-}
// try to log in
@@ -235,6 +218,16 @@
}
+// check client X-header to verify request origin
+if ($OUTPUT->ajax_call)
+{
+ if (empty($CONFIG['devel_mode']) && !rc_request_header('X-RoundCube-Referer'))
+ {
+ header('HTTP/1.1 404 Not Found');
+ die("Invalid Request");
+ }
+}
+
// set task and action to client
$OUTPUT->set_env('task', $_task);
--
Gitblit v1.9.1