Correctly quote localized labels when used in javascript variables (#1488567)

1 files changed, 9 insertions, 1 deletions

diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index e779f5a34..19510ce5b 100644
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -711,7 +711,15 @@ class rcube_template extends rcube_html_page
                     $vars = $attrib + array('product' => $this->config['product_name']);
                     unset($vars['name'], $vars['command']);
                     $label = rcube_label($attrib + array('vars' => $vars));
-                    return !$attrib['noshow'] ? (get_boolean((string)$attrib['html']) ? $label : Q($label)) : '';
+                    $quoting = !empty($attrib['quoting']) ? strtolower($attrib['quoting']) : (get_boolean((string)$attrib['html']) ? 'no' : '');
+                    switch ($quoting) {
+                        case 'no':
+                        case 'raw': break;
+                        case 'javascript':
+                        case 'js': $label = JQ($label); break;
+                        default:   $label = Q($label); break;
+                    }
+                    return !$attrib['noshow'] ? $label : '';
                 }
                 break;