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

use 'Send from' settings wheneve it is set, allow to turn on debugging

Browse Source
This commit is contained in:
Uwe Steinmann 2018-11-09 17:22:55 +01:00
parent 0c53fee77d
commit 0173de81cf
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
inc/inc.ClassEmailNotify.php
View File

@ -46,13 +46,23 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
protected $from_address; protected $from_address;
function __construct($dms, $from_address='', $smtp_server='', $smtp_port='', $smtp_username='', $smtp_password='') { /* {{{ */ protected $lazy_ssl;
protected $debug;
function __construct($dms, $from_address='', $smtp_server='', $smtp_port='', $smtp_username='', $smtp_password='', $lazy_ssl=true) { /* {{{ */
$this->_dms = $dms; $this->_dms = $dms;
$this->smtp_server = $smtp_server; $this->smtp_server = $smtp_server;
$this->smtp_port = $smtp_port; $this->smtp_port = $smtp_port;
$this->smtp_user = $smtp_username; $this->smtp_user = $smtp_username;
$this->smtp_password = $smtp_password; $this->smtp_password = $smtp_password;
$this->from_address = $from_address; $this->from_address = $from_address;
$this->lazy_ssl = $lazy_ssl;
$this->debug = false;
} /* }}} */
public function setDebug($debug=true) { /* {{{ */
$this->debug = (bool) $debug;
} /* }}} */ } /* }}} */
/** /**
@ -82,15 +92,15 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
return false; return false;
} }
$returnpath = ''; $returnpath = $this->from_address;
if(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) { if(is_object($sender) && !strcasecmp(get_class($sender), $this->_dms->getClassname('user'))) {
$from = $sender->getFullName() ." <". $sender->getEmail() .">"; $from = $sender->getFullName() ." <". $sender->getEmail() .">";
if($this->from_address) if(!$returnpath)
$returnpath = $this->from_address; $returnpath = $sender->getEmail();
} elseif(is_string($sender) && trim($sender) != "") { } elseif(is_string($sender) && trim($sender) != "") {
$from = $sender; $from = $sender;
if($this->from_address) if(!$returnpath)
$returnpath = $this->from_address; $returnpath = $sender;
} else { } else {
$from = $this->from_address; $from = $this->from_address;
} }
@ -112,17 +122,19 @@ class SeedDMS_EmailNotify extends SeedDMS_Notify {
$mail_params = array(); $mail_params = array();
if($this->smtp_server) { if($this->smtp_server) {
if($this->debug)
$mail_params['debug'] = true;
$mail_params['host'] = $this->smtp_server; $mail_params['host'] = $this->smtp_server;
if($this->smtp_port) { if($this->smtp_port) {
$mail_params['port'] = $this->smtp_port; $mail_params['port'] = $this->smtp_port;
} }
if($this->smtp_user) { if($this->smtp_user) {
$mail_params['auth'] = true; $mail_params['auth'] = true;
// $mail_params['debug'] = true;
$mail_params['username'] = $this->smtp_user; $mail_params['username'] = $this->smtp_user;
$mail_params['password'] = $this->smtp_password; $mail_params['password'] = $this->smtp_password;
} }
/* See ticket #384 */ /* See ticket #384 */
if($this->lazy_ssl)
$mail_params['socket_options'] = array('ssl' => array('verify_peer' => false, 'verify_peer_name' => false)); $mail_params['socket_options'] = array('ssl' => array('verify_peer' => false, 'verify_peer_name' => false));
$mail = Mail::factory('smtp', $mail_params); $mail = Mail::factory('smtp', $mail_params);