Merge remote-tracking branch 'upstream/develop' into mod-item

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

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 37ef335a47d9a97c3a5967bfd60111e7bcfd18ed..ef2289ca598e6794b096e0c444dbfa1c69613bf7 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,6 @@
 
 namespace Friendica\Core;
 
-use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Util\Strings;
@@ -85,15 +84,19 @@ class Addon
        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'],
+               $addons = DI::config()->get('addons');
+               ksort($addons);
+               foreach ($addons as $name => $data) {
+                       if (empty($data['admin'])) {
+                               continue;
+                       }
+
+                       $addons_admin[$name] = [
+                               'url' => 'admin/addons/' . $name,
+                               'name' => $name,
                                'class' => 'addon'
                        ];
                }
-               DBA::close($addonsAdminStmt);
 
                return $addons_admin;
        }
@@ -113,8 +116,7 @@ class Addon
         */
        public static function loadAddons()
        {
-               $installed_addons = DBA::selectToArray('addon', ['name'], ['installed' => true]);
-               self::$addons = array_column($installed_addons, 'name');
+               self::$addons = array_keys(DI::config()->get('addons') ?? []);
        }
 
        /**
@@ -128,8 +130,8 @@ class Addon
        {
                $addon = Strings::sanitizeFilePathItem($addon);
 
-               Logger::notice("Addon {addon}: {action}", ['action' => 'uninstall', 'addon' => $addon]);
-               DBA::delete('addon', ['name' => $addon]);
+               Logger::debug("Addon {addon}: {action}", ['action' => 'uninstall', 'addon' => $addon]);
+               DI::config()->delete('addons', $addon);
 
                @include_once('addon/' . $addon . '/' . $addon . '.php');
                if (function_exists($addon . '_uninstall')) {
@@ -160,7 +162,7 @@ class Addon
                        return false;
                }
 
-               Logger::notice("Addon {addon}: {action}", ['action' => 'install', 'addon' => $addon]);
+               Logger::debug("Addon {addon}: {action}", ['action' => 'install', 'addon' => $addon]);
                $t = @filemtime($addon_file_path);
                @include_once($addon_file_path);
                if (function_exists($addon . '_install')) {
@@ -168,12 +170,9 @@ class Addon
                        $func(DI::app());
                }
 
-               DBA::insert('addon', [
-                       'name' => $addon,
-                       'installed' => true,
-                       'timestamp' => $t,
-                       'plugin_admin' => function_exists($addon . '_addon_admin'),
-                       'hidden' => file_exists('addon/' . $addon . '/.hidden')
+               DI::config()->set('addons', $addon, [
+                       'last_update' => $t,
+                       'admin' => function_exists($addon . '_addon_admin'),
                ]);
 
                if (!self::isEnabled($addon)) {
@@ -190,20 +189,20 @@ class Addon
         */
        public static function reload()
        {
-               $addons = DBA::selectToArray('addon', [], ['installed' => true]);
+               $addons = DI::config()->get('addons');
 
-               foreach ($addons as $addon) {
-                       $addonname = Strings::sanitizeFilePathItem(trim($addon['name']));
+               foreach ($addons as $name => $data) {
+                       $addonname = Strings::sanitizeFilePathItem(trim($name));
                        $addon_file_path = 'addon/' . $addonname . '/' . $addonname . '.php';
-                       if (file_exists($addon_file_path) && $addon['timestamp'] == filemtime($addon_file_path)) {
+                       if (file_exists($addon_file_path) && $data['last_update'] == filemtime($addon_file_path)) {
                                // Addon unmodified, skipping
                                continue;
                        }
 
-                       Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]);
+                       Logger::debug("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $name]);
 
-                       self::uninstall($addon['name']);
-                       self::install($addon['name']);
+                       self::uninstall($name);
+                       self::install($name);
                }
        }
 
@@ -313,11 +312,9 @@ class Addon
        public static function getVisibleList(): array
        {
                $visible_addons = [];
-               $stmt = DBA::select('addon', ['name'], ['hidden' => false, 'installed' => true]);
-               if (DBA::isResult($stmt)) {
-                       foreach (DBA::toArray($stmt) as $addon) {
-                               $visible_addons[] = $addon['name'];
-                       }
+               $addons = DI::config()->get('addons');
+               foreach ($addons as $name => $data) {
+                       $visible_addons[] = $name;
                }
 
                return $visible_addons;