From 0d80fad9e09c88cb605587e4453d560f6ae5b661 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 24 Jul 2012 14:56:12 +0200
Subject: [PATCH] CS improvements

---
 program/include/rcube_output_html.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index 30201fd04..3bc93db53 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -696,18 +696,31 @@ class rcube_output_html extends rcube_output
             // show a label
             case 'label':
                 if ($attrib['name'] || $attrib['command']) {
+                    // @FIXME: 'noshow' is useless, remove?
+                    if ($attrib['noshow']) {
+                        return '';
+                    }
+
                     $vars = $attrib + array('product' => $this->config->get('product_name'));
                     unset($vars['name'], $vars['command']);
-                    $label = $this->app->gettext($attrib + array('vars' => $vars));
+
+                    $label   = $this->app->gettext($attrib + array('vars' => $vars));
                     $quoting = !empty($attrib['quoting']) ? strtolower($attrib['quoting']) : (get_boolean((string)$attrib['html']) ? 'no' : '');
+
                     switch ($quoting) {
                         case 'no':
-                        case 'raw': break;
+                        case 'raw':
+                            break;
                         case 'javascript':
-                        case 'js': $label = rcmail::JQ($label); break;
-                        default:   $label = html::quote($label); break;
+                        case 'js':
+                            $label = rcmail::JQ($label);
+                            break;
+                        default:
+                            $label = html::quote($label);
+                            break;
                     }
-                    return !$attrib['noshow'] ? $label : '';
+
+                    return $label;
                 }
                 break;