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

Improved sanitizing the restored emails

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2023-06-01 17:20:45 +02:00
parent 230ee7302f
commit bace954070
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webui/model/mail/mail.php
View File

@ -12,6 +12,8 @@ class ModelMailMail extends Model {
if($to == "" || strlen($msg) < 30){ return $ok; } if($to == "" || strlen($msg) < 30){ return $ok; }
$msg = $this->normalize_message($msg);
if(REWRITE_MESSAGE_ID == 1) { if(REWRITE_MESSAGE_ID == 1) {
$msg = preg_replace("/Message-ID:([^\n]+)\n/i", "Message-ID: <" . generate_random_string(25) . '@' . SITE_NAME . ">\n", $msg); $msg = preg_replace("/Message-ID:([^\n]+)\n/i", "Message-ID: <" . generate_random_string(25) . '@' . SITE_NAME . ">\n", $msg);
} }
@ -165,4 +167,8 @@ class ModelMailMail extends Model {
} }
private function normalize_message($data = '') {
$a = preg_split("/\r?\n/", $data);
return implode("\r\n", $a);
}
} }

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

@ -40,12 +40,6 @@ class ModelSearchMessage extends Model {
} }
private function normalize_message($data = '') {
$a = preg_split("/\r?\n/", $data);
return implode("\r\n", $a);
}
public function get_raw_message($id = '') { public function get_raw_message($id = '') {
$s = ''; $s = '';
@ -71,8 +65,6 @@ class ModelSearchMessage extends Model {
$this->verification = $this->verify_message($id, $s); $this->verification = $this->verify_message($id, $s);
} }
$s = $this->normalize_message($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);
} }