gui: add cc address to message view

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2017-07-05 22:28:26 +02:00
parent 9f88690359
commit 35d8f0a0ba
2 changed files with 5 additions and 0 deletions

View File

@ -220,6 +220,7 @@ class ModelSearchMessage extends Model {
public function extract_message($id = '', $terms = '') { public function extract_message($id = '', $terms = '') {
$from = "From: "; $from = "From: ";
$to = "To: "; $to = "To: ";
$cc = "Cc: ";
$subject = "Subject: "; $subject = "Subject: ";
$date = "Date: "; $date = "Date: ";
@ -232,11 +233,13 @@ class ModelSearchMessage extends Model {
if(is_array($headers['from'])) { $headers['from'] = $headers['from'][0]; } if(is_array($headers['from'])) { $headers['from'] = $headers['from'][0]; }
if(is_array($headers['to'])) { $headers['to'] = $headers['to'][0]; } if(is_array($headers['to'])) { $headers['to'] = $headers['to'][0]; }
if(is_array($headers['cc'])) { $headers['cc'] = $headers['cc'][0]; }
if(is_array($headers['subject'])) { $headers['subject'] = $headers['subject'][0]; } if(is_array($headers['subject'])) { $headers['subject'] = $headers['subject'][0]; }
if(is_array($headers['date'])) { $headers['date'] = $headers['date'][0]; } if(is_array($headers['date'])) { $headers['date'] = $headers['date'][0]; }
if(isset($headers['from'])) $from .= $this->escape_lt_gt_symbols($headers['from']); if(isset($headers['from'])) $from .= $this->escape_lt_gt_symbols($headers['from']);
if(isset($headers['to'])) $to .= $this->escape_lt_gt_symbols($headers['to']); if(isset($headers['to'])) $to .= $this->escape_lt_gt_symbols($headers['to']);
if(isset($headers['cc'])) $cc .= $this->escape_lt_gt_symbols($headers['cc']);
if(isset($headers['subject'])) $subject .= $this->escape_lt_gt_symbols($headers['subject']); if(isset($headers['subject'])) $subject .= $this->escape_lt_gt_symbols($headers['subject']);
if(isset($headers['date'])) $date .= $headers['date']; if(isset($headers['date'])) $date .= $headers['date'];
@ -249,6 +252,7 @@ class ModelSearchMessage extends Model {
return array('from' => $from, return array('from' => $from,
'to' => $to, 'to' => $to,
'cc' => $cc,
'subject' => $this->highlight_search_terms($subject, $terms), 'subject' => $this->highlight_search_terms($subject, $terms),
'date' => $date, 'date' => $date,
'message' => $this->message['text/html'] ? $this->message['text/html'] : $this->message['text/plain'], 'message' => $this->message['text/html'] ? $this->message['text/html'] : $this->message['text/plain'],

View File

@ -65,6 +65,7 @@
<strong><?php if($message['subject'] == "" || $message['subject'] == "Subject:") { print "&lt;" . $text_no_subject . "&gt;"; } else { print $message['subject']; } ?></strong><br /> <strong><?php if($message['subject'] == "" || $message['subject'] == "Subject:") { print "&lt;" . $text_no_subject . "&gt;"; } else { print $message['subject']; } ?></strong><br />
<strong><?php print $message['from']; ?></strong><br /> <strong><?php print $message['from']; ?></strong><br />
<strong><?php print $message['to']; ?></strong><br /> <strong><?php print $message['to']; ?></strong><br />
<?php if(strlen($message['cc']) > 6) { ?><strong><?php print $message['cc']; ?></strong><br /><?php } ?>
<strong><?php print $message['date']; ?></strong><br /> <strong><?php print $message['date']; ?></strong><br />
<?php foreach($attachments as $a) { ?> <?php foreach($attachments as $a) { ?>
<span><i class="attachment icon-paper-clip icon-large" title="Message Attachment"></i>&nbsp;<a href="index.php?route=message/attachment&id=<?php print $a['id']; ?>"><?php print $a['name']; ?></a></span> <span><i class="attachment icon-paper-clip icon-large" title="Message Attachment"></i>&nbsp;<a href="index.php?route=message/attachment&id=<?php print $a['id']; ?>"><?php print $a['name']; ?></a></span>