Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cc/bcc fields work properly in api

Browse Source
This commit is contained in:
Mike Koch 2018-02-19 22:01:42 -05:00
parent 81b27ddb2e
commit 275a1691d1
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/BusinessLogic/Emails/BasicEmailSender.php
View File

@ -10,9 +10,11 @@ use PHPMailer;
class BasicEmailSender extends \BaseClass implements EmailSender {
function sendEmail($emailBuilder, $heskSettings, $modsForHeskSettings, $sendAsHtml) {
if (preg_match("/\n|\r|\t|%0A|%0D|%08|%09/", $emailBuilder->to . $emailBuilder->subject)) {
foreach ($emailBuilder->to as $to) {
if (preg_match("/\n|\r|\t|%0A|%0D|%08|%09/", $to . $emailBuilder->subject)) {
return false;
}
}
$mailer = new PHPMailer();

2
api/DataAccess/CustomFields/CustomFieldsGateway.php
View File

@ -14,7 +14,7 @@ class CustomFieldsGateway extends CommonDao {
$customField = new CustomField();
$customField->id = $row['id'];
$names = json_decode($row['name'], true);
$customField->name = (isset($names[$hesk_settings['language']])) ? $names[$heskSettings['language']] : reset($names);
$customField->name = (isset($names[$heskSettings['language']])) ? $names[$heskSettings['language']] : reset($names);
$customField->type = $row['type'];
$customField->properties = json_decode($row['value'], true);