From a46a10f19cc8d95572f11b48d4c0a91fff82b67d Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 05 Jun 2014 07:24:55 -0400
Subject: [PATCH] Don't hide voice contents with display:none, otherwise they're not read. Fix icon styles for compose contacts list

---
 program/steps/utils/error.inc |   73 ++++++++++++++++++------------------
 1 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/program/steps/utils/error.inc b/program/steps/utils/error.inc
index 126cf2e..2a3a9a6 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-2011, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -22,12 +22,12 @@
 $rcmail = rcmail::get_instance();
 
 // browser is not compatible with this application
-if ($ERROR_CODE==409) {
-  $user_agent = $GLOBALS['HTTP_SERVER_VARS']['HTTP_USER_AGENT'];
-  $__error_title = 'Your browser does not suit the requirements for this application';
-  $__error_text = <<<EOF
+if ($ERROR_CODE == 409) {
+    $user_agent    = htmlentities($_SERVER['HTTP_USER_AGENT']);
+    $__error_title = 'Your browser does not suit the requirements for this application';
+    $__error_text  = <<<EOF
 <i>Supported browsers:</i><br />
-&raquo; &nbsp;Microsoft Internet Explorer 6+<br />
+&raquo; &nbsp;Microsoft Internet Explorer 7+<br />
 &raquo; &nbsp;Mozilla Firefox 3+<br />
 &raquo; &nbsp;Chrome 10+<br />
 &raquo; &nbsp;Safari 4+<br />
@@ -42,24 +42,24 @@
 }
 
 // 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.";
+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.";
 }
 
 // forbidden due to request check
-else if ($ERROR_CODE==403) {
-  $__error_title = "REQUEST CHECK FAILED";
-  $__error_text  = "Access to this service was denied due to failing security checks!<br />\n".
-                   "Please contact your server-administrator.";
+else if ($ERROR_CODE == 403) {
+    $__error_title = "REQUEST CHECK FAILED";
+    $__error_text  = "Access to this service was denied due to failing security checks!<br />\n"
+        . "Please contact your server-administrator.";
 }
 
 // failed request (wrong step in URL)
-else if ($ERROR_CODE==404) {
-  $__error_title = "REQUEST FAILED/FILE NOT FOUND";
-  $request_url = htmlentities($_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
-  $__error_text  = <<<EOF
+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.
 
@@ -69,35 +69,36 @@
 }
 
 // database connection error
-else if ($ERROR_CODE==601)
-{
-  $__error_title = "CONFIGURATION ERROR";
-  $__error_text  =  nl2br($ERROR_MESSAGE) . "<br />Please read the INSTALL instructions!";
+else if ($ERROR_CODE == 601) {
+    $__error_title = "CONFIGURATION ERROR";
+    $__error_text  =  nl2br($ERROR_MESSAGE) . "<br />Please read the INSTALL instructions!";
 }
 
 // database connection error
-else if ($ERROR_CODE==603) {
-  $__error_title = "DATABASE ERROR: CONNECTION FAILED!";
-  $__error_text  =  "Unable to connect to the database!<br />Please contact your server-administrator.";
+else if ($ERROR_CODE == 603) {
+    $__error_title = "DATABASE ERROR: CONNECTION FAILED!";
+    $__error_text  =  "Unable to connect to the database!<br />Please contact your server-administrator.";
 }
 
 // system error
 else {
-  $__error_title = "SERVICE CURRENTLY NOT AVAILABLE!";
-  $__error_text  = "Please contact your server-administrator.";
+    $__error_title = "SERVICE CURRENTLY NOT AVAILABLE!";
+    $__error_text  = "Please contact your server-administrator.";
 
-  if (($rcmail->config->get('debug_level') & 4) && $ERROR_MESSAGE)
-    $__error_text = $ERROR_MESSAGE;
-  else
-    $__error_text = sprintf('Error No. [%s]', $ERROR_CODE);
+    if (($rcmail->config->get('debug_level') & 4) && $ERROR_MESSAGE) {
+        $__error_text = $ERROR_MESSAGE;
+    }
+    else {
+        $__error_text = sprintf('Error No. [%s]', $ERROR_CODE);
+    }
 }
 
 $HTTP_ERR_CODE = $ERROR_CODE && $ERROR_CODE < 600 ? $ERROR_CODE : 500;
 
 // Ajax request
 if ($rcmail->output && $rcmail->output->type == 'js') {
-  header("HTTP/1.0 $HTTP_ERR_CODE $__error_title");
-  die;
+    header("HTTP/1.0 $HTTP_ERR_CODE $__error_title");
+    die;
 }
 
 // compose page content
@@ -109,8 +110,9 @@
 EOF;
 
 if ($rcmail->output && $rcmail->output->template_exists('error')) {
-  $rcmail->output->reset();
-  $rcmail->output->send('error');
+    $rcmail->output->reset();
+    $rcmail->output->set_env('server_error', $ERROR_CODE);
+    $rcmail->output->send('error');
 }
 
 $__skin = $rcmail->config->get('skin', 'default');
@@ -136,4 +138,3 @@
 EOF;
 
 exit;
-

--
Gitblit v1.9.1