aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/inc
diff options
context:
space:
mode:
Diffstat (limited to 'inc')
-rw-r--r--inc/Action/Export.php3
-rw-r--r--inc/Action/Redirect.php3
-rw-r--r--inc/Action/Subscribe.php3
-rw-r--r--inc/Cache/Cache.php7
-rw-r--r--inc/Extension/Event.php19
-rw-r--r--inc/Manifest.php4
-rw-r--r--inc/Menu/AbstractMenu.php3
-rw-r--r--inc/Remote/Api.php3
-rw-r--r--inc/Remote/ApiCore.php3
-rw-r--r--inc/TaskRunner.php2
-rw-r--r--inc/Ui/Search.php7
-rw-r--r--inc/actions.php4
-rw-r--r--inc/auth.php4
-rw-r--r--inc/cache.php2
-rw-r--r--inc/common.php6
-rw-r--r--inc/deprecated.php22
-rw-r--r--inc/events.php21
-rw-r--r--inc/fulltext.php4
-rw-r--r--inc/html.php9
-rw-r--r--inc/indexer.php2
-rw-r--r--inc/init.php3
-rw-r--r--inc/io.php9
-rw-r--r--inc/mail.php4
-rw-r--r--inc/media.php4
-rw-r--r--inc/pageutils.php2
-rw-r--r--inc/parser/handler.php3
-rw-r--r--inc/parserutils.php4
-rw-r--r--inc/template.php12
28 files changed, 103 insertions, 69 deletions
diff --git a/inc/Action/Export.php b/inc/Action/Export.php
index 1eec27ec3..6b46b276e 100644
--- a/inc/Action/Export.php
+++ b/inc/Action/Export.php
@@ -3,6 +3,7 @@
namespace dokuwiki\Action;
use dokuwiki\Action\Exception\ActionAbort;
+use dokuwiki\Extension\Event;
/**
* Class Export
@@ -96,7 +97,7 @@ class Export extends AbstractAction {
$data['headers'] = $headers;
$data['output'] =& $output;
- trigger_event('ACTION_EXPORT_POSTPROCESS', $data);
+ Event::createAndTrigger('ACTION_EXPORT_POSTPROCESS', $data);
if(!empty($data['output'])) {
if(is_array($data['headers'])) foreach($data['headers'] as $key => $val) {
diff --git a/inc/Action/Redirect.php b/inc/Action/Redirect.php
index ed67d66d7..dca911a22 100644
--- a/inc/Action/Redirect.php
+++ b/inc/Action/Redirect.php
@@ -3,6 +3,7 @@
namespace dokuwiki\Action;
use dokuwiki\Action\Exception\ActionAbort;
+use dokuwiki\Extension\Event;
/**
* Class Redirect
@@ -41,7 +42,7 @@ class Redirect extends AbstractAliasAction {
}
// execute the redirect
- trigger_event('ACTION_SHOW_REDIRECT', $opts, array($this, 'redirect'));
+ Event::createAndTrigger('ACTION_SHOW_REDIRECT', $opts, array($this, 'redirect'));
// should never be reached
throw new ActionAbort('show');
diff --git a/inc/Action/Subscribe.php b/inc/Action/Subscribe.php
index c16571022..0e7054336 100644
--- a/inc/Action/Subscribe.php
+++ b/inc/Action/Subscribe.php
@@ -4,6 +4,7 @@ namespace dokuwiki\Action;
use dokuwiki\Action\Exception\ActionAbort;
use dokuwiki\Action\Exception\ActionDisabledException;
+use dokuwiki\Extension\Event;
/**
* Class Subscribe
@@ -67,7 +68,7 @@ class Subscribe extends AbstractUserAction {
if(empty($params['action']) || !checkSecurityToken()) return;
// Handle POST data, may throw exception.
- trigger_event('ACTION_HANDLE_SUBSCRIBE', $params, array($this, 'handlePostData'));
+ Event::createAndTrigger('ACTION_HANDLE_SUBSCRIBE', $params, array($this, 'handlePostData'));
$target = $params['target'];
$style = $params['style'];
diff --git a/inc/Cache/Cache.php b/inc/Cache/Cache.php
index 55d32b02a..e30913b3b 100644
--- a/inc/Cache/Cache.php
+++ b/inc/Cache/Cache.php
@@ -3,6 +3,7 @@
namespace dokuwiki\Cache;
use \dokuwiki\Debug\PropertyDeprecationHelper;
+use dokuwiki\Extension\Event;
/**
* Generic handling of caching
@@ -54,9 +55,9 @@ class Cache
return $this->_event;
}
- public function setEvent($_event)
+ public function setEvent($event)
{
- $this->_event = $_event;
+ $this->_event = $event;
}
/**
@@ -78,7 +79,7 @@ class Cache
$this->addDependencies();
if ($this->_event) {
- return $this->stats(trigger_event($this->_event, $this, array($this, 'makeDefaultCacheDecision')));
+ return $this->stats(Event::createAndTrigger($this->_event, $this, array($this, 'makeDefaultCacheDecision')));
} else {
return $this->stats($this->makeDefaultCacheDecision());
}
diff --git a/inc/Extension/Event.php b/inc/Extension/Event.php
index 66a0976b5..773417a24 100644
--- a/inc/Extension/Event.php
+++ b/inc/Extension/Event.php
@@ -161,4 +161,23 @@ class Event
{
return $this->_default;
}
+
+ /**
+ * Convenience method to trigger an event
+ *
+ * Creates, triggers and destroys an event in one go
+ *
+ * @param string $name name for the event
+ * @param mixed $data event data
+ * @param callable $action (optional, default=NULL) default action, a php callback function
+ * @param bool $canPreventDefault (optional, default=true) can hooks prevent the default action
+ *
+ * @return mixed the event results value after all event processing is complete
+ * by default this is the return value of the default action however
+ * it can be set or modified by event handler hooks
+ */
+ static public function createAndTrigger($name, &$data, $action=null, $canPreventDefault=true) {
+ $evt = new Event($name, $data);
+ return $evt->trigger($action, $canPreventDefault);
+ }
}
diff --git a/inc/Manifest.php b/inc/Manifest.php
index 31a2c8c26..29e7f263f 100644
--- a/inc/Manifest.php
+++ b/inc/Manifest.php
@@ -2,6 +2,8 @@
namespace dokuwiki;
+use dokuwiki\Extension\Event;
+
class Manifest
{
public function sendManifest()
@@ -74,7 +76,7 @@ class Manifest
}
}
- trigger_event('MANIFEST_SEND', $manifest);
+ Event::createAndTrigger('MANIFEST_SEND', $manifest);
header('Content-Type: application/manifest+json');
echo json_encode($manifest);
diff --git a/inc/Menu/AbstractMenu.php b/inc/Menu/AbstractMenu.php
index ce021ab64..37e5d2cc3 100644
--- a/inc/Menu/AbstractMenu.php
+++ b/inc/Menu/AbstractMenu.php
@@ -2,6 +2,7 @@
namespace dokuwiki\Menu;
+use dokuwiki\Extension\Event;
use dokuwiki\Menu\Item\AbstractItem;
/**
@@ -42,7 +43,7 @@ abstract class AbstractMenu implements MenuInterface {
'view' => $this->view,
'items' => array(),
);
- trigger_event('MENU_ITEMS_ASSEMBLY', $data, array($this, 'loadItems'));
+ Event::createAndTrigger('MENU_ITEMS_ASSEMBLY', $data, array($this, 'loadItems'));
return $data['items'];
}
diff --git a/inc/Remote/Api.php b/inc/Remote/Api.php
index 6127c07d7..9d473071e 100644
--- a/inc/Remote/Api.php
+++ b/inc/Remote/Api.php
@@ -2,6 +2,7 @@
namespace dokuwiki\Remote;
+use dokuwiki\Extension\Event;
use dokuwiki\Extension\RemotePlugin;
/**
@@ -141,7 +142,7 @@ class Api
{
if ($this->pluginCustomCalls === null) {
$data = array();
- trigger_event('RPC_CALL_ADD', $data);
+ Event::createAndTrigger('RPC_CALL_ADD', $data);
$this->pluginCustomCalls = $data;
}
return $this->pluginCustomCalls;
diff --git a/inc/Remote/ApiCore.php b/inc/Remote/ApiCore.php
index 238691ea8..f52e21be3 100644
--- a/inc/Remote/ApiCore.php
+++ b/inc/Remote/ApiCore.php
@@ -6,6 +6,7 @@ use Doku_Renderer_xhtml;
use dokuwiki\ChangeLog\MediaChangeLog;
use dokuwiki\ChangeLog\PageChangeLog;
use dokuwiki\Extension\AuthPlugin;
+use dokuwiki\Extension\Event;
define('DOKU_API_VERSION', 10);
@@ -981,7 +982,7 @@ class ApiCore
'sticky' => false,
'silent' => true,
);
- $ok = trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper');
+ $ok = Event::createAndTrigger('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper');
}
session_write_close(); // we're done with the session
diff --git a/inc/TaskRunner.php b/inc/TaskRunner.php
index 997e825b7..e96c4b1b6 100644
--- a/inc/TaskRunner.php
+++ b/inc/TaskRunner.php
@@ -156,7 +156,7 @@ class TaskRunner
'trimmedChangelogLines' => $out_lines,
'removedChangelogLines' => $extra > 0 ? array_slice($old_lines, 0, -$extra) : $old_lines,
];
- trigger_event('TASK_RECENTCHANGES_TRIM', $eventData);
+ Event::createAndTrigger('TASK_RECENTCHANGES_TRIM', $eventData);
$out_lines = $eventData['trimmedChangelogLines'];
// save trimmed changelog
diff --git a/inc/Ui/Search.php b/inc/Ui/Search.php
index 16a7d6be6..7fd3c520c 100644
--- a/inc/Ui/Search.php
+++ b/inc/Ui/Search.php
@@ -2,6 +2,7 @@
namespace dokuwiki\Ui;
+use dokuwiki\Extension\Event;
use dokuwiki\Form\Form;
class Search extends Ui
@@ -86,7 +87,7 @@ class Search extends Ui
$searchForm->addFieldsetClose();
- trigger_event('FORM_SEARCH_OUTPUT', $searchForm);
+ Event::createAndTrigger('FORM_SEARCH_OUTPUT', $searchForm);
return $searchForm->toHTML();
}
@@ -538,7 +539,7 @@ class Search extends Ui
'listItemContent' => [$link],
'page' => $id,
];
- trigger_event('SEARCH_RESULT_PAGELOOKUP', $eventData);
+ Event::createAndTrigger('SEARCH_RESULT_PAGELOOKUP', $eventData);
$html .= '<li>' . implode('', $eventData['listItemContent']) . '</li>';
}
$html .= '</ul> ';
@@ -606,7 +607,7 @@ class Search extends Ui
'page' => $id,
'position' => $position,
];
- trigger_event('SEARCH_RESULT_FULLPAGE', $eventData);
+ Event::createAndTrigger('SEARCH_RESULT_FULLPAGE', $eventData);
$html .= '<div class="search_fullpage_result">';
$html .= '<dt>' . implode(' ', $eventData['resultHeader']) . '</dt>';
foreach ($eventData['resultBody'] as $class => $htmlContent) {
diff --git a/inc/actions.php b/inc/actions.php
index 88596bbe8..4ea529dcd 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -6,6 +6,8 @@
* @author Andreas Gohr <andi@splitbrain.org>
*/
+use dokuwiki\Extension\Event;
+
/**
* All action processing starts here
*/
@@ -14,7 +16,7 @@ function act_dispatch(){
$router = \dokuwiki\ActionRouter::getInstance(true);
$headers = array('Content-Type: text/html; charset=utf-8');
- trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders');
+ Event::createAndTrigger('ACTION_HEADERS_SEND',$headers,'act_sendheaders');
// clear internal variables
unset($router);
diff --git a/inc/auth.php b/inc/auth.php
index 0cd03469d..9cb04fc44 100644
--- a/inc/auth.php
+++ b/inc/auth.php
@@ -108,7 +108,7 @@ function auth_setup() {
'sticky' => $INPUT->bool('r'),
'silent' => $INPUT->bool('http_credentials')
);
- trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper');
+ Event::createAndTrigger('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper');
}
//load ACL into a global array XXX
@@ -583,7 +583,7 @@ function auth_aclcheck($id, $user, $groups) {
'groups' => $groups
);
- return trigger_event('AUTH_ACL_CHECK', $data, 'auth_aclcheck_cb');
+ return Event::createAndTrigger('AUTH_ACL_CHECK', $data, 'auth_aclcheck_cb');
}
/**
diff --git a/inc/cache.php b/inc/cache.php
index 6c015ef05..b5793c263 100644
--- a/inc/cache.php
+++ b/inc/cache.php
@@ -10,13 +10,11 @@ use dokuwiki\Debug\DebugHelper;
*/
class cache extends \dokuwiki\Cache\Cache
{
-
public function __construct($key, $ext)
{
DebugHelper::dbgDeprecatedFunction(dokuwiki\Cache\Cache::class);
parent::__construct($key, $ext);
}
-
}
/**
diff --git a/inc/common.php b/inc/common.php
index a2ef313f9..94993629c 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -757,7 +757,7 @@ function checkwordblock($text = '') {
$callback = function () {
return true;
};
- return trigger_event('COMMON_WORDBLOCK_BLOCKED', $data, $callback, true);
+ return Event::createAndTrigger('COMMON_WORDBLOCK_BLOCKED', $data, $callback, true);
}
}
return false;
@@ -1380,7 +1380,7 @@ function saveWikiText($id, $text, $summary, $minor = false) {
if($svdta['changeType'] == DOKU_CHANGE_TYPE_DELETE) {
// Send "update" event with empty data, so plugins can react to page deletion
$data = array(array($svdta['file'], '', false), getNS($id), noNS($id), false);
- trigger_event('IO_WIKIPAGE_WRITE', $data);
+ Event::createAndTrigger('IO_WIKIPAGE_WRITE', $data);
// pre-save deleted revision
@touch($svdta['file']);
clearstatcache();
@@ -1478,7 +1478,7 @@ function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace =
if(!actionOK('subscribe')) return false; //subscribers enabled?
if($conf['useacl'] && $INPUT->server->str('REMOTE_USER') && $minor) return false; //skip minors
$data = array('id' => $id, 'addresslist' => '', 'self' => false, 'replacements' => $replace);
- trigger_event(
+ Event::createAndTrigger(
'COMMON_NOTIFY_ADDRESSLIST', $data,
array(new Subscription(), 'notifyaddresses')
);
diff --git a/inc/deprecated.php b/inc/deprecated.php
index 549e5f11a..eab81ef39 100644
--- a/inc/deprecated.php
+++ b/inc/deprecated.php
@@ -4,6 +4,8 @@
* These classes and functions are deprecated and will be removed in future releases
*/
+use dokuwiki\Debug\DebugHelper;
+
/**
* @inheritdoc
* @deprecated 2018-05-07
@@ -302,7 +304,8 @@ class HTTPClient extends \dokuwiki\HTTP\HTTPClient {
/**
* @deprecated since 2019-03-17 use \dokuwiki\HTTP\DokuHTTPClient instead!
*/
-class DokuHTTPClient extends \dokuwiki\HTTP\DokuHTTPClient {
+class DokuHTTPClient extends \dokuwiki\HTTP\DokuHTTPClient
+{
/**
* @inheritdoc
@@ -313,5 +316,22 @@ class DokuHTTPClient extends \dokuwiki\HTTP\DokuHTTPClient {
DebugHelper::dbgDeprecatedFunction(dokuwiki\HTTP\DokuHTTPClient::class);
parent::__construct();
}
+}
+/**
+ * function wrapper to process (create, trigger and destroy) an event
+ *
+ * @param string $name name for the event
+ * @param mixed $data event data
+ * @param callback $action (optional, default=NULL) default action, a php callback function
+ * @param bool $canPreventDefault (optional, default=true) can hooks prevent the default action
+ *
+ * @return mixed the event results value after all event processing is complete
+ * by default this is the return value of the default action however
+ * it can be set or modified by event handler hooks
+ * @deprecated 2018-06-15
+ */
+function trigger_event($name, &$data, $action=null, $canPreventDefault=true) {
+ dbg_deprecated('\dokuwiki\Extension\Event::createAndTrigger');
+ return \dokuwiki\Extension\Event::createAndTrigger($name, $data, $action, $canPreventDefault);
}
diff --git a/inc/events.php b/inc/events.php
deleted file mode 100644
index 56d0dfad3..000000000
--- a/inc/events.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/**
- * trigger_event
- *
- * function wrapper to process (create, trigger and destroy) an event
- *
- * @param string $name name for the event
- * @param mixed $data event data
- * @param callback $action (optional, default=NULL) default action, a php callback function
- * @param bool $canPreventDefault (optional, default=true) can hooks prevent the default action
- *
- * @return mixed the event results value after all event processing is complete
- * by default this is the return value of the default action however
- * it can be set or modified by event handler hooks
- */
-function trigger_event($name, &$data, $action=null, $canPreventDefault=true) {
-
- $evt = new \dokuwiki\Extension\Event($name, $data);
- return $evt->trigger($action, $canPreventDefault);
-}
diff --git a/inc/fulltext.php b/inc/fulltext.php
index 194b46fae..51406fd34 100644
--- a/inc/fulltext.php
+++ b/inc/fulltext.php
@@ -39,7 +39,7 @@ function ft_pageSearch($query,&$highlight, $sort = null, $after = null, $before
];
$data['highlight'] =& $highlight;
- return trigger_event('SEARCH_QUERY_FULLPAGE', $data, '_ft_pageSearch');
+ return Event::createAndTrigger('SEARCH_QUERY_FULLPAGE', $data, '_ft_pageSearch');
}
/**
@@ -244,7 +244,7 @@ function ft_pageLookup($id, $in_ns=false, $in_title=false, $after = null, $befor
'before' => $before
];
$data['has_titles'] = true; // for plugin backward compatibility check
- return trigger_event('SEARCH_QUERY_PAGELOOKUP', $data, '_ft_pageLookup');
+ return Event::createAndTrigger('SEARCH_QUERY_PAGELOOKUP', $data, '_ft_pageLookup');
}
/**
diff --git a/inc/html.php b/inc/html.php
index ef4ea164a..c7431ca34 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -9,6 +9,7 @@
use dokuwiki\ChangeLog\MediaChangeLog;
use dokuwiki\ChangeLog\PageChangeLog;
use dokuwiki\Extension\AuthPlugin;
+use dokuwiki\Extension\Event;
if (!defined('SEC_EDIT_PATTERN')) {
define('SEC_EDIT_PATTERN', '#<!-- EDIT({.*?}) -->#');
@@ -134,7 +135,7 @@ function html_secedit_button($matches){
$data ['target'] = strtolower($data['target']);
$data ['hid'] = strtolower($data['hid']);
- return trigger_event('HTML_SECEDIT_BUTTON', $data,
+ return Event::createAndTrigger('HTML_SECEDIT_BUTTON', $data,
'html_secedit_get_button');
}
@@ -299,7 +300,7 @@ function html_show($txt=null){
}else{
if ($REV||$DATE_AT){
$data = array('rev' => &$REV, 'date_at' => &$DATE_AT);
- trigger_event('HTML_SHOWREV_OUTPUT', $data, 'html_showrev');
+ Event::createAndTrigger('HTML_SHOWREV_OUTPUT', $data, 'html_showrev');
}
$html = p_wiki_xhtml($ID,$REV,true,$DATE_AT);
$html = html_secedit($html,$secedit);
@@ -1873,7 +1874,7 @@ function html_edit(){
if ($data['target'] !== 'section') {
// Only emit event if page is writable, section edit data is valid and
// edit target is not section.
- trigger_event('HTML_EDIT_FORMSELECTION', $data, 'html_edit_form', true);
+ Event::createAndTrigger('HTML_EDIT_FORMSELECTION', $data, 'html_edit_form', true);
} else {
html_edit_form($data);
}
@@ -2222,7 +2223,7 @@ function html_mktocitem($link, $text, $level, $hash='#'){
function html_form($name, &$form) {
// Safety check in case the caller forgets.
$form->endFieldset();
- trigger_event('HTML_'.strtoupper($name).'FORM_OUTPUT', $form, 'html_form_output', false);
+ Event::createAndTrigger('HTML_'.strtoupper($name).'FORM_OUTPUT', $form, 'html_form_output', false);
}
/**
diff --git a/inc/indexer.php b/inc/indexer.php
index 7149ea944..f99b89949 100644
--- a/inc/indexer.php
+++ b/inc/indexer.php
@@ -69,7 +69,7 @@ function idx_get_version(){
// DokuWiki version is included for the convenience of plugins
$data = array('dokuwiki'=>$version);
- trigger_event('INDEXER_VERSION_GET', $data, null, false);
+ Event::createAndTrigger('INDEXER_VERSION_GET', $data, null, false);
unset($data['dokuwiki']); // this needs to be first
ksort($data);
foreach ($data as $plugin=>$vers)
diff --git a/inc/init.php b/inc/init.php
index 16f350dc3..b2376791b 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -3,6 +3,7 @@
* Initialize some defaults needed for DokuWiki
*/
+use dokuwiki\Extension\Event;
use dokuwiki\Extension\EventHandler;
/**
@@ -221,7 +222,7 @@ global $EVENT_HANDLER;
$EVENT_HANDLER = new EventHandler();
$local = $conf['lang'];
-trigger_event('INIT_LANG_LOAD', $local, 'init_lang', true);
+Event::createAndTrigger('INIT_LANG_LOAD', $local, 'init_lang', true);
// setup authentication system
diff --git a/inc/io.php b/inc/io.php
index 596908a9c..918efcd0c 100644
--- a/inc/io.php
+++ b/inc/io.php
@@ -7,6 +7,7 @@
*/
use dokuwiki\HTTP\DokuHTTPClient;
+use dokuwiki\Extension\Event;
/**
* Removes empty directories
@@ -39,7 +40,7 @@ function io_sweepNS($id,$basedir='datadir'){
if ($ns_type!==false) {
$data = array($id, $ns_type);
$delone = true; // we deleted at least one dir
- trigger_event('IO_NAMESPACE_DELETED', $data);
+ Event::createAndTrigger('IO_NAMESPACE_DELETED', $data);
}
} else { return $delone; }
}
@@ -69,7 +70,7 @@ function io_sweepNS($id,$basedir='datadir'){
function io_readWikiPage($file, $id, $rev=false) {
if (empty($rev)) { $rev = false; }
$data = array(array($file, true), getNS($id), noNS($id), $rev);
- return trigger_event('IO_WIKIPAGE_READ', $data, '_io_readWikiPage_action', false);
+ return Event::createAndTrigger('IO_WIKIPAGE_READ', $data, '_io_readWikiPage_action', false);
}
/**
@@ -189,7 +190,7 @@ function io_writeWikiPage($file, $content, $id, $rev=false) {
if (empty($rev)) { $rev = false; }
if ($rev===false) { io_createNamespace($id); } // create namespaces as needed
$data = array(array($file, $content, false), getNS($id), noNS($id), $rev);
- return trigger_event('IO_WIKIPAGE_WRITE', $data, '_io_writeWikiPage_action', false);
+ return Event::createAndTrigger('IO_WIKIPAGE_WRITE', $data, '_io_writeWikiPage_action', false);
}
/**
@@ -469,7 +470,7 @@ function io_createNamespace($id, $ns_type='pages') {
$missing = array_reverse($missing); // inside out
foreach ($missing as $ns) {
$data = array($ns, $ns_type);
- trigger_event('IO_NAMESPACE_CREATED', $data);
+ Event::createAndTrigger('IO_NAMESPACE_CREATED', $data);
}
}
diff --git a/inc/mail.php b/inc/mail.php
index 230fe4f1f..3684a338b 100644
--- a/inc/mail.php
+++ b/inc/mail.php
@@ -8,6 +8,8 @@
// end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
// think different
+use dokuwiki\Extension\Event;
+
if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
#define('MAILHEADER_ASCIIONLY',1);
@@ -103,7 +105,7 @@ function mail_setup(){
function mail_send($to, $subject, $body, $from='', $cc='', $bcc='', $headers=null, $params=null){
dbg_deprecated('class Mailer::');
$message = compact('to','subject','body','from','cc','bcc','headers','params');
- return trigger_event('MAIL_MESSAGE_SEND',$message,'_mail_send_action');
+ return Event::createAndTrigger('MAIL_MESSAGE_SEND',$message,'_mail_send_action');
}
/**
diff --git a/inc/media.php b/inc/media.php
index a68770478..563e370a1 100644
--- a/inc/media.php
+++ b/inc/media.php
@@ -484,7 +484,7 @@ function media_save($file, $id, $ow, $auth, $move) {
$data[5] = $move;
// trigger event
- return trigger_event('MEDIA_UPLOAD_FINISH', $data, '_media_upload_action', true);
+ return Event::createAndTrigger('MEDIA_UPLOAD_FINISH', $data, '_media_upload_action', true);
}
/**
@@ -1275,7 +1275,7 @@ function media_diff($image, $ns, $auth, $fromajax = false) {
$data[5] = $fromajax;
// trigger event
- return trigger_event('MEDIA_DIFF', $data, '_media_file_diff', true);
+ return Event::createAndTrigger('MEDIA_DIFF', $data, '_media_file_diff', true);
}
/**
diff --git a/inc/pageutils.php b/inc/pageutils.php
index f347ef369..88c9ff293 100644
--- a/inc/pageutils.php
+++ b/inc/pageutils.php
@@ -636,7 +636,7 @@ function isHiddenPage($id){
'id' => $id,
'hidden' => false
);
- trigger_event('PAGEUTILS_ID_HIDEPAGE', $data, '_isHiddenPage');
+ \dokuwiki\Extension\Event::createAndTrigger('PAGEUTILS_ID_HIDEPAGE', $data, '_isHiddenPage');
return $data['hidden'];
}
diff --git a/inc/parser/handler.php b/inc/parser/handler.php
index 1d13db3f0..19c2aafe8 100644
--- a/inc/parser/handler.php
+++ b/inc/parser/handler.php
@@ -1,5 +1,6 @@
<?php
+use dokuwiki\Extension\Event;
use dokuwiki\Extension\SyntaxPlugin;
use dokuwiki\Parsing\Handler\Block;
use dokuwiki\Parsing\Handler\CallWriter;
@@ -83,7 +84,7 @@ class Doku_Handler {
$this->calls = $B->process($this->calls);
}
- trigger_event('PARSER_HANDLER_DONE',$this);
+ Event::createAndTrigger('PARSER_HANDLER_DONE',$this);
array_unshift($this->calls,array('document_start',array(),0));
$last_call = end($this->calls);
diff --git a/inc/parserutils.php b/inc/parserutils.php
index fe25b220f..369d9edd6 100644
--- a/inc/parserutils.php
+++ b/inc/parserutils.php
@@ -211,7 +211,7 @@ function p_get_instructions($text){
}
// Do the parsing
- trigger_event('PARSER_WIKITEXT_PREPROCESS', $text);
+ Event::createAndTrigger('PARSER_WIKITEXT_PREPROCESS', $text);
$p = $Parser->parse($text);
// dbg($p);
return $p;
@@ -678,7 +678,7 @@ function p_render($mode,$instructions,&$info,$date_at=''){
// Post process and return the output
$data = array($mode,& $Renderer->doc);
- trigger_event('RENDERER_CONTENT_POSTPROCESS',$data);
+ Event::createAndTrigger('RENDERER_CONTENT_POSTPROCESS',$data);
return $Renderer->doc;
}
diff --git a/inc/template.php b/inc/template.php
index fc3eff6a7..f8edc722f 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -81,9 +81,9 @@ function tpl_content($prependTOC = true) {
$INFO['prependTOC'] = $prependTOC;
ob_start();
- trigger_event('TPL_ACT_RENDER', $ACT, 'tpl_content_core');
+ Event::createAndTrigger('TPL_ACT_RENDER', $ACT, 'tpl_content_core');
$html_output = ob_get_clean();
- trigger_event('TPL_CONTENT_DISPLAY', $html_output, 'ptln');
+ Event::createAndTrigger('TPL_CONTENT_DISPLAY', $html_output, 'ptln');
return !empty($html_output);
}
@@ -150,7 +150,7 @@ function tpl_toc($return = false) {
}
}
- trigger_event('TPL_TOC_RENDER', $toc, null, false);
+ Event::createAndTrigger('TPL_TOC_RENDER', $toc, null, false);
$html = html_TOC($toc);
if($return) return $html;
echo $html;
@@ -359,7 +359,7 @@ function tpl_metaheaders($alt = true) {
);
// trigger event here
- trigger_event('TPL_METAHEADER_OUTPUT', $head, '_tpl_metaheaders_action', true);
+ Event::createAndTrigger('TPL_METAHEADER_OUTPUT', $head, '_tpl_metaheaders_action', true);
return true;
}
@@ -703,7 +703,7 @@ function tpl_searchform($ajax = true, $autocomplete = true) {
$searchForm->addTagClose('div');
}
$searchForm->addTagClose('div');
- trigger_event('FORM_QUICKSEARCH_OUTPUT', $searchForm);
+ Event::createAndTrigger('FORM_QUICKSEARCH_OUTPUT', $searchForm);
echo $searchForm->toHTML();
@@ -1139,7 +1139,7 @@ function tpl_img($maxwidth = 0, $maxheight = 0, $link = true, $params = null) {
$p['src'] = $src;
$data = array('url'=> ($link ? $url : null), 'params'=> $p);
- return trigger_event('TPL_IMG_DISPLAY', $data, '_tpl_img_action', true);
+ return Event::createAndTrigger('TPL_IMG_DISPLAY', $data, '_tpl_img_action', true);
}
/**
generated by cgit v1.2.3 (git 2.39.1) at 2025-05-01 08:13:18 +0000