gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 15:32:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

from address in settings can be forced

Browse Source
This commit is contained in:
Uwe Steinmann 2024-09-17 20:29:19 +02:00
parent ad37593625
commit f2ab106a81
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/inc.ClassEmailNotify.php
View File

@ -50,7 +50,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
protected $debug;
function __construct($dms, $from_address='', $smtp_server='', $smtp_port='', $smtp_username='', $smtp_password='', $lazy_ssl=true) { /* {{{ */
function __construct($dms, $from_address='', $smtp_server='', $smtp_port='', $smtp_username='', $smtp_password='', $lazy_ssl=true, $force_from=false) { /* {{{ */
$this->_dms = $dms;
$this->smtp_server = $smtp_server;
$this->smtp_port = $smtp_port;
@ -58,6 +58,7 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
$this->smtp_password = $smtp_password;
$this->from_address = $from_address;
$this->lazy_ssl = $lazy_ssl;
$this->force_from = $force_from;
$this->debug = false;
} /* }}} */
@ -101,7 +102,9 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
return false;
$returnpath = $this->from_address;
if(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) {
if($this->force_from && $this->from_address) {
$from = $this->from_address;
} elseif(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) {
$from = $sender->getFullName() ." <". $sender->getEmail() .">";
if(!$returnpath)
$returnpath = $sender->getEmail();