allow different logos for different functions (eg. normal and print)

1 files changed, 12 insertions, 1 deletions

diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index a2ec29ca3..39f79d119 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -924,8 +924,19 @@ class rcmail_output_html extends rcmail_output
                 }
                 else if ($object == 'logo') {
                     $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));
-                    if ($logo = $this->config->get('skin_logo'))
+
+                    if (is_array($this->config->get('skin_logo'))) {
+                       if (isset($attrib['type']) && array_key_exists($attrib['type'], $this->config->get('skin_logo'))) {
+                           $attrib['src'] = $this->config->get('skin_logo')[$attrib['type']];
+                       }
+                       elseif (array_key_exists('default', $this->config->get('skin_logo'))) {
+                           $attrib['src'] = $this->config->get('skin_logo')['default'];
+                       }
+                    }
+                    elseif ($logo = $this->config->get('skin_logo')) {
                         $attrib['src'] = $logo;
+                    }
+
                     $content = html::img($attrib);
                 }
                 else if ($object == 'productname') {