Skip to content

Commit

Permalink
[ENH]message list: Preview of message when viewing message list
Browse files Browse the repository at this point in the history
  • Loading branch information
@christer77
christer77 committed Oct 23, 2024
1 parent 6723ab2 commit eb1611c
Show file tree
Hide file tree
Showing 7 changed files with 109 additions and 24 deletions.
14 changes: 11 additions & 3 deletions modules/core/message_list_functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,15 +295,23 @@ function checkbox_callback($vals, $style, $output_mod) {
if (!hm_exists('subject_callback')) {
function subject_callback($vals, $style, $output_mod) {
$img = '';
$preview_msg = '';
$subject = '';
if (count($vals) == 4 && $vals[3]) {
$img = '<i class="bi bi-filetype-'.$vals[3].'"></i>';
}
$subject = $output_mod->html_safe($vals[0]);
if (is_array($vals[0])) {
$preview_msg = $output_mod->html_safe($vals[0]['preview_msg']);
$subject = $output_mod->html_safe($vals[0]['subject']);
} else {
$subject = $output_mod->html_safe($vals[0]);
}

$hl_subject = preg_replace("/^(\[[^\]]+\])/", '<span class="s_pre">$1</span>', $subject);
if ($style == 'news') {
return sprintf('<div class="subject"><div class="%s" title="%s">%s <a href="%s">%s</a></div></div>', $output_mod->html_safe(implode(' ', $vals[2])), $subject, $img, $output_mod->html_safe($vals[1]), $hl_subject);
return sprintf('<div class="subject"><div class="%s" title="%s">%s <a href="%s">%s</a><p class="fw-light" title="'. $preview_msg .'">'. $preview_msg .'</p></div></div>', $output_mod->html_safe(implode(' ', $vals[2])), $subject, $img, $output_mod->html_safe($vals[1]), $hl_subject);
}
return sprintf('<td class="subject"><div class="%s"><a title="%s" href="%s">%s</a></div></td>', $output_mod->html_safe(implode(' ', $vals[2])), $subject, $output_mod->html_safe($vals[1]), $hl_subject);
return sprintf('<td class="subject"><div class="%s"><a title="%s" href="%s">%s</a><p class="fw-light" title="'. $preview_msg .'">'. $preview_msg .'</p></div></td>', $output_mod->html_safe(implode(' ', $vals[2])), $subject, $output_mod->html_safe($vals[1]), $hl_subject);
}}

/**
Expand Down
9 changes: 7 additions & 2 deletions modules/imap/functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
$msg['subject'] = '[No Subject]';
}
$subject = $msg['subject'];
$preview_msg = "";
if (isset($msg['preview_msg'])) {
$preview_msg = $msg['preview_msg'];
}

if ($parent_list == 'sent') {
$icon = 'sent';
$from = $msg['to'];
Expand Down Expand Up @@ -291,7 +296,7 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
$res[$id] = message_list_row(array(
array('checkbox_callback', $id),
array('icon_callback', $flags),
array('subject_callback', $subject, $url, $flags, $icon),
array('subject_callback', array("subject" => $subject, "preview_msg" => $preview_msg), $url, $flags, $icon),
array('safe_output_callback', 'source', $source),
array('safe_output_callback', 'from'.$nofrom, $from, null, str_replace(array($from, '<', '>'), '', $msg['from'])),
array('date_callback', $date, $timestamp),
Expand All @@ -307,7 +312,7 @@ function format_imap_message_list($msg_list, $output_module, $parent_list=false,
array('checkbox_callback', $id),
array('safe_output_callback', 'source', $source, $icon),
array('safe_output_callback', 'from'.$nofrom, $from, null, str_replace(array($from, '<', '>'), '', $msg['from'])),
array('subject_callback', $subject, $url, $flags),
array('subject_callback', array("subject" => $subject, "preview_msg" => $preview_msg), $url, $flags),
array('date_callback', $date, $timestamp, $is_snoozed),
array('icon_callback', $flags)
),
Expand Down
11 changes: 11 additions & 0 deletions modules/imap/handler_modules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -849,9 +849,19 @@ public function process() {
list($total, $results) = $imap->get_mailbox_page(hex2bin($form['folder']), $sort, $rev, $filter, $offset, $limit, $keyword);
}
foreach ($results as $msg) {
// echo "<pre>"; var_dump($msg); die;
$msg['server_id'] = $form['imap_server_id'];
$msg['server_name'] = $details['name'];
$msg['folder'] = $form['folder'];
// $uid = $msg['uid'];
// $part = true;
// $max = 87;
// $msg_struct = $imap->get_message_structure($uid);
// $struct = $imap->search_bodystructure($msg_struct, array('imap_part_number' => $part));
// $msg_struct_current = array_shift($struct);
// $msg_text = $imap->get_message_content($uid, $part, $max, $msg_struct_current);
// // $msg['preview_msg'] = "xxxxxxx";
// $msg['preview_msg'] = $msg_text;
$msgs[] = $msg;
}
if ($imap->selected_mailbox) {
Expand Down Expand Up @@ -2191,3 +2201,4 @@ function process_move_messages_in_screen_email_enabled_callback($val) { return $
process_site_setting('move_messages_in_screen_email', $this, 'process_move_messages_in_screen_email_enabled_callback', true, true);
}
}

91 changes: 76 additions & 15 deletions modules/imap/hm-imap.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ public function poll() {
* @param bool $raw flag to disable decoding header values
* @return array list of headers and values for the specified uids
*/
public function get_message_list($uids, $raw=false) {
public function get_message_list($uids, $raw=false, $include_preview = false) {
if (is_array($uids)) {
sort($uids);
$sorted_string = implode(',', $uids);
Expand All @@ -776,7 +776,11 @@ public function get_message_list($uids, $raw=false) {
if ($this->is_supported( 'X-GM-EXT-1' )) {
$command .= 'X-GM-MSGID X-GM-THRID X-GM-LABELS ';
}
$command .= "BODY.PEEK[HEADER.FIELDS (SUBJECT X-AUTO-BCC FROM DATE CONTENT-TYPE X-PRIORITY TO LIST-ARCHIVE REFERENCES MESSAGE-ID X-SNOOZED)])\r\n";
$command .= "BODY.PEEK[HEADER.FIELDS (SUBJECT X-AUTO-BCC FROM DATE CONTENT-TYPE X-PRIORITY TO LIST-ARCHIVE REFERENCES MESSAGE-ID X-SNOOZED)]";
// if ($include_preview) {
$command .= " BODY[TEXT]";
// }
$command .= ")\r\n";
$cache_command = $command.(string)$raw;
$cache = $this->check_cache($cache_command);
if ($cache !== false) {
Expand All @@ -789,6 +793,7 @@ public function get_message_list($uids, $raw=false) {
$junk = array('X-AUTO-BCC', 'MESSAGE-ID', 'REFERENCES', 'X-SNOOZED', 'LIST-ARCHIVE', 'SUBJECT', 'FROM', 'CONTENT-TYPE', 'TO', '(', ')', ']', 'X-PRIORITY', 'DATE');
$flds = array('x-auto-bcc' => 'x_auto_bcc', 'message-id' => 'message_id', 'references' => 'references', 'x-snoozed' => 'x_snoozed', 'list-archive' => 'list_archive', 'date' => 'date', 'from' => 'from', 'to' => 'to', 'subject' => 'subject', 'content-type' => 'content_type', 'x-priority' => 'x_priority');
$headers = array();

foreach ($res as $n => $vals) {
if (isset($vals[0]) && $vals[0] == '*') {
$uid = 0;
Expand All @@ -810,23 +815,66 @@ public function get_message_list($uids, $raw=false) {
$x_auto_bcc = '';
$x_snoozed = '';
$count = count($vals);
$preview_msg = '';
for ($i=0;$i<$count;$i++) {
if ($vals[$i] == 'BODY[HEADER.FIELDS') {
$i++;
while(isset($vals[$i]) && in_array(mb_strtoupper($vals[$i]), $junk)) {

if ($vals[$i] == 'BODY[HEADER.FIELDS' || $vals[$i] == 'BODY[TEXT') {
if ($vals[$i] == 'BODY[HEADER.FIELDS') {

$i++;
}
$last_header = false;
$lines = explode("\r\n", $vals[$i]);
foreach ($lines as $line) {
$header = mb_strtolower(mb_substr($line, 0, mb_strpos($line, ':')));
if (!$header || (!isset($flds[$header]) && $last_header)) {
${$flds[$last_header]} .= str_replace("\t", " ", $line);
while(isset($vals[$i]) && in_array(mb_strtoupper($vals[$i]), $junk)) {
$i++;
}
$last_header = false;
$lines = explode("\r\n", $vals[$i]);
foreach ($lines as $line) {
$header = mb_strtolower(mb_substr($line, 0, mb_strpos($line, ':')));
if (!$header || (!isset($flds[$header]) && $last_header)) {
${$flds[$last_header]} .= str_replace("\t", " ", $line);
}
elseif (isset($flds[$header])) {
${$flds[$header]} = mb_substr($line, (mb_strpos($line, ':') + 1));
$last_header = $header;
}
}
} else {

$i++;
$res = '';
while(isset($vals[$i])) {

if ($vals[$i] != ']') {
$res = trim(preg_replace("/\s*\)$/", '', $vals[$i]));
break;
}
$i++;
}

$message_part = 0;
$struct = true;
$full_struct = $this->get_message_structure($uid);
$part_struct = $this->search_bodystructure( $full_struct, array('imap_part_number' => $message_part));
if (isset($part_struct[$message_part])) {
$struct = $part_struct[$message_part];
}
elseif (isset($flds[$header])) {
${$flds[$header]} = mb_substr($line, (mb_strpos($line, ':') + 1));
$last_header = $header;

if (is_array($struct)) {
if (isset($struct['encoding']) && $struct['encoding']) {
if (mb_strtolower($struct['encoding']) == 'quoted-printable') {
$res = quoted_printable_decode($res);
}
elseif (mb_strtolower($struct['encoding']) == 'base64') {
$res = base64_decode($res);
}
}
if (isset($struct['attributes']['charset']) && $struct['attributes']['charset']) {
if ($struct['attributes']['charset'] != 'us-ascii') {
$res = mb_convert_encoding($res, 'UTF-8', $struct['attributes']['charset']);
}
}
}
$preview_msg = $res;

}
}
elseif (isset($tags[mb_strtoupper($vals[$i])])) {
Expand All @@ -846,6 +894,7 @@ public function get_message_list($uids, $raw=false) {
}
}
}

if ($uid) {
$cset = '';
if (mb_stristr($content_type, 'charset=')) {
Expand All @@ -860,13 +909,18 @@ public function get_message_list($uids, $raw=false) {
'references' => $references, 'message_id' => $message_id, 'x_auto_bcc' => $x_auto_bcc,
'x_snoozed' => $x_snoozed);

if (! empty($preview_msg)) {
$headers[$uid]['preview_msg'] = $preview_msg;
}

if ($raw) {
$headers[$uid] = array_map('trim', $headers[$uid]);
}
else {
$headers[$uid] = array_map(array($this, 'decode_fld'), $headers[$uid]);
}


}
}
}
Expand Down Expand Up @@ -2184,6 +2238,13 @@ public function get_mailbox_page($mailbox, $sort, $rev, $filter, $offset=0, $lim
$headers = $this->get_message_list($uids);
foreach($uids as $uid) {
if (isset($headers[$uid])) {
// $part = true;
// $max = 3000;
// $msg_struct = $this->get_message_structure($uid);
// $struct = $this->search_bodystructure($msg_struct, array('imap_part_number' => $part));
// $msg_struct_current = array_shift($struct);
// $msg_text = $this->get_message_content($uid, $part, $max, $msg_struct_current);
// $headers[$uid]['preview_msg'] = $msg_text;
$result[$uid] = $headers[$uid];
}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/imap/site.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@ var add_email_in_contact_trusted = function(list_email) {
}
);
}
};
};

$('.screen-email-unlike').on("click", function() { imap_screen_email(); return false; });

Expand Down
2 changes: 1 addition & 1 deletion modules/smtp/modules.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2027,7 +2027,7 @@ function get_outbound_msg_detail($post, $draft, $body_type) {
}
if (array_key_exists('compose_in_reply_to', $post)) {
$in_reply_to = $post['compose_in_reply_to'];
$draft['draft_in_reply_to'] = $post['compose_in_reply_to'];
$draft['draft_in_reply_to'] = $pzost['compose_in_reply_to'];
}
if ($body_type == 2) {
$converter = new GithubFlavoredMarkdownConverter([
Expand Down
4 changes: 2 additions & 2 deletions tests/phpunit/modules/core/message_list_functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public function test_checkbox_callback() {
*/
public function test_subject_callback() {
$mod = new Hm_Output_Test(array('foo' => 'bar', 'bar' => 'foo'), array('bar'));
$this->assertEquals('<td class="subject"><div class=""><a title="foo" href="bar">foo</a></div></td>', subject_callback(array('foo', 'bar', array()), 'email', $mod));
$this->assertEquals('<div class="subject"><div class="" title="foo"><i class="bi bi-filetype-code"></i> <a href="bar">foo</a></div></div>', subject_callback(array('foo', 'bar', array(), 'code'), 'news', $mod));
$this->assertEquals('<td class="subject"><div class=""><a title="foo" href="bar">foo</a><p class="fw-light" title=""></p></div></td>', subject_callback(array('foo', 'bar', array()), 'email', $mod));
$this->assertEquals('<div class="subject"><div class="" title="foo"><i class="bi bi-filetype-code"></i> <a href="bar">foo</a><p class="fw-light" title=""></p></div></div>', subject_callback(array('foo', 'bar', array(), 'code'), 'news', $mod));
}
/**
* @preserveGlobalState disabled
Expand Down

0 comments on commit eb1611c

Please sign in to comment.