cc/bcc fields work properly in api

master
Mike Koch 6 years ago
parent 81b27ddb2e
commit 275a1691d1
No known key found for this signature in database
GPG Key ID: 9BA5D7F8391455ED

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

@ -14,7 +14,7 @@ class CustomFieldsGateway extends CommonDao {
$customField = new CustomField(); $customField = new CustomField();
$customField->id = $row['id']; $customField->id = $row['id'];
$names = json_decode($row['name'], true); $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->type = $row['type'];
$customField->properties = json_decode($row['value'], true); $customField->properties = json_decode($row['value'], true);

Loading…
Cancel
Save