Enable reply/reply-all/forward buttons also in preview frame of message/rfc822

Aleksander Machniak

2016-03-28 46f7b7096450939fe03c95aa81ce06ae4bfca89d

 program/steps/settings/func.inc

@@ -500,11 +500,11 @@

                $field_id = 'rcmfd_mail_pagesize';
                $input    = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));
                $size     = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);
                $size     = intval($config['mail_pagesize'] ?: $config['pagesize']);

                $blocks['main']['options']['pagesize'] = array(
                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('pagesize'))),
                    'content' => $input->show($size ? $size : 50),
                    'content' => $input->show($size ?: 50),
                );
            }

@@ -749,7 +749,7 @@
                );
            }

            if (!isset($no_override['dsn_default'])) {
            if (!isset($no_override['dsn_default']) && $RCMAIL->config->get('smtp_server')) {
                if (!$current) {
                    continue 2;
                }
@@ -871,6 +871,20 @@
                $blocks['sig']['options']['strip_existing_sig'] = array(
                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('replyremovesignature'))),
                    'content' => $input->show($config['strip_existing_sig']?1:0),
                );
            }

            if (!isset($no_override['sig_separator'])) {
                if (!$current) {
                    continue 2;
                }

                $field_id = 'rcmfd_sig_separator';
                $input    = new html_checkbox(array('name' => '_sig_separator', 'id' => $field_id, 'value' => 1));

                $blocks['sig']['options']['sig_separator'] = array(
                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('sigseparator'))),
                    'content' => $input->show($RCMAIL->config->get('sig_separator') ? 1 : 0),
                );
            }

@@ -1029,11 +1043,11 @@

                $field_id = 'rcmfd_addressbook_pagesize';
                $input    = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));
                $size     = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);
                $size     = intval($config['addressbook_pagesize'] ?: $config['pagesize']);

                $blocks['main']['options']['pagesize'] = array(
                    'title'   => html::label($field_id, rcube::Q($RCMAIL->gettext('pagesize'))),
                    'content' => $input->show($size ? $size : 50),
                    'content' => $input->show($size ?: 50),
                );
            }

@@ -1279,9 +1293,9 @@

        // allow plugins to add a header to each section
        $data = $RCMAIL->plugins->exec_hook('preferences_section_header',
                                            array('section' => $sect['id'], 'header' => '', 'current' => $current));
            array('section' => $sect['id'], 'header' => '', 'current' => $current));

        if(!empty($data['header'])) {
        if (!empty($data['header'])) {
            $sections[$idx]['header'] = $data['header'];
        }
    }
@@ -1390,8 +1404,8 @@
        $button = $OUTPUT->button($action);
        $attr   = $attrib;

        $cmd = $action['action'] ? $action['action'] : $action['command'];
        $id  = $action['id'] ? $action['id'] : $cmd;
        $cmd = $action['action'] ?: $action['command'];
        $id  = $action['id'] ?: $cmd;

        if (!empty($id)) {
            $attr['id'] = preg_replace('/[^a-z0-9]/i', '', $attrib['idprefix'] . $id);