Merge pull request #8222 from annando/ap-gnusocial

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

diff --git a/src/Core/Hook.php b/src/Core/Hook.php
index 7f0c015b3db155ae500b3ded2d06ecf0837c20d7..f282d02c757007af116a6e5de46f5497437cf8ce 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
@@ -44,7 +45,7 @@ class Hook extends BaseObject
        }
 
        /**
-        * @brief Adds a new hook to the hooks array.
+        * Adds a new hook to the hooks array.
         *
         * This function is meant to be called by modules on each page load as it works after loadHooks has been called.
         *
@@ -61,7 +62,7 @@ class Hook extends BaseObject
        }
 
        /**
-        * @brief Registers a hook.
+        * Registers a hook.
         *
         * This function is meant to be called once when an addon is enabled for example as it doesn't add to the current hooks.
         *
@@ -74,7 +75,7 @@ class Hook extends BaseObject
         */
        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)) {
@@ -97,7 +98,7 @@ class Hook extends BaseObject
         */
        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];
@@ -126,7 +127,7 @@ class Hook extends BaseObject
        }
 
        /**
-        * @brief Forks a hook.
+        * Forks a hook.
         *
         * Use this function when you want to fork a hook via the worker.
         *
@@ -147,7 +148,7 @@ class Hook extends BaseObject
                                                if ($hook[0] != $fork_hook[0]) {
                                                        continue;
                                                }
-                                               self::callSingle(self::getApp(), 'hook_fork', $fork_hook, $hookdata);
+                                               self::callSingle(DI::app(), 'hook_fork', $fork_hook, $hookdata);
                                        }
 
                                        if (!$hookdata['execute']) {
@@ -161,7 +162,7 @@ class Hook extends BaseObject
        }
 
        /**
-        * @brief Calls a hook.
+        * Calls a hook.
         *
         * Use this function when you want to be able to allow a hook to manipulate
         * the provided data.
@@ -174,13 +175,13 @@ class Hook extends BaseObject
        {
                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);
                        }
                }
        }
 
        /**
-        * @brief Calls a single hook.
+        * Calls a single hook.
         *
         * @param App             $a
         * @param string          $name of the hook to call
@@ -215,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') {