dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update v_mailto.php

This commit is contained in:
FusionPBX 2017-01-16 18:23:05 -07:00 committed by GitHub
parent d419a459f7
commit 3cdae74fde
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
secure/v_mailto.php
View File

@ -40,17 +40,17 @@
require_once "resources/require.php"; require_once "resources/require.php";
//define a function to remove html tags //define a function to remove html tags
function rip_tags($string) { function remove_tags($string) {
// ----- remove HTML TAGs ----- // ----- remove HTML TAGs -----
$string = preg_replace ('/<[^>]*>/', ' ', $string); $string = preg_replace ('/<[^>]*>/', ' ', $string);
// ----- remove control characters ----- // remove control characters
$string = str_replace("\r", '', $string); // --- replace with empty space $string = str_replace("\r", '', $string); // --- replace with empty space
$string = str_replace("\n", ' ', $string); // --- replace with space $string = str_replace("\n", ' ', $string); // --- replace with space
$string = str_replace("\t", ' ', $string); // --- replace with space $string = str_replace("\t", ' ', $string); // --- replace with space
// ----- remove multiple spaces ----- //remove multiple spaces
$string = trim(preg_replace('/ {2,}/', ' ', $string)); $string = trim(preg_replace('/ {2,}/', ' ', $string));
return $string; return $string;
} }
@ -313,7 +313,7 @@
} }
//add the body to the email //add the body to the email
$body_plain = rip_tags($body); $body_plain = remove_tags($body);
//echo "body_plain = $body_plain\n"; //echo "body_plain = $body_plain\n";
if ((substr($body, 0, 5) == "<html") || (substr($body, 0, 9) == "<!doctype")) { if ((substr($body, 0, 5) == "<html") || (substr($body, 0, 9) == "<!doctype")) {
$mail->ContentType = "text/html"; $mail->ContentType = "text/html";
@ -336,30 +336,32 @@
echo "Retained in v_emails \n"; echo "Retained in v_emails \n";
} else { } else {
// log/store message in database for review // log/store message in database for review
$email_uuid = uuid(); if (!isset($email_uuid)) {
$sql = "insert into v_emails ( "; $email_uuid = uuid();
$sql .= "email_uuid, "; $sql = "insert into v_emails ( ";
if ($call_uuid) { $sql .= "email_uuid, ";
$sql .= "call_uuid, "; if ($call_uuid) {
$sql .= "call_uuid, ";
}
$sql .= "domain_uuid, ";
$sql .= "sent_date, ";
$sql .= "type, ";
$sql .= "status, ";
$sql .= "email ";
$sql .= ") values ( ";
$sql .= "'".$email_uuid."', ";
if ($call_uuid) {
$sql .= "'".$call_uuid."', ";
}
$sql .= "'".$headers["X-FusionPBX-Domain-UUID"]."', ";
$sql .= "now(),";
$sql .= "'".$headers["X-FusionPBX-Email-Type"]."', ";
$sql .= "'failed', ";
$sql .= "'".str_replace("'", "''", $msg)."' ";
$sql .= ") ";
$db->exec(check_sql($sql));
unset($sql);
} }
$sql .= "domain_uuid, ";
$sql .= "sent_date, ";
$sql .= "type, ";
$sql .= "status, ";
$sql .= "email ";
$sql .= ") values ( ";
$sql .= "'".$email_uuid."', ";
if ($call_uuid) {
$sql .= "'".$call_uuid."', ";
}
$sql .= "'".$headers["X-FusionPBX-Domain-UUID"]."', ";
$sql .= "now(),";
$sql .= "'".$headers["X-FusionPBX-Email-Type"]."', ";
$sql .= "'failed', ";
$sql .= "'".str_replace("'", "''", $msg)."' ";
$sql .= ") ";
$db->exec(check_sql($sql));
unset($sql);
echo "Retained in v_emails as email_uuid = ".$email_uuid."\n"; echo "Retained in v_emails as email_uuid = ".$email_uuid."\n";
} }