New config option for custom logo; allow skins to define/override texts

2 files changed, 12 insertions, 1 deletions

diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 319e53cc0..980efe43d 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -874,6 +874,10 @@ class rcmail
 
     $nr = is_numeric($attrib['nr']) ? $attrib['nr'] : 1;
     $name = $attrib['name'] ? $attrib['name'] : '';
+    
+    // attrib contain text values: use them from now
+    if (($setval = $attrib[strtolower($_SESSION['language'])]) || ($setval = $attrib['en_us']))
+        $this->texts[$name] = $setval;
 
     // check for text with domain
     if ($domain && ($text_item = $this->texts[$domain.'.'.$name]))
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 11c290a16..c4b7a4426 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -658,7 +658,8 @@ class rcube_template extends rcube_html_page
             // show a label
             case 'label':
                 if ($attrib['name'] || $attrib['command']) {
-                    return Q(rcube_label($attrib + array('vars' => array('product' => $this->config['product_name']))));
+                    $label = rcube_label($attrib + array('vars' => array('product' => $this->config['product_name'])));
+                    return !$attrbi['noshow'] ? Q($label) : '';
                 }
                 break;
 
@@ -709,6 +710,12 @@ class rcube_template extends rcube_html_page
                 else if (function_exists($handler)) {
                     $content = call_user_func($handler, $attrib);
                 }
+                else if ($object == 'logo') {
+                    $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
+                    if ($this->config['skin_logo'])
+                        $attrib['src'] = $this->config['skin_logo'];
+                    $content = html::img($attrib);
+                }
                 else if ($object == 'productname') {
                     $name = !empty($this->config['product_name']) ? $this->config['product_name'] : 'Roundcube Webmail';
                     $content = Q($name);