Remove duplicate profile_uid key in App->profile array

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

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 4dd34eb16f01eab73f1ab9356f9d7b241523c5bb..5f1865b554898608aff5616a3c0539660417587b 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -5,14 +5,14 @@
 
 namespace Friendica\Core;
 
-use Friendica\BaseObject;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Util\Strings;
 
 /**
  * Some functions to handle addons
  */
-class Addon extends BaseObject
+class Addon
 {
        /**
         * The addon sub-directory
@@ -27,6 +27,14 @@ class Addon extends BaseObject
         */
        private static $addons = [];
 
+       /**
+        * Returns the list of available addons with their current status and info.
+        * This list is made from scanning the addon/ folder.
+        * Unsupported addons are excluded unless they already are enabled or system.show_unsupported_addon is set.
+        *
+        * @return array
+        * @throws \Exception
+        */
        public static function getAvailableList()
        {
                $addons = [];
@@ -37,7 +45,7 @@ class Addon extends BaseObject
                                        list($tmp, $addon) = array_map('trim', explode('/', $file));
                                        $info = self::getInfo($addon);
 
-                                       if (Config::get('system', 'show_unsupported_addons')
+                                       if (DI::config()->get('system', 'show_unsupported_addons')
                                                || strtolower($info['status']) != 'unsupported'
                                                || self::isEnabled($addon)
                                        ) {
@@ -51,7 +59,31 @@ class Addon extends BaseObject
        }
 
        /**
-        * @brief Synchronize addons:
+        * Returns a list of addons that can be configured at the node level.
+        * The list is formatted for display in the admin panel aside.
+        *
+        * @return array
+        * @throws \Exception
+        */
+       public static function getAdminList()
+       {
+               $addons_admin = [];
+               $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]);
+               while ($addon = DBA::fetch($addonsAdminStmt)) {
+                       $addons_admin[$addon['name']] = [
+                               'url' => 'admin/addons/' . $addon['name'],
+                               'name' => $addon['name'],
+                               'class' => 'addon'
+                       ];
+               }
+               DBA::close($addonsAdminStmt);
+
+               return $addons_admin;
+       }
+
+
+       /**
+        * Synchronize addons:
         *
         * system.addon contains a comma-separated list of names
         * of addons which are used on this system.
@@ -71,7 +103,7 @@ class Addon extends BaseObject
                        $installed_addons = DBA::toArray($r);
                }
 
-               $addons = Config::get('system', 'addon');
+               $addons = DI::config()->get('system', 'addon');
                $addons_arr = [];
 
                if ($addons) {
@@ -98,7 +130,7 @@ class Addon extends BaseObject
        }
 
        /**
-        * @brief uninstalls an addon.
+        * uninstalls an addon.
         *
         * @param string $addon name of the addon
         * @return void
@@ -117,13 +149,15 @@ class Addon extends BaseObject
                        $func();
                }
 
+               DBA::delete('hook', ['file' => 'addon/' . $addon . '/' . $addon . '.php']);
+
                unset(self::$addons[array_search($addon, self::$addons)]);
 
                Addon::saveEnabledList();
        }
 
        /**
-        * @brief installs an addon.
+        * installs an addon.
         *
         * @param string $addon name of the addon
         * @return bool
@@ -143,7 +177,7 @@ class Addon extends BaseObject
                @include_once('addon/' . $addon . '/' . $addon . '.php');
                if (function_exists($addon . '_install')) {
                        $func = $addon . '_install';
-                       $func(self::getApp());
+                       $func(DI::app());
 
                        $addon_admin = (function_exists($addon . "_addon_admin") ? 1 : 0);
 
@@ -176,7 +210,7 @@ class Addon extends BaseObject
         */
        public static function reload()
        {
-               $addons = Config::get('system', 'addon');
+               $addons = DI::config()->get('system', 'addon');
                if (strlen($addons)) {
                        $r = DBA::select('addon', [], ['installed' => 1]);
                        if (DBA::isResult($r)) {
@@ -200,11 +234,11 @@ class Addon extends BaseObject
 
                                                        if (function_exists($addon . '_uninstall')) {
                                                                $func = $addon . '_uninstall';
-                                                               $func(self::getApp());
+                                                               $func(DI::app());
                                                        }
                                                        if (function_exists($addon . '_install')) {
                                                                $func = $addon . '_install';
-                                                               $func(self::getApp());
+                                                               $func(DI::app());
                                                        }
                                                        DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
                                                }
@@ -215,7 +249,7 @@ class Addon extends BaseObject
        }
 
        /**
-        * @brief Parse addon comment in search of addon infos.
+        * Parse addon comment in search of addon infos.
         *
         * like
         * \code
@@ -233,7 +267,7 @@ class Addon extends BaseObject
         */
        public static function getInfo($addon)
        {
-               $a = self::getApp();
+               $a = DI::app();
 
                $addon = Strings::sanitizeFilePathItem($addon);
 
@@ -252,7 +286,7 @@ class Addon extends BaseObject
 
                $stamp1 = microtime(true);
                $f = file_get_contents("addon/$addon/$addon.php");
-               $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
 
                $r = preg_match("|/\*.*\*/|msU", $f, $m);
 
@@ -314,7 +348,7 @@ class Addon extends BaseObject
         */
        public static function saveEnabledList()
        {
-               return Config::set('system', 'addon', implode(',', self::$addons));
+               return DI::config()->set('system', 'addon', implode(',', self::$addons));
        }
 
        /**