diff --git a/e107_admin/users.php b/e107_admin/users.php
index 7451e5d46..be59916a7 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -171,6 +171,7 @@ class users_admin_ui extends e_admin_ui
protected $pluginTitle = LAN_USER;
protected $pluginName = 'core';
+ protected $eventName = 'user';
protected $table = "user";
// protected $listQry = "SELECT SQL_CALC_FOUND_ROWS * FROM #users"; // without any Order or Limit.
@@ -379,14 +380,15 @@ class users_admin_ui extends e_admin_ui
{
$update['WHERE'] = 'user_extended_id='. intval($new_data['submit_value']);
- if(e107::getDb()->update('user_extended',$update))
- {
- e107::getMessage()->addSuccess('Extended Fields Updated'); //TODO Replace with Generic or existing LAN.
- }
- else
+ if(e107::getDb()->update('user_extended',$update)===false)
{
e107::getMessage()->addError('Extended Fields Update Failed'); //TODO Replace with Generic or existing LAN.
e107::getMessage()->addDebug(print_a($update,true));
+
+ }
+ else
+ {
+ // e107::getMessage()->addSuccess('Extended Fields Updated'); //TODO Replace with Generic or existing LAN.
}
}
}
@@ -514,7 +516,9 @@ 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);
+ $e_event->trigger('userfull', $row); //BC
+ e107::getEvent()->trigger('admin-user-verify', $row);
+
$mes->addSuccess(USRLAN_86." (#".$sysuser->getId()." : ".$sysuser->getName().' - '.$sysuser->getValue('email').")");
$this->getTreeModel()->load(true);
@@ -573,9 +577,12 @@ class users_admin_ui extends e_admin_ui
// TODO - lan
$lan = 'Administrator --ADMIN_EMAIL-- (#--ADMIN_UID--, --ADMIN_NAME--) has logged in as the user --EMAIL-- (#--UID--, --NAME--)';
- e107::getAdminLog()->log_event('USET_100', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
+ e107::getLog()->log_event('USET_100', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
+
+ $eventData = array('user_id' => $sysuser->getId(), 'admin_id' => $user->getId());
+ e107::getEvent()->trigger('loginas', $eventData); // BC
+ e107::getEvent()->trigger('admin-user-loginas', $eventData);
- e107::getEvent()->trigger('loginas', array('user_id' => $sysuser->getId(), 'admin_id' => $user->getId()));
}
}
@@ -600,7 +607,9 @@ class users_admin_ui extends e_admin_ui
e107::getAdminLog()->log_event('USET_101', str_replace($search, $replace, $lan), E_LOG_INFORMATIVE);
- e107::getEvent()->trigger('logoutas', array('user_id' => $sysuser->getId(), 'admin_id' => $user->getId()));
+ $eventData = array('user_id' => $sysuser->getId(), 'admin_id' => $user->getId());
+ e107::getEvent()->trigger('logoutas', $eventData); //BC
+ e107::getEvent()->trigger('admin-user-logoutas', $eventData);
$this->redirect('list', 'main', true);
}
@@ -1251,6 +1260,7 @@ class users_admin_ui extends e_admin_ui
// 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);
// send everything available for user data - bit sparse compared with user-generated signup
if(isset($_POST['sendconfemail']))
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index b77266bba..409aefd84 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -2330,7 +2330,7 @@ class e_admin_controller_ui extends e_admin_controller
* @var string event name
* base event trigger name to be used. Leave blank for no trigger.
*/
- protected $eventName;
+ protected $eventName = null;
/**
* @var string
@@ -3957,8 +3957,9 @@ class e_admin_controller_ui extends e_admin_controller
// Trigger Admin-ui event.
if($triggerName = $this->getEventTriggerName($_posted['etrigger_submit']))
{
- e107::getMessage()->addDebug('Admin-ui Trigger: '.$triggerName);
- e107::getEvent()->trigger($triggerName, array('newData'=>$new_data,'oldData'=>$old_data,'id'=> $id));
+ $eventData = array('newData'=>$new_data,'oldData'=>$old_data,'id'=> $id);
+ e107::getMessage()->addDebug('Admin-ui Trigger: '.$triggerName.' with data'.print_a($eventData,true),'default',true);
+ e107::getEvent()->trigger($triggerName, $eventData);
}
if($callbackAfter && method_exists($this, $callbackAfter))
@@ -3989,7 +3990,9 @@ class e_admin_controller_ui extends e_admin_controller
*/
public function getEventTriggerName($type=null)
{
- if(!$plug = $this->getEventName() || empty($type))
+ $plug = $this->getEventName();
+
+ if(empty($plug) || empty($type))
{
return false;
}
@@ -4640,11 +4643,11 @@ class e_admin_ui extends e_admin_controller_ui
if($triggerName = $this->getEventTriggerName('delete'))
{
- e107::getMessage()->addDebug('Admin-ui Trigger: '.$triggerName);
- e107::getEvent()->trigger($triggerName, array('newData'=>$data,'oldData'=>$data,'id'=> $id));
+ $eventData = array('newData'=>$data,'oldData'=>$data,'id'=> $id);
+ e107::getMessage()->addDebug('Admin-ui Trigger: '.$triggerName.' with data '.print_a($eventData,true),'default',true); //FIXME - Why doesn't this display?
+ e107::getEvent()->trigger($triggerName, $eventData);
}
-
-
+
if($this->afterDelete($data, $id, $check))
{
$this->getTreeModel()->setMessages();
@@ -4659,6 +4662,7 @@ class e_admin_ui extends e_admin_controller_ui
{
//echo "Couldn't get Node for ID: ".$id;
// exit;
+ e107::getMessage()->addDebug('Model Failure Fallback in use!! ID: '.$id.' file: '.__FILE__. " line: ".__LINE__ ,'default',true);
$check = $this->getTreeModel()->delete($id);
return;
}
diff --git a/e107_handlers/event_class.php b/e107_handlers/event_class.php
index 80a942425..866940874 100644
--- a/e107_handlers/event_class.php
+++ b/e107_handlers/event_class.php
@@ -99,10 +99,7 @@ class e107_event
}
catch(Exception $e)
{
- //TODO log errors $eventname, $location, $class, $method
- // echo "event didn't work. Class=".$class." Method=".$method;
- // echo "
".$e;
- //exit;
+ e107::getLog()->add('Event Trigger failed',array('name'=>$eventname,'location'=>$location,'class'=>$class,'method'=>$method,'error'=>$e),E_LOG_WARNING,'EVENT_01');
continue;
}
}
@@ -114,7 +111,9 @@ class e107_event
break;
}
}
- //TODO log errors $eventname, $location, $evt_func
+
+ e107::getLog()->add('Event Trigger failed',array('name'=>$eventname,'location'=>$location,'function'=>$evt_func),E_LOG_WARNING,'EVENT_01');
+
}
}
return (isset($ret) ? $ret : false);
@@ -123,8 +122,9 @@ class e107_event
-
-
+ /**
+ * @Deprecated
+ */
function triggerAdminEvent($type, $parms=array())
{
global $pref;
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 3e0a003ca..8182da3e0 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1561,7 +1561,8 @@ class e_form
*/
function label($text, $name = '', $value = '')
{
- e107::getMessage()->addDebug("Deprecated \$frm->label() used");
+ // $backtrack = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,2);
+ // e107::getMessage()->addDebug("Deprecated \$frm->label() used in: ".print_a($backtrack,true));
$for_id = $this->_format_id('', $name, $value, 'for');
return "{$text}";
}
diff --git a/e107_plugins/social/e_event.php b/e107_plugins/social/e_event.php
index edff54ef5..a5c617ee9 100644
--- a/e107_plugins/social/e_event.php
+++ b/e107_plugins/social/e_event.php
@@ -5,13 +5,13 @@
* Copyright (C) 2008-2013 e107 Inc (e107.org)
* Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
- *
+ * XXX HIGHLY EXPERIMENTAL AND SUBJECT TO CHANGE WITHOUT NOTICE.
*/
if (!defined('e107_INIT')) { exit; }
-class e_event_social
+class e_event_social //FIXME should be social_event
{
/*
* all event methods have a single parameter
diff --git a/upload.php b/upload.php
index 4228eb5d0..28acfcb99 100644
--- a/upload.php
+++ b/upload.php
@@ -201,7 +201,8 @@ class userUpload
$edata_fu = array("upload_user" => $poster, "upload_email" => $postemail, "upload_name" => $tp -> toDB($_POST['file_name']),"upload_file" => $file, "upload_version" => $_POST['file_version'], "upload_description" => $tp -> toDB($_POST['file_description']), "upload_size" => $filesize, "upload_category" => $downloadCategory, "upload_website" => $tp -> toDB($_POST['file_website']), "upload_image" => $image, "upload_demo" => $tp -> toDB($_POST['file_demo']), "upload_time" => $file_time);
- e107::getEvent()->trigger("fileupload", $edata_fu);
+ e107::getEvent()->trigger("fileupload", $edata_fu); // BC
+ e107::getEvent()->trigger("user-file-upload", $edata_fu);
$mes->addSuccess(LAN_404);
}