1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-11 09:04:38 +02:00

Fixes #905 and other PHP notices.

This commit is contained in:
Cameron
2015-04-17 11:46:47 -07:00
parent bc382d7317
commit 4a4e2447a1
4 changed files with 134 additions and 116 deletions

View File

@@ -11,66 +11,81 @@
if (!defined('e107_INIT')) { exit; }
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',
'user_profile_display' => "User views profile"
),
'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 $coreEvents;
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 __construct()
{
// e107::lan('core','notify'); //FIXME e_LANGUAGE is not defined at this point.
$this->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',
'user_profile_display' => "User views profile"
),
'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,
),
);
}
'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()
@@ -119,8 +134,7 @@ class e107_event
/**
* Trigger event
* TODO - admin log for failed callback attempts?
*
*
* @param string $eventname
* @param mixed $data
* @return mixed