summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-10 15:49:14 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-10 15:49:14 +0000
commitf98a7b183160aaf0a21f9f5b029db49fab1275d9 (patch)
treeefc8b264bc34a5c3c736d9d64dadf17a4f25695f
parentbd3e60d1a0749a9c41eb6b47c9e97079e638f655 (diff)
Fix some recently introduced bugs
git-svn-id: https://svn.roundcube.net/trunk@1760 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/index.php2
-rw-r--r--roundcubemail/program/js/app.js7
2 files changed, 5 insertions, 4 deletions
diff --git a/roundcubemail/index.php b/roundcubemail/index.php
index e6201839c..adab4118c 100644
--- a/roundcubemail/index.php
+++ b/roundcubemail/index.php
@@ -133,7 +133,7 @@ if (!empty($RCMAIL->user->ID) && $RCMAIL->task == 'mail') {
// check client X-header to verify request origin
if ($OUTPUT->ajax_call) {
- if ($RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
+ if (!$RCMAIL->config->get('devel_mode') && !rc_request_header('X-RoundCube-Referer')) {
header('HTTP/1.1 404 Not Found');
die("Invalid Request");
}
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 9e10811d5..3812a73de 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -3793,7 +3793,8 @@ function rcube_webmail()
case 'getunread':
case 'list':
if (this.task == 'mail') {
- this.msglist_select(this.message_list);
+ if (this.message_list)
+ this.msglist_select(this.message_list);
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
this.enable_command('purge', this.purge_mailbox_test());
}
@@ -3809,14 +3810,14 @@ function rcube_webmail()
// handle HTTP request errors
this.http_error = function(request_obj)
{
- //alert('Error sending request: '+request_obj.url);
+ //alert('Error sending request: '+request_obj.url+' => HTTP '+request_obj.xmlhttp.status);
if (request_obj.__lock)
this.set_busy(false);
request_obj.reset();
request_obj.__lock = false;
- this.display_message('Unknown Serer Error!', 'error');
+ this.display_message('Unknown Server Error!', 'error');
};