Add option to display email address together with a name in mail preview (#1488732)

pull/67/merge
Aleksander Machniak 12 years ago
parent 38c19a2064
commit 969cb03f9a

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail CHANGELOG Roundcube Webmail
=========================== ===========================
- Add option to display email address together with a name in mail preview (#1488732)
- Fix Reply-To header handling in Reply-All action (#1489037) - Fix Reply-To header handling in Reply-All action (#1489037)
- Fix so Sender: address is added to Cc: field on reply to all (#1489011) - Fix so Sender: address is added to Cc: field on reply to all (#1489011)
- Fix so addressbook_search_mode works also for group search (#1489079) - Fix so addressbook_search_mode works also for group search (#1489079)

@ -890,4 +890,7 @@ $rcmail_config['autocomplete_single'] = false;
// Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana // Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana
$rcmail_config['default_font'] = ''; $rcmail_config['default_font'] = '';
// Enables display of email address with name instead of a name (and address in title)
$rcmail_config['message_show_email'] = false;
// end of config file // end of config file

@ -397,6 +397,7 @@ $labels['pagesize'] = 'Rows per page';
$labels['signature'] = 'Signature'; $labels['signature'] = 'Signature';
$labels['dstactive'] = 'Summer time'; $labels['dstactive'] = 'Summer time';
$labels['showinextwin'] = 'Open message in a new window'; $labels['showinextwin'] = 'Open message in a new window';
$labels['showemail'] = 'Show email address with display name';
$labels['composeextwin'] = 'Compose in a new window'; $labels['composeextwin'] = 'Compose in a new window';
$labels['htmleditor'] = 'Compose HTML messages'; $labels['htmleditor'] = 'Compose HTML messages';
$labels['htmlonreply'] = 'on reply to HTML message only'; $labels['htmlonreply'] = 'on reply to HTML message only';

@ -402,6 +402,7 @@ $labels['htmleditor'] = 'Compose HTML messages';
$labels['htmlonreply'] = 'on reply to HTML message'; $labels['htmlonreply'] = 'on reply to HTML message';
$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message'; $labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
$labels['htmlsignature'] = 'HTML signature'; $labels['htmlsignature'] = 'HTML signature';
$labels['showemail'] = 'Show email address with display name';
$labels['previewpane'] = 'Show preview pane'; $labels['previewpane'] = 'Show preview pane';
$labels['skin'] = 'Interface skin'; $labels['skin'] = 'Interface skin';
$labels['logoutclear'] = 'Clear Trash on logout'; $labels['logoutclear'] = 'Clear Trash on logout';

@ -1440,7 +1440,8 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
$c = count($a_parts); $c = count($a_parts);
$j = 0; $j = 0;
$out = ''; $out = '';
$allvalues = array(); $allvalues = array();
$show_email = $RCMAIL->config->get('message_show_email');
if ($addicon && !isset($_SESSION['writeable_abook'])) { if ($addicon && !isset($_SESSION['writeable_abook'])) {
$_SESSION['writeable_abook'] = $RCMAIL->get_address_sources(true) ? true : false; $_SESSION['writeable_abook'] = $RCMAIL->get_address_sources(true) ? true : false;
@ -1453,7 +1454,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
$string = $part['string']; $string = $part['string'];
// phishing email prevention (#1488981), e.g. "valid@email.addr <phishing@email.addr>" // phishing email prevention (#1488981), e.g. "valid@email.addr <phishing@email.addr>"
if ($name && $name != $mailto && strpos($name, '@')) { if (!$show_email && $name && $name != $mailto && strpos($name, '@')) {
$name = ''; $name = '';
} }
@ -1471,13 +1472,21 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
} }
else if (check_email($part['mailto'], false)) { else if (check_email($part['mailto'], false)) {
if ($linked) { if ($linked) {
$address = html::a(array( $attrs = array(
'href' => 'mailto:'.$mailto, 'href' => 'mailto:' . $mailto,
'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)), 'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)),
'title' => $mailto, 'class' => "rcmContactAddress",
'class' => "rcmContactAddress", );
),
Q($name ? $name : $mailto)); if ($show_email && $name && $mailto) {
$content = Q($name ? sprintf('%s <%s>', $name, $mailto) : $mailto);
}
else {
$content = Q($name ? $name : $mailto);
$attrs['title'] = $mailto;
}
$address = html::a($attrs, $content);
} }
else { else {
$address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"), $address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),

@ -418,6 +418,17 @@ function rcmail_user_prefs($current=null)
); );
} }
// show checkbox to show email instead of name
if (!isset($no_override['message_show_email'])) {
$field_id = 'rcmfd_message_show_email';
$input_msgshowemail = new html_checkbox(array('name' => '_message_show_email', 'id' => $field_id, 'value' => 1));
$blocks['main']['options']['message_show_email'] = array(
'title' => html::label($field_id, Q(rcube_label('showemail'))),
'content' => $input_msgshowemail->show($config['message_show_email']?1:0),
);
}
// show checkbox for HTML/plaintext messages // show checkbox for HTML/plaintext messages
if (!isset($no_override['prefer_html'])) { if (!isset($no_override['prefer_html'])) {
$field_id = 'rcmfd_htmlmsg'; $field_id = 'rcmfd_htmlmsg';

@ -60,6 +60,7 @@ switch ($CURR_SECTION)
case 'mailview': case 'mailview':
$a_user_prefs = array( $a_user_prefs = array(
'message_extwin' => intval($_POST['_message_extwin']), 'message_extwin' => intval($_POST['_message_extwin']),
'message_show_email' => isset($_POST['_message_show_email']) ? TRUE : FALSE,
'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE, 'prefer_html' => isset($_POST['_prefer_html']) ? TRUE : FALSE,
'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE, 'inline_images' => isset($_POST['_inline_images']) ? TRUE : FALSE,
'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0, 'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,

Loading…
Cancel
Save