Merge pull request #8055 from nupplaphil/task/remove_get_server

[friendica.git] / src / Core / Hook.php

diff --git a/src/Core/Hook.php b/src/Core/Hook.php
index a0200a7db36934506b51fc59cf75d5e03f59cff3..b8ad0fb8bd3b7d33399d671c0e111dfaaaf0af77 100644 (file)
--- a/src/Core/Hook.php
+++ b/src/Core/Hook.php
@@ -5,13 +5,14 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
+use Friendica\DI;
+use Friendica\Util\Strings;
 
 /**
  * Some functions to handle hooks
  */
-class Hook extends BaseObject
+class Hook
 {
        /**
         * Array of registered hooks
@@ -48,9 +49,9 @@ class Hook extends BaseObject
         *
         * This function is meant to be called by modules on each page load as it works after loadHooks has been called.
         *
-        * @param type $hook
-        * @param type $file
-        * @param type $function
+        * @param string $hook
+        * @param string $file
+        * @param string $function
         */
        public static function add($hook, $file, $function)
        {
@@ -70,10 +71,11 @@ class Hook extends BaseObject
         * @param string $function the name of the function that the hook will call
         * @param int    $priority A priority (defaults to 0)
         * @return mixed|bool
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function register($hook, $file, $function, $priority = 0)
        {
-               $file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
+               $file = str_replace(DI::app()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
 
                $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
                if (DBA::exists('hook', $condition)) {
@@ -92,10 +94,11 @@ class Hook extends BaseObject
         * @param string $file     the name of the file that hooks into
         * @param string $function the name of the function that the hook called
         * @return boolean
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function unregister($hook, $file, $function)
        {
-               $relative_file = str_replace(self::getApp()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
+               $relative_file = str_replace(DI::app()->getBasePath() . DIRECTORY_SEPARATOR, '', $file);
 
                // This here is only needed for fixing a problem that existed on the develop branch
                $condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
@@ -131,11 +134,28 @@ class Hook extends BaseObject
         * @param integer $priority of the hook
         * @param string  $name     of the hook to call
         * @param mixed   $data     to transmit to the callback handler
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function fork($priority, $name, $data = null)
        {
                if (array_key_exists($name, self::$hooks)) {
                        foreach (self::$hooks[$name] as $hook) {
+                               // Call a hook to check if this hook call needs to be forked
+                               if (array_key_exists('hook_fork', self::$hooks)) {
+                                       $hookdata = ['name' => $name, 'data' => $data, 'execute' => true];
+
+                                       foreach (self::$hooks['hook_fork'] as $fork_hook) {
+                                               if ($hook[0] != $fork_hook[0]) {
+                                                       continue;
+                                               }
+                                               self::callSingle(DI::app(), 'hook_fork', $fork_hook, $hookdata);
+                                       }
+
+                                       if (!$hookdata['execute']) {
+                                               continue;
+                                       }
+                               }
+
                                Worker::add($priority, 'ForkHook', $name, $hook, $data);
                        }
                }
@@ -147,14 +167,15 @@ class Hook extends BaseObject
         * Use this function when you want to be able to allow a hook to manipulate
         * the provided data.
         *
-        * @param string       $name  of the hook to call
+        * @param string        $name of the hook to call
         * @param string|array &$data to transmit to the callback handler
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function callAll($name, &$data = null)
        {
                if (array_key_exists($name, self::$hooks)) {
                        foreach (self::$hooks[$name] as $hook) {
-                               self::callSingle(self::getApp(), $name, $hook, $data);
+                               self::callSingle(DI::app(), $name, $hook, $data);
                        }
                }
        }
@@ -162,10 +183,11 @@ class Hook extends BaseObject
        /**
         * @brief Calls a single hook.
         *
-        * @param App $a
-        * @param string         $name of the hook to call
-        * @param array          $hook Hook data
+        * @param App             $a
+        * @param string          $name of the hook to call
+        * @param array           $hook Hook data
         * @param string|array   &$data to transmit to the callback handler
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function callSingle(App $a, $name, $hook, &$data = null)
        {
@@ -194,6 +216,8 @@ class Hook extends BaseObject
         */
        public static function isAddonApp($name)
        {
+               $name = Strings::sanitizeFilePathItem($name);
+
                if (array_key_exists('app_menu', self::$hooks)) {
                        foreach (self::$hooks['app_menu'] as $hook) {
                                if ($hook[0] == 'addon/' . $name . '/' . $name . '.php') {