bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2024-12-25 20:50:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #768

Browse Source 
Change-Id: Idf5659ce4e0b1fe5d371ea8a0ebd3bd3fb9901ee
Signed-off-by: SJ <sj@acts.hu>
This commit is contained in:
SJ 2016-12-30 11:24:00 +01:00
parent f7c6abfbe3
commit 509bd6c0a3
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webui/model/search/message.php
View File

@ -9,7 +9,7 @@ class ModelSearchMessage extends Model {
'GB231280' => 'GBK' 'GB231280' => 'GBK'
); );
public $message; public $message;
private $verification = 0;
public function get_boundary($line='') { public function get_boundary($line='') {
$parts = explode(";", $line); $parts = explode(";", $line);
@ -78,6 +78,10 @@ class ModelSearchMessage extends Model {
pclose($handle); pclose($handle);
} }
if(ENABLE_ON_THE_FLY_VERIFICATION == 0) {
$this->verification = $this->verify_message($id, $s);
}
if(Registry::get('auditor_user') == 0 && HEADER_LINE_TO_HIDE) { if(Registry::get('auditor_user') == 0 && HEADER_LINE_TO_HIDE) {
$s = preg_replace("/" . HEADER_LINE_TO_HIDE . ".{1,}(\n(\ |\t){1,}.{1,}){0,}" . "\n/i", "", $s); $s = preg_replace("/" . HEADER_LINE_TO_HIDE . ".{1,}(\n(\ |\t){1,}.{1,}){0,}" . "\n/i", "", $s);
} }
@ -121,10 +125,6 @@ class ModelSearchMessage extends Model {
$has_journal = $this->remove_journal($headers); $has_journal = $this->remove_journal($headers);
if(Registry::get('auditor_user') == 0 && HEADER_LINE_TO_HIDE) {
$headers = preg_replace("/" . HEADER_LINE_TO_HIDE . ".{1,}(\n(\ |\t){1,}.{1,}){0,}" . "\n/i", "", $headers);
}
$headers = $this->escape_lt_gt_symbols($headers); $headers = $this->escape_lt_gt_symbols($headers);
return array('headers' => $headers, 'has_journal' => $has_journal); return array('headers' => $headers, 'has_journal' => $has_journal);
@ -224,10 +224,6 @@ class ModelSearchMessage extends Model {
$msg = $this->get_raw_message($id); $msg = $this->get_raw_message($id);
if(ENABLE_ON_THE_FLY_VERIFICATION == 0) {
$verification = $this->verify_message($id, $msg);
}
$has_journal = $this->remove_journal($msg); $has_journal = $this->remove_journal($msg);
Zend_Mime_Decode::splitMessage($msg, $headers, $body); Zend_Mime_Decode::splitMessage($msg, $headers, $body);
@ -253,7 +249,7 @@ class ModelSearchMessage extends Model {
'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'],
'has_journal' => $has_journal, 'has_journal' => $has_journal,
'verification' => $verification 'verification' => $this->verification
); );
} }