Fix address matching in Return-Path header on identity selection (#1489374)

Aleksander Machniak

2013-10-15 c20fa4a1ad57a6fa013c7c9ddba72c6c3aafe345

 program/include/rcmail_output_html.php

@@ -925,16 +925,18 @@
                else if ($object == 'logo') {
                    $attrib += array('alt' => $this->xml_command(array('', 'object', 'name="productname"')));

                    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;
                    if ($logo = $this->config->get('skin_logo')) {
                        if (is_array($logo)) {
                            if ($template_logo = $logo[$this->template_name]) {
                                $attrib['src'] = $template_logo;
                            }
                            elseif ($template_logo = $logo['*']) {
                                $attrib['src'] = $template_logo;
                            }
                        }
                        else {
                            $attrib['src'] = $logo;
                        }
                    }

                    $content = html::img($attrib);
@@ -1053,7 +1055,7 @@
        // these commands can be called directly via url
        $a_static_commands = array('compose', 'list', 'preferences', 'folders', 'identities');

        if (!($attrib['command'] || $attrib['name'])) {
        if (!($attrib['command'] || $attrib['name'] || $attrib['href'])) {
            return '';
        }