From 382b8b1351e1a4598f04ab184cec803b96d7e4b7 Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 31 Mar 2011 12:32:44 +0000 Subject: - Applied fixes from trunk --- CHANGELOG | 1 + index.php | 2 +- program/include/rcmail.php | 12 +++++------- program/include/rcube_browser.php | 2 +- program/localization/index.inc | 4 ++-- program/steps/utils/spell_googie.inc | 2 ++ program/steps/utils/spell_html_googie.inc | 2 +- skins/default/images/abook_toolbar.png | Bin 13619 -> 13586 bytes skins/default/images/buttons/bg.gif | Bin 211 -> 197 bytes skins/default/images/dbutton.png | Bin 374 -> 240 bytes skins/default/images/dimple.png | Bin 239 -> 174 bytes skins/default/images/display/icons.png | Bin 4300 -> 4246 bytes skins/default/images/icons/expanded.png | Bin 169 -> 123 bytes skins/default/images/icons/glass.png | Bin 535 -> 433 bytes skins/default/images/icons/glass_roll.png | Bin 577 -> 544 bytes skins/default/images/icons/groupactions.png | Bin 660 -> 495 bytes skins/default/images/listheader.gif | Bin 487 -> 470 bytes skins/default/images/mail_footer.png | Bin 2235 -> 1027 bytes skins/default/images/mail_toolbar.png | Bin 39305 -> 37571 bytes skins/default/images/messageicons.png | Bin 3011 -> 2354 bytes skins/default/images/pagenav.gif | Bin 426 -> 357 bytes skins/default/images/searchfield.gif | Bin 397 -> 336 bytes skins/default/images/tabs-left.gif | Bin 461 -> 295 bytes skins/default/images/tabs-right.gif | Bin 2851 -> 837 bytes skins/default/images/taskicons.gif | Bin 2207 -> 1732 bytes skins/default/images/taskicons.png | Bin 3813 -> 1732 bytes skins/default/images/watermark.gif | Bin 11081 -> 10237 bytes 27 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index fad555c8f..53892d21f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Stateless request tokens. No keep-alive necessary on login page (#1487829) - PEAR::Net_SMTP 1.5.1 - Force names of unique constraints in PostgreSQL DDL - Add code for prevention from IMAP connection hangs when server closes socket unexpectedly diff --git a/index.php b/index.php index cf3369376..c21cc5479 100644 --- a/index.php +++ b/index.php @@ -182,7 +182,7 @@ else { // check client X-header to verify request origin if ($OUTPUT->ajax_call) { - if (rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token()) { + if (rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token() && !$RCMAIL->config->get('devel_mode')) { header('HTTP/1.1 404 Not Found'); die("Invalid Request"); } diff --git a/program/include/rcmail.php b/program/include/rcmail.php index e1dc22d07..8b4383e10 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -1105,12 +1105,9 @@ class rcmail */ public function get_request_token() { - $key = $this->task; - - if (!$_SESSION['request_tokens'][$key]) - $_SESSION['request_tokens'][$key] = md5(uniqid($key . mt_rand(), true)); - - return $_SESSION['request_tokens'][$key]; + $sess_id = $_COOKIE[ini_get('session.name')]; + if (!$sess_id) $sess_id = session_id(); + return md5('RT' . $this->task . $this->config->get('des_key') . $sess_id); } @@ -1123,7 +1120,8 @@ class rcmail public function check_request($mode = RCUBE_INPUT_POST) { $token = get_input_value('_token', $mode); - return !empty($token) && $_SESSION['request_tokens'][$this->task] == $token; + $sess_id = $_COOKIE[ini_get('session.name')]; + return !empty($sess_id) && $token == $this->get_request_token(); } diff --git a/program/include/rcube_browser.php b/program/include/rcube_browser.php index d080c605d..d74ec708a 100644 --- a/program/include/rcube_browser.php +++ b/program/include/rcube_browser.php @@ -42,7 +42,7 @@ class rcube_browser $this->ns4 = strstr($HTTP_USER_AGENT, 'mozilla/4') && !strstr($HTTP_USER_AGENT, 'msie'); $this->ns = ($this->ns4 || strstr($HTTP_USER_AGENT, 'netscape')); $this->ie = !$this->opera && strstr($HTTP_USER_AGENT, 'compatible; msie'); - $this->mz = strstr($HTTP_USER_AGENT, 'mozilla/5'); + $this->mz = !$this->ie && strstr($HTTP_USER_AGENT, 'mozilla/5'); $this->chrome = strstr($HTTP_USER_AGENT, 'chrome'); $this->khtml = strstr($HTTP_USER_AGENT, 'khtml'); $this->safari = !$this->chrome && ($this->khtml || strstr($HTTP_USER_AGENT, 'safari')); diff --git a/program/localization/index.inc b/program/localization/index.inc index 5f33792ca..9925a87a5 100644 --- a/program/localization/index.inc +++ b/program/localization/index.inc @@ -42,8 +42,8 @@ $rcube_languages = array( 'cs_CZ' => 'Czech (Česky)', 'da_DK' => 'Danish (Dansk)', 'fa_AF' => 'Dari (ﻯﺭﺩ)', - 'de_DE' => 'Deutsch (Deutsch)', - 'de_CH' => 'Deutsch (Schweiz)', + 'de_DE' => 'German (Deutsch)', + 'de_CH' => 'German (Schweiz)', 'nl_NL' => 'Dutch (Nederlands)', 'en_GB' => 'English (GB)', 'en_US' => 'English (US)', diff --git a/program/steps/utils/spell_googie.inc b/program/steps/utils/spell_googie.inc index 4c98dd697..269d792dd 100644 --- a/program/steps/utils/spell_googie.inc +++ b/program/steps/utils/spell_googie.inc @@ -41,6 +41,8 @@ if (!empty($CONFIG['spellcheck_uri'])) } $data = file_get_contents('php://input'); +// Google has some problem with spaces, use \n instead +$data = str_replace(' ', "\n", $data); $store = ""; if ($fp = fsockopen($host, $port, $errno, $errstr, 30)) diff --git a/program/steps/utils/spell_html_googie.inc b/program/steps/utils/spell_html_googie.inc index 1a4fbd48d..df18c036b 100644 --- a/program/steps/utils/spell_html_googie.inc +++ b/program/steps/utils/spell_html_googie.inc @@ -80,7 +80,7 @@ if (!empty($CONFIG['spellcheck_uri'])) $path = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $lang; } -$wordstr = implode(' ', (array) $data); +$wordstr = implode("\n", (array) $data); $data = '' .'' .'' . $wordstr . '' diff --git a/skins/default/images/abook_toolbar.png b/skins/default/images/abook_toolbar.png index cb7ae051f..c761fbc9d 100644 Binary files a/skins/default/images/abook_toolbar.png and b/skins/default/images/abook_toolbar.png differ diff --git a/skins/default/images/buttons/bg.gif b/skins/default/images/buttons/bg.gif index e2191c910..be39f4a35 100644 Binary files a/skins/default/images/buttons/bg.gif and b/skins/default/images/buttons/bg.gif differ diff --git a/skins/default/images/dbutton.png b/skins/default/images/dbutton.png index 58a124594..7a85e3c5d 100644 Binary files a/skins/default/images/dbutton.png and b/skins/default/images/dbutton.png differ diff --git a/skins/default/images/dimple.png b/skins/default/images/dimple.png index d96a5aded..4de496c87 100644 Binary files a/skins/default/images/dimple.png and b/skins/default/images/dimple.png differ diff --git a/skins/default/images/display/icons.png b/skins/default/images/display/icons.png index 2ab7d43af..7bf4278bf 100644 Binary files a/skins/default/images/display/icons.png and b/skins/default/images/display/icons.png differ diff --git a/skins/default/images/icons/expanded.png b/skins/default/images/icons/expanded.png index 1db079b79..87e77a477 100644 Binary files a/skins/default/images/icons/expanded.png and b/skins/default/images/icons/expanded.png differ diff --git a/skins/default/images/icons/glass.png b/skins/default/images/icons/glass.png index 41dbb3a37..eb1b1dc74 100644 Binary files a/skins/default/images/icons/glass.png and b/skins/default/images/icons/glass.png differ diff --git a/skins/default/images/icons/glass_roll.png b/skins/default/images/icons/glass_roll.png index a6d975a5a..b11b59854 100644 Binary files a/skins/default/images/icons/glass_roll.png and b/skins/default/images/icons/glass_roll.png differ diff --git a/skins/default/images/icons/groupactions.png b/skins/default/images/icons/groupactions.png index 2e9c5f101..9e39bca2e 100644 Binary files a/skins/default/images/icons/groupactions.png and b/skins/default/images/icons/groupactions.png differ diff --git a/skins/default/images/listheader.gif b/skins/default/images/listheader.gif index 2f5c7f862..ff28d95ef 100644 Binary files a/skins/default/images/listheader.gif and b/skins/default/images/listheader.gif differ diff --git a/skins/default/images/mail_footer.png b/skins/default/images/mail_footer.png index e0f82b578..e2f24b28c 100644 Binary files a/skins/default/images/mail_footer.png and b/skins/default/images/mail_footer.png differ diff --git a/skins/default/images/mail_toolbar.png b/skins/default/images/mail_toolbar.png index 3ee0ce6d8..6ccc9bd9e 100644 Binary files a/skins/default/images/mail_toolbar.png and b/skins/default/images/mail_toolbar.png differ diff --git a/skins/default/images/messageicons.png b/skins/default/images/messageicons.png index 5afb4cbf8..3dd37606e 100644 Binary files a/skins/default/images/messageicons.png and b/skins/default/images/messageicons.png differ diff --git a/skins/default/images/pagenav.gif b/skins/default/images/pagenav.gif index 92a73a440..a4644a4e4 100644 Binary files a/skins/default/images/pagenav.gif and b/skins/default/images/pagenav.gif differ diff --git a/skins/default/images/searchfield.gif b/skins/default/images/searchfield.gif index 756a17e47..969f277b3 100644 Binary files a/skins/default/images/searchfield.gif and b/skins/default/images/searchfield.gif differ diff --git a/skins/default/images/tabs-left.gif b/skins/default/images/tabs-left.gif index 3465d1fd1..c1bf45aa8 100644 Binary files a/skins/default/images/tabs-left.gif and b/skins/default/images/tabs-left.gif differ diff --git a/skins/default/images/tabs-right.gif b/skins/default/images/tabs-right.gif index 252463c9a..9eba9a342 100644 Binary files a/skins/default/images/tabs-right.gif and b/skins/default/images/tabs-right.gif differ diff --git a/skins/default/images/taskicons.gif b/skins/default/images/taskicons.gif index 53376c3d2..feaa9a14e 100644 Binary files a/skins/default/images/taskicons.gif and b/skins/default/images/taskicons.gif differ diff --git a/skins/default/images/taskicons.png b/skins/default/images/taskicons.png index a6ee706c8..feaa9a14e 100644 Binary files a/skins/default/images/taskicons.png and b/skins/default/images/taskicons.png differ diff --git a/skins/default/images/watermark.gif b/skins/default/images/watermark.gif index 7581802ae..d235d0306 100644 Binary files a/skins/default/images/watermark.gif and b/skins/default/images/watermark.gif differ -- cgit v1.2.3