mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-26 15:54:43 +02:00
Code Issues Releases Wiki Activity

Issue #4079 - Code Cleanup.

Browse Source
This commit is contained in:
Cameron
2020-03-06 13:57:33 -08:00
parent d6d178824c
commit 8129d919c4
3 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
e107_handlers/notify_class.php
View File

@@ -88,12 +88,16 @@ class notify
}
}
return null;
// e107::getEvent()->debug();
}
/**
* Generic Notification method when none defined.
* Generic Notification method when none defined.
*
* @param $data
* @param $id
*/
function generic($data,$id)
{
@@ -102,20 +106,19 @@ class notify
}
/**
* Send an email notification following an event.
*
* The email is sent via a common interface, which will send immediately for small numbers of recipients, and queue for larger.
*
* @param string $id - identifies event actions
*
* @param string $id - identifies event actions
* @param string $subject - subject for email
* @param string $message - email message body
* @param array $media
* @return void
*
* @todo handle 'everyone except' clauses (email address filter done)
* @todo set up pref to not notify originator of event which caused notify (see $blockOriginator)
* @todo handle 'everyone except' clauses (email address filter done)
* @todo set up pref to not notify originator of event which caused notify (see $blockOriginator)
*/
function send($id, $subject, $message, $media=array())
{
@@ -128,6 +131,7 @@ class notify
// $message = $tp->toEmail($message);
$emailFilter = '';
$notifyTarget = $this->notify_prefs['event'][$id]['class'];
$qry = '';
if ($notifyTarget == '-email')
{
@@ -216,7 +220,9 @@ class notify
}
if((ADMIN || $pref['developer']) && E107_DEBUG_LEVEL > 0 || deftrue('e_DEBUG_NOTIFY'))
$devMode = e107::getPref('developer', false);
if((ADMIN || $devMode) && E107_DEBUG_LEVEL > 0 || deftrue('e_DEBUG_NOTIFY'))
{
$data = array('id'=>$id, 'subject'=>$subject, 'recipients'=> $recipients, 'prefs'=>$this->notify_prefs['event'][$id], 'message'=>$message);
@@ -257,14 +263,14 @@ class notify
}
}
$result = $mailer->sendEmails('notify', $mailData, $recipients);
$mailer->sendEmails('notify', $mailData, $recipients);
e107::getLog()->e_log_event(10,-1,'NOTIFY',$subject,$message,FALSE,LOG_TO_ROLLING);
e107::getLog()->addEvent(10,-1,'NOTIFY',$subject,$message,FALSE,LOG_TO_ROLLING);
}
else
{
$data = array('qry'=>$qry, 'error'=>'No recipients');
e107::getLog()->add('Notify Debug', $data, E_LOG_WARNING_, "NOTIFY_DBG");
e107::getLog()->add('Notify Debug', $data, E_LOG_WARNING, "NOTIFY_DBG");
}
}
@@ -275,8 +281,10 @@ class notify
// ---------------------------------------
function notify_usersup($data)
/**
* @param $data
*/
public function notify_usersup($data)
{
$message = "";
foreach ($data as $key => $value)
@@ -321,7 +329,9 @@ class notify
$message .= $key.': '.$value.'<br />';
}
$this->send('login', NT_LAN_LI_1, $message);
$user = !empty($data['user_name']) ? " (".$data['user_name'].")" : "";
$this->send('login', NT_LAN_LI_1 . $user, $message);
}
function notify_logout()