gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-11 20:21:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

toIndividual() allows string as sender email

Browse Source
This commit is contained in:
Uwe Steinmann 2016-02-22 10:40:22 +01:00
parent a15b83dc99
commit 72cf2a4283
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inc/inc.ClassEmailNotify.php
View File

@ -44,17 +44,21 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
global $settings;
if ($recipient->isDisabled() || $recipient->getEmail()=="") return 0;
if ((!is_object($sender) && strcasecmp(get_class($sender), "SeedDMS_Core_User")) ||
(!is_object($recipient) && strcasecmp(get_class($recipient), "SeedDMS_Core_User"))) {
if(!is_object($recipient) && strcasecmp(get_class($recipient), "SeedDMS_Core_User")) {
return -1;
}
if (is_object($sender) && !strcasecmp(get_class($sender), "SeedDMS_Core_User")) {
$from = $sender->getFullName() ." <". $sender->getEmail() .">";
} elseif(is_string($sender) && trim($sender) != "") {
$from = $sender;
} else
return -1;
$headers = array();
$headers[] = "MIME-Version: 1.0";
$headers[] = "Content-type: text/plain; charset=utf-8";
//$headers[] = "From: ". $sender->getFullName() ." <". $sender->getEmail() .">";
$headers[] = "From: ". $settings->_smtpSendFrom;
$headers[] = "Reply-To: ". $sender->getFullName() ." <". $sender->getEmail() .">";
$headers[] = "From: ". $from;
$lang = $recipient->getLanguage();
$message = getMLText("email_header", array(), "", $lang)."\r\n\r\n".getMLText($message, $params, "", $lang);