Avoid memory issue in exception

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

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 6b2d341708a67c064f6e1a2bb916a707d9de2900..6697a44aea13bd60b480fa0cb067d4fa5e9f2be5 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -4,17 +4,20 @@
  */
 namespace Friendica\Core;
 
-use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * Some functions to handle addons
  */
 class Addon extends BaseObject
 {
+       /**
+        * The addon sub-directory
+        * @var string
+        */
+       const DIRECTORY = 'addon';
+
        /**
         * List of the names of enabled addons
         *
@@ -73,11 +76,12 @@ class Addon extends BaseObject
         * @brief uninstalls an addon.
         *
         * @param string $addon name of the addon
-        * @return boolean
+        * @return void
+        * @throws \Exception
         */
        public static function uninstall($addon)
        {
-               logger("Addons: uninstalling " . $addon);
+               Logger::notice("Addon {addon}: {action}", ['action' => 'uninstall', 'addon' => $addon]);
                DBA::delete('addon', ['name' => $addon]);
 
                @include_once('addon/' . $addon . '/' . $addon . '.php');
@@ -86,7 +90,7 @@ class Addon extends BaseObject
                        $func();
                }
 
-               unset(self::$addons[$idx]);
+               unset(self::$addons[array_search($addon, self::$addons)]);
        }
 
        /**
@@ -94,6 +98,7 @@ class Addon extends BaseObject
         *
         * @param string $addon name of the addon
         * @return bool
+        * @throws \Exception
         */
        public static function install($addon)
        {
@@ -102,12 +107,12 @@ class Addon extends BaseObject
                if (!file_exists('addon/' . $addon . '/' . $addon . '.php')) {
                        return false;
                }
-               logger("Addons: installing " . $addon);
+               Logger::notice("Addon {addon}: {action}", ['action' => 'install', 'addon' => $addon]);
                $t = @filemtime('addon/' . $addon . '/' . $addon . '.php');
                @include_once('addon/' . $addon . '/' . $addon . '.php');
                if (function_exists($addon . '_install')) {
                        $func = $addon . '_install';
-                       $func();
+                       $func(self::getApp());
 
                        $addon_admin = (function_exists($addon . "_addon_admin") ? 1 : 0);
 
@@ -127,7 +132,7 @@ class Addon extends BaseObject
                        }
                        return true;
                } else {
-                       logger("Addons: FAILED installing " . $addon);
+                       Logger::error("Addon {addon}: {action} failed", ['action' => 'uninstall', 'addon' => $addon]);
                        return false;
                }
        }
@@ -157,16 +162,17 @@ class Addon extends BaseObject
                                                $t = @filemtime($fname);
                                                foreach ($installed as $i) {
                                                        if (($i['name'] == $addon) && ($i['timestamp'] != $t)) {
-                                                               logger('Reloading addon: ' . $i['name']);
+
+                                                               Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $i['name']]);
                                                                @include_once($fname);
 
                                                                if (function_exists($addon . '_uninstall')) {
                                                                        $func = $addon . '_uninstall';
-                                                                       $func();
+                                                                       $func(self::getApp());
                                                                }
                                                                if (function_exists($addon . '_install')) {
                                                                        $func = $addon . '_install';
-                                                                       $func();
+                                                                       $func(self::getApp());
                                                                }
                                                                DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
                                                        }
@@ -192,6 +198,7 @@ class Addon extends BaseObject
         *   *\endcode
         * @param string $addon the name of the addon
         * @return array with the addon information
+        * @throws \Exception
         */
        public static function getInfo($addon)
        {
@@ -257,6 +264,11 @@ class Addon extends BaseObject
                return in_array($addon, self::$addons);
        }
 
+       /**
+        * Returns a list of the enabled addon names
+        *
+        * @return array
+        */
        public static function getEnabledList()
        {
                return self::$addons;
@@ -266,6 +278,7 @@ class Addon extends BaseObject
         * Saves the current enabled addon list in the system.addon config key
         *
         * @return boolean
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function saveEnabledList()
        {
@@ -276,6 +289,7 @@ class Addon extends BaseObject
         * Returns the list of non-hidden enabled addon names
         *
         * @return array
+        * @throws \Exception
         */
        public static function getVisibleList()
        {
@@ -293,13 +307,14 @@ class Addon extends BaseObject
        /**
         * Shim of Hook::register left for backward compatibility purpose.
         *
-        * @see Hook::register
+        * @see        Hook::register
         * @deprecated since version 2018.12
         * @param string $hook     the name of the hook
         * @param string $file     the name of the file that hooks into
         * @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 registerHook($hook, $file, $function, $priority = 0)
        {
@@ -309,12 +324,13 @@ class Addon extends BaseObject
        /**
         * Shim of Hook::unregister left for backward compatibility purpose.
         *
-        * @see Hook::unregister
+        * @see        Hook::unregister
         * @deprecated since version 2018.12
         * @param string $hook     the name of the hook
         * @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 unregisterHook($hook, $file, $function)
        {
@@ -324,10 +340,11 @@ class Addon extends BaseObject
        /**
         * Shim of Hook::callAll left for backward-compatibility purpose.
         *
-        * @see Hook::callAll
+        * @see        Hook::callAll
         * @deprecated since version 2018.12
-        * @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 callHooks($name, &$data = null)
        {