Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-09-02 22:17:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only run JSON hooks when $sAction is set #755

Browse source
This commit is contained in:
the-djmaze 2022-12-07 16:26:38 +01:00
parent b679cb41d9
commit 40cf942ddd
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -151,15 +151,15 @@ class ServiceActions
if (\method_exists($this->oActions, $sMethodName) && if (\method_exists($this->oActions, $sMethodName) &&
\is_callable(array($this->oActions, $sMethodName))) \is_callable(array($this->oActions, $sMethodName)))
{ {
$this->Plugins()->RunHook('json.action-pre-call', array($sAction)); $sAction && $this->Plugins()->RunHook('json.action-pre-call', array($sAction));
$aResponseItem = $this->oActions->{$sMethodName}(); $aResponseItem = $this->oActions->{$sMethodName}();
$this->Plugins()->RunHook('json.action-post-call', array($sAction, &$aResponseItem)); $sAction && $this->Plugins()->RunHook('json.action-post-call', array($sAction, &$aResponseItem));
} }
else if ($this->Plugins()->HasAdditionalJson($sMethodName)) else if ($this->Plugins()->HasAdditionalJson($sMethodName))
{ {
$this->Plugins()->RunHook('json.action-pre-call', array($sAction)); $sAction && $this->Plugins()->RunHook('json.action-pre-call', array($sAction));
$aResponseItem = $this->Plugins()->RunAdditionalJson($sMethodName); $aResponseItem = $this->Plugins()->RunAdditionalJson($sMethodName);
$this->Plugins()->RunHook('json.action-post-call', array($sAction, &$aResponseItem)); $sAction && $this->Plugins()->RunHook('json.action-post-call', array($sAction, &$aResponseItem));
} }
} }
@ -184,7 +184,7 @@ class ServiceActions
$aResponseItem['Time'] = (int) ((\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']) * 1000); $aResponseItem['Time'] = (int) ((\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']) * 1000);
} }
$this->Plugins()->RunHook('filter.json-response', array($sAction, &$aResponseItem)); $sAction && $this->Plugins()->RunHook('filter.json-response', array($sAction, &$aResponseItem));
if (!\headers_sent()) { if (!\headers_sent()) {
\header('Content-Type: application/json; charset=utf-8'); \header('Content-Type: application/json; charset=utf-8');