mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

PM Email Notifications: Fixes #1487

Browse Source
This commit is contained in:
Cameron
2016-04-10 08:43:54 -07:00
parent 7d7ee21cbe
commit 2971fb184c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_handlers/mail.php
View File

@@ -949,7 +949,7 @@ class e107Email extends PHPMailer
* @param boolean $bulkmail - set TRUE if this email is one of a bulk send; FALSE if an isolated email * @param boolean $bulkmail - set TRUE if this email is one of a bulk send; FALSE if an isolated email
* @return boolean|string - TRUE if success, error message if failure * @return boolean|string - TRUE if success, error message if failure
*/ */
public function sendEmail($send_to, $to_name, $eml = '', $bulkmail = false) public function sendEmail($send_to, $to_name, $eml = array(), $bulkmail = false)
{ {
if (count($eml)) if (count($eml))
{ {
@@ -1081,7 +1081,7 @@ class e107Email extends PHPMailer
* *
* @return string none (message saved ready to send) * @return string none (message saved ready to send)
*/ */
public function MsgHTML($message, $basedir = '') public function MsgHTML($message, $basedir = '', $advanced=false)
{ {
$tp = e107::getParser(); $tp = e107::getParser();

6
e107_plugins/pm/pm_class.php
View File

@@ -263,9 +263,11 @@ class private_message
{ {
$info['pm_id'] = $pmid; $info['pm_id'] = $pmid;
e107::getEvent()->trigger('user_pm_sent', $info); e107::getEvent()->trigger('user_pm_sent', $info);
if(check_class($this->pmPrefs['notify_class'], $vars['to_info']['user_class']))
if(check_class($this->pmPrefs['notify_class'], null, $vars['to_info']['user_id']))
{ {
set_time_limit(30); set_time_limit(20);
$this->pm_send_notify($vars['to_info']['user_id'], $vars, $pmid, count($a_list)); $this->pm_send_notify($vars['to_info']['user_id'], $vars, $pmid, count($a_list));
} }
$ret .= LAN_PM_40.": {$vars['to_info']['user_name']}<br />"; $ret .= LAN_PM_40.": {$vars['to_info']['user_name']}<br />";