Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 28 insertions, 18 deletions

diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc
index 6bbc57fda..16fbb03d9 100644
--- a/program/steps/utils/error.inc
+++ b/program/steps/utils/error.inc
@@ -5,7 +5,7 @@
  | program/steps/utils/error.inc                                         |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2015, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -43,37 +43,33 @@ EOF;
 
 // authorization error
 else if ($ERROR_CODE == 401) {
-    $__error_title = "AUTHORIZATION FAILED";
-    $__error_text  = "Could not verify that you are authorized to access this service!<br />\n"
-        . "Please contact your server-administrator.";
+    $__error_title = strtoupper($rcmail->gettext('errauthorizationfailed'));
+    $__error_text  = nl2br($rcmail->gettext('errunauthorizedexplain') . "\n" .
+                        $rcmail->gettext('errcontactserveradmin'));
 }
 
 // forbidden due to request check
 else if ($ERROR_CODE == 403) {
     if ($_SERVER['REQUEST_METHOD'] == 'GET' && $rcmail->request_status == rcube::REQUEST_ERROR_URL) {
-        parse_str($_SERVER['QUERY_STRING'], $url);
-        $url = $rcmail->url($url, true, false, true);
-        $add = "<br /><a href=\"$url\">Click here to try again.<a/>";
+        $url = $rcmail->url($_GET, true, false, true);
+        $add = html::a($url, $rcmail->gettext('clicktoresumesession'));
     }
     else {
-        $add = "Please contact your server-administrator.";
+        $add = $rcmail->gettext('errcontactserveradmin');
     }
 
-    $__error_title = "REQUEST CHECK FAILED";
-    $__error_text  = "Access to this service was denied due to failing security checks!<br />\n$add";
+    $__error_title = strtoupper($rcmail->gettext('errrequestcheckfailed'));
+    $__error_text  = nl2br($rcmail->gettext('errcsrfprotectionexplain')) . '<p>' . $add . '</p>';
 }
 
 // failed request (wrong step in URL)
 else if ($ERROR_CODE == 404) {
     $request_url   = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
-    $__error_title = "REQUEST FAILED/FILE NOT FOUND";
-    $__error_text  = <<<EOF
-The requested page was not found!<br />
-Please contact your server-administrator.
+    $__error_title = strtoupper($rcmail->gettext('errnotfound'));
+    $__error_text  = nl2br($rcmail->gettext('errnotfoundexplain') . "\n" .
+                        $rcmail->gettext('errcontactserveradmin'));
 
-<p><i>Failed request:</i><br />
-http://$request_url</p>
-EOF;
+    $__error_text .= '<p><i>' . $rcmail->gettext('errfailedrequest') . ":</i><br />\n<tt>//$request_url</tt></p>";
 }
 
 // database connection error
@@ -101,6 +97,20 @@ else {
     }
 }
 
+// inform plugins
+if ($rcmail && $rcmail->plugins) {
+    $plugin = $rcmail->plugins->exec_hook('error_page', array(
+        'code' => $ERROR_CODE,
+        'title' => $__error_title,
+        'text' => $__error_text,
+    ));
+
+    if (!empty($plugin['title']))
+        $__error_title = $plugin['title'];
+    if (!empty($plugin['text']))
+        $__error_text = $plugin['text'];
+}
+
 $HTTP_ERR_CODE = $ERROR_CODE && $ERROR_CODE < 600 ? $ERROR_CODE : 500;
 
 // Ajax request
@@ -113,7 +123,7 @@ if ($rcmail->output && $rcmail->output->type == 'js') {
 $__page_content = <<<EOF
 <div>
 <h3 class="error-title">$__error_title</h3>
-<p class="error-text">$__error_text</p>
+<div class="error-text">$__error_text</div>
 </div>
 EOF;