- | ".$description.": |
+ ".$description.": |
".$uc->uc_dropdown('event['.$id.'][class]', varset($this->notify_prefs['event'][$id]['class'],255), "nobody,main,admin,member,classes,email","onchange=\"mail_field(this.value,'event_".$id."');\" ");
@@ -333,6 +429,7 @@ class notify_config
{
global $sql, $pref, $eArrayStorage;
$this->changeList = array();
+
foreach ($_POST['event'] as $key => $value)
{
if ($this -> update_event($key))
@@ -348,7 +445,7 @@ class notify_config
{
$pref['notify'] = FALSE;
}
- save_prefs();
+ // save_prefs();
// print_a($this->notify_prefs);
/*
diff --git a/e107_admin/users.php b/e107_admin/users.php
index 231ce2f5e..17fa0d7c7 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -516,8 +516,8 @@ class users_admin_ui extends e_admin_ui
$sysuser->setData($row)->save();
e107::getLog()->add('USET_10', str_replace(array('--UID--', '--NAME--', '--EMAIL--'), array($sysuser->getId(), $sysuser->getName(), $sysuser->getValue('email')), USRLAN_166), E_LOG_INFORMATIVE);
- $e_event->trigger('userfull', $row); //BC
- e107::getEvent()->trigger('admin_user_activate', $row);
+ e107::getEvent()->trigger('userfull', $row); //BC
+ e107::getEvent()->trigger('admin_user_activated', $row);
$mes->addSuccess(USRLAN_86." (#".$sysuser->getId()." : ".$sysuser->getName().' - '.$sysuser->getValue('email').")");
@@ -1246,7 +1246,7 @@ class users_admin_ui extends e_admin_ui
$userMethods->addNonDefaulted($user_data);
validatorClass::addFieldTypes($userMethods->userVettingInfo, $allData);
- $userid = $sql->db_Insert('user', $allData);
+ $userid = $sql->insert('user', $allData);
if ($userid)
{
$sysuser = e107::getSystemUser(false, false);
@@ -1258,9 +1258,9 @@ class users_admin_ui extends e_admin_ui
e107::getLog()->add('USET_02',"UName: {$user_data['user_name']}; Email: {$user_data['user_email']}", E_LOG_INFORMATIVE);
// Add to user audit trail
- $admin_log->user_audit(USER_AUDIT_ADD_ADMIN, $user_data, 0, $user_data['user_loginname']);
- $e_event->trigger('userfull', $user_data);
- e107::getEvent()->trigger('admin_user_create', $user_data);
+ e107::getLog()->user_audit(USER_AUDIT_ADD_ADMIN, $user_data, 0, $user_data['user_loginname']);
+ e107::getEvent()->trigger('userfull', $user_data);
+ e107::getEvent()->trigger('admin_user_created', $user_data);
// send everything available for user data - bit sparse compared with user-generated signup
if(isset($_POST['sendconfemail']))
diff --git a/e107_handlers/event_class.php b/e107_handlers/event_class.php
index 866940874..8181f29c1 100644
--- a/e107_handlers/event_class.php
+++ b/e107_handlers/event_class.php
@@ -2,12 +2,10 @@
/*
* e107 website system
*
- * Copyright (C) 2008-2012 e107 Inc (e107.org)
+ * Copyright (C) 2008-2015 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
*
- * $URL$
- * $Id$
*/
@@ -17,6 +15,73 @@ class e107_event
{
var $functions = array();
var $includes = array();
+
+ protected $coreEvents = array( // used by e_notify admin area.
+
+ 'session' => array(
+
+ 'user_signup_submitted' => NU_LAN_2,
+ 'user_signup_activated' => NU_LAN_3,
+ 'login' => NU_LAN_4,
+ 'logout' => NU_LAN_5,
+ 'user_xup_login' => 'User social login',
+ 'user_xup_signup' => 'User social signup',
+ 'user_ban_flood' => NS_LAN_2,
+ 'user_ban_failed_login' => 'IP banned for multiple failed login attempts'
+
+ ),
+
+ 'administrators' => array(
+ 'admin_password_update' => "Administrator updates their password",
+ 'admin_user_created' => 'Administrator creates a new user',
+ 'admin_user_activated' => "Administrator activates a new user"
+
+ ),
+
+ 'news' => array(
+
+ 'admin_news_created' => NN_LAN_3,
+ 'admin_news_updated' => NN_LAN_4,
+ 'admin_news_deleted' => NN_LAN_5,
+ 'user_news_submit' => NN_LAN_2,
+ ),
+
+ 'mail' => array(
+
+ 'maildone' => NM_LAN_2,
+ ),
+
+ 'file' => array(
+
+ // 'fileupload' => NF_LAN_2,
+ 'user_file_upload' => NF_LAN_2,
+ ),
+
+ );
+
+ protected $oldCoreEvents = array(
+
+ 'usersup' => 'user_signup_submitted',
+ 'userveri' => 'user_signup_activated',
+ 'flood' => 'user_ban_flood',
+ 'subnews' => 'user_news_submit',
+ 'fileupload' => 'user_file_upload',
+ 'newspost' => 'admin_news_created',
+ 'newsupd' => 'admin_news_updated',
+ 'newsdel' => 'admin_news_deleted'
+ );
+
+
+ function coreList()
+ {
+ return $this->coreEvents;
+ }
+
+ function oldCoreList()
+ {
+ return $this->oldCoreEvents;
+ }
+
/**
* Register event
@@ -43,8 +108,9 @@ class e107_event
function debug()
{
-
+ echo "Event Functions";
print_a($this->functions);
+ echo "Event Includes";
print_a($this->includes);
}
@@ -111,8 +177,10 @@ class e107_event
break;
}
}
-
- e107::getLog()->add('Event Trigger failed',array('name'=>$eventname,'location'=>$location,'function'=>$evt_func),E_LOG_WARNING,'EVENT_01');
+ else
+ {
+ e107::getLog()->add('Event Trigger failed',array('name'=>$eventname,'location'=>$location,'function'=>$evt_func), E_LOG_WARNING,'EVENT_01');
+ }
}
}
diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php
index f57fb30a0..1193d027a 100644
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -171,6 +171,7 @@ class news {
$data['data']['news_id'] = $news['news_id'];
e107::getEvent()->trigger('newsupd', $data['data']);
+ e107::getEvent()->trigger('admin_news_updated', $data['data']);
$message = LAN_UPDATED;
$emessage->add(LAN_UPDATED, E_MESSAGE_SUCCESS, $smessages);
e107::getCache()->clear('news.php');
@@ -220,6 +221,7 @@ class news {
//moved down - prevent wrong mysql_insert_id
e107::getAdminLog()->logArrayAll('NEWS_08', $logData);
e107::getEvent()->trigger('newspost', $data['data']);
+ e107::getEvent()->trigger('admin_news_created', $data['data']);
//XXX - triggerHook after trigger?
$evdata = array('method'=>'create', 'table'=>'news', 'id'=>$data['data']['news_id'], 'plugin'=>'news', 'function'=>'submit_item');
diff --git a/e107_handlers/notify_class.php b/e107_handlers/notify_class.php
index 7a43dd106..0a81131da 100644
--- a/e107_handlers/notify_class.php
+++ b/e107_handlers/notify_class.php
@@ -23,7 +23,9 @@ class notify
function notify()
{
- global $e_event;
+ // global $e_event;
+
+ $e_event = e107::getEvent();
$this->notify_prefs = e107::getConfig('notify')->getPref();
@@ -31,7 +33,9 @@ class notify
{
foreach ($this->notify_prefs['event'] as $id => $status)
{
- if ($status['class'] != 255)
+ $include = null;
+
+ if ($status['class'] != e_UC_NOBODY) // 255;
{
if(varset($status['include'])) // Plugin
{
@@ -50,7 +54,14 @@ class notify
}
else // core
{
- $e_event->register($id, 'notify_'.$id);
+ if(function_exists('notify_'.$id)) // as found below.
+ {
+ $e_event->register($id, 'notify_'.$id);
+ }
+ else
+ {
+ $e_event->register($id, array('notify', 'generic')); // use generic notification.
+ }
}
@@ -59,6 +70,19 @@ class notify
}
include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_notify.php');
+ // e107::getEvent()->debug();
+ }
+
+
+
+
+ /**
+ * Generic Notification method when none defined.
+ */
+ function generic($data,$id)
+ {
+ $message = print_a($data,true);
+ $this->send($id, 'Event Triggered: '.$id, $message);
}
@@ -78,6 +102,15 @@ class notify
*/
function send($id, $subject, $message)
{
+
+ if(E107_DEBUG_LEVEL > 0)
+ {
+ $data = array('id'=>$id, 'subject'=>$subject, 'message'=>$message);
+ e107::getLog()->add('Notify Debug', $data, E_LOG_INFORMATIVE, "NOTIFY_DBG");
+ return;
+ }
+
+
$e107 = e107::getInstance();
$tp = e107::getParser();
$sql = e107::getDb();
@@ -153,7 +186,6 @@ class notify
'mail_subject' => $subject,
'mail_sender_email' => e107::getPref('siteadminemail'),
'mail_sender_name' => e107::getPref('siteadmin'),
- // 'mail_send_style' => 'textonly',
'mail_notify_complete' => 0, // NEVER notify when this email sent!!!!!
'mail_body' => $message,
'template' => 'notify'
@@ -205,6 +237,7 @@ function notify_userveri($data)
$nt->send('userveri', NT_LAN_UV_1, $msgtext);
}
+
function notify_login($data)
{
global $nt;
diff --git a/e107_handlers/user_handler.php b/e107_handlers/user_handler.php
index 795959803..fc598e2c3 100644
--- a/e107_handlers/user_handler.php
+++ b/e107_handlers/user_handler.php
@@ -1047,7 +1047,7 @@ class e_user_provider
$userdata = $user->getData();
$userdata['provider'] = $this->getProvider();
- e107::getEvent()->trigger('userveri', $userdata); // Trigger New verified user.
+ // e107::getEvent()->trigger('userveri', $userdata); // Trigger New verified user.
e107::getEvent()->trigger('user_xup_signup', $userdata);
diff --git a/signup.php b/signup.php
index fce1b11ba..89bd0d484 100644
--- a/signup.php
+++ b/signup.php
@@ -352,6 +352,7 @@ if (e_QUERY)
$admin_log->user_audit(USER_AUDIT_EMAILACK,$row);
e107::getEvent()->trigger('userveri', $row); // Legacy event
+ e107::getEvent()->trigger('user_signup_activated', $row);
e107::getEvent()->trigger('userfull', $row); // 'New' event
if (varset($pref['autologinpostsignup']))
@@ -682,7 +683,6 @@ if (isset($_POST['register']) && intval($pref['user_reg']) === 1)
}
e107::getEvent()->trigger('usersup', $_POST); // Old trigger - send everything in the template, including extended fields.
- // FIXME - undocummented feature - userpartial trigger (better trigger name?)
e107::getEvent()->trigger('userpartial', array_merge($allData['data'],$eufVals['data'])); // New trigger - send everything in the template, including extended fields.
require_once(HEADERF);
diff --git a/submitnews.php b/submitnews.php
index 1729fbcbf..bc25a5db9 100644
--- a/submitnews.php
+++ b/submitnews.php
@@ -119,6 +119,7 @@ if (isset($_POST['submitnews_submit']) && $_POST['submitnews_title'] && $_POST['
$edata_sn = array("user" => $submitnews_user, "email" => $submitnews_email, "itemtitle" => $submitnews_title, "catid" => intval($_POST['cat_id']), "item" => $submitnews_item, "image" => $submitnews_file, "ip" => $ip);
$e_event->trigger("subnews", $edata_sn);
+ e107::getEvent()->trigger("user_news_submit", $edata_sn);
$mes = e107::getMessage();
$mes->addSuccess(LAN_134);
|