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 31, 2024
1 parent 6723ab2 commit ff1e2ae
Show file tree
Hide file tree
Showing 7 changed files with 58 additions and 12 deletions.
12 changes: 9 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,21 @@ function checkbox_callback($vals, $style, $output_mod) {
if (!hm_exists('subject_callback')) {
function subject_callback($vals, $style, $output_mod) {
$img = '';
if (count($vals) == 4 && $vals[3]) {
$subject = '';
$preview_msg = '';
if (isset($vals[3]) && $vals[3]) {
$img = '<i class="bi bi-filetype-'.$vals[3].'"></i>';
}
$subject = $output_mod->html_safe($vals[0]);
if (isset($vals[4]) && $vals[4]) {
$preview_msg = $output_mod->html_safe($vals[4]);
}

$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">%s</p></div></div>', $output_mod->html_safe(implode(' ', $vals[2])), $subject, $img, $output_mod->html_safe($vals[1]), $hl_subject, $preview_msg);
}
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">%s</p></div></td>', $output_mod->html_safe(implode(' ', $vals[2])), $subject, $output_mod->html_safe($vals[1]), $hl_subject, $preview_msg);
}}

/**
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', $subject, $url, $flags, $icon, $preview_msg),
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', $subject, $url, $flags, null, $preview_msg),
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);
}
}

30 changes: 27 additions & 3 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,7 @@ 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)] BODY[0.1])\r\n";
$cache_command = $command.(string)$raw;
$cache = $this->check_cache($cache_command);
if ($cache !== false) {
Expand All @@ -787,8 +787,9 @@ public function get_message_list($uids, $raw=false) {
$status = $this->check_response($res, true);
$tags = array('X-GM-MSGID' => 'google_msg_id', 'X-GM-THRID' => 'google_thread_id', 'X-GM-LABELS' => 'google_labels', 'UID' => 'uid', 'FLAGS' => 'flags', 'RFC822.SIZE' => 'size', 'INTERNALDATE' => 'internal_date');
$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');
$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', 'body' => 'body');
$headers = array();

foreach ($res as $n => $vals) {
if (isset($vals[0]) && $vals[0] == '*') {
$uid = 0;
Expand All @@ -812,6 +813,7 @@ public function get_message_list($uids, $raw=false) {
$count = count($vals);
for ($i=0;$i<$count;$i++) {
if ($vals[$i] == 'BODY[HEADER.FIELDS') {

$i++;
while(isset($vals[$i]) && in_array(mb_strtoupper($vals[$i]), $junk)) {
$i++;
Expand All @@ -829,6 +831,17 @@ public function get_message_list($uids, $raw=false) {
}
}
}
elseif ($vals[$i] == 'BODY[0.1') {
$content = '';
$i++;
$i++;
while(isset($vals[$i]) && $vals[$i] != ')') {
$content .= $vals[$i];
$i++;
}
$i++;
$flds['body'] = $content;
}
elseif (isset($tags[mb_strtoupper($vals[$i])])) {
if (isset($vals[($i + 1)])) {
if (($tags[mb_strtoupper($vals[$i])] == 'flags' || $tags[mb_strtoupper($vals[$i])] == 'google_labels' ) && $vals[$i + 1] == '(') {
Expand All @@ -846,6 +859,7 @@ public function get_message_list($uids, $raw=false) {
}
}
}

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

$headers[$uid]['preview_msg'] = $flds['body'];

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 +2201,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"></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"></p></div></div>', subject_callback(array('foo', 'bar', array(), 'code'), 'news', $mod));
}
/**
* @preserveGlobalState disabled
Expand Down

0 comments on commit ff1e2ae

Please sign in to comment.