mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-09-03 11:22:40 +02:00
Code Issues Releases Wiki Activity

New event trigger names. See http://e107.org/developer-manual/classes-and-methods#events

Browse Source
This commit is contained in:
Cameron
2015-02-09 12:57:42 -08:00
parent d018cef6de
commit 8b9bfd3725
6 changed files with 44 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/admin_ui.php
View File

@@ -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;
}

14
e107_handlers/event_class.php
View File

@@ -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 "<br />".$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;

3
e107_handlers/form_handler.php
View File

@@ -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 "<label$for_id class='e-tip legacy'>{$text}</label>";
}