Check for bad worker priorities

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

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index be4e94152f44f8e9dd4c99bcea5bc59f736e246e..511364b8acb0cff9bb6180e97d6dd8441bea288b 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -112,37 +112,8 @@ class Addon
         */
        public static function loadAddons()
        {
-               $installed_addons = [];
-
-               $r = DBA::select('addon', [], ['installed' => 1]);
-               if (DBA::isResult($r)) {
-                       $installed_addons = DBA::toArray($r);
-               }
-
-               $addons = DI::config()->get('system', 'addon');
-               $addons_arr = [];
-
-               if ($addons) {
-                       $addons_arr = explode(',', str_replace(' ', '', $addons));
-               }
-
-               self::$addons = $addons_arr;
-
-               $installed_arr = [];
-
-               foreach ($installed_addons as $addon) {
-                       if (!self::isEnabled($addon['name'])) {
-                               self::uninstall($addon['name']);
-                       } else {
-                               $installed_arr[] = $addon['name'];
-                       }
-               }
-
-               foreach (self::$addons as $p) {
-                       if (!in_array($p, $installed_arr)) {
-                               self::install($p);
-                       }
-               }
+               $installed_addons = DBA::selectToArray('addon', ['name'], ['installed' => true]);
+               self::$addons = array_column($installed_addons, 'name');
        }
 
        /**
@@ -165,11 +136,9 @@ class Addon
                        $func();
                }
 
-               DBA::delete('hook', ['file' => 'addon/' . $addon . '/' . $addon . '.php']);
+               Hook::delete(['file' => 'addon/' . $addon . '/' . $addon . '.php']);
 
                unset(self::$addons[array_search($addon, self::$addons)]);
-
-               Addon::saveEnabledList();
        }
 
        /**
@@ -194,31 +163,21 @@ class Addon
                if (function_exists($addon . '_install')) {
                        $func = $addon . '_install';
                        $func(DI::app());
+               }
 
-                       $addon_admin = (function_exists($addon . "_addon_admin") ? 1 : 0);
-
-                       DBA::insert('addon', ['name' => $addon, 'installed' => true,
-                               'timestamp' => $t, 'plugin_admin' => $addon_admin]);
-
-                       // we can add the following with the previous SQL
-                       // once most site tables have been updated.
-                       // This way the system won't fall over dead during the update.
-
-                       if (file_exists('addon/' . $addon . '/.hidden')) {
-                               DBA::update('addon', ['hidden' => true], ['name' => $addon]);
-                       }
-
-                       if (!self::isEnabled($addon)) {
-                               self::$addons[] = $addon;
-                       }
-
-                       Addon::saveEnabledList();
-
-                       return true;
-               } else {
-                       Logger::error("Addon {addon}: {action} failed", ['action' => 'install', 'addon' => $addon]);
-                       return false;
+               DBA::insert('addon', [
+                       'name' => $addon,
+                       'installed' => true,
+                       'timestamp' => $t,
+                       'plugin_admin' => function_exists($addon . '_addon_admin'),
+                       'hidden' => file_exists('addon/' . $addon . '/.hidden')
+               ]);
+
+               if (!self::isEnabled($addon)) {
+                       self::$addons[] = $addon;
                }
+
+               return true;
        }
 
        /**
@@ -226,41 +185,20 @@ class Addon
         */
        public static function reload()
        {
-               $addons = DI::config()->get('system', 'addon');
-               if (strlen($addons)) {
-                       $r = DBA::select('addon', [], ['installed' => 1]);
-                       if (DBA::isResult($r)) {
-                               $installed = DBA::toArray($r);
-                       } else {
-                               $installed = [];
+               $addons = DBA::selectToArray('addon', [], ['installed' => true]);
+
+               foreach ($addons as $addon) {
+                       $addonname = Strings::sanitizeFilePathItem(trim($addon['name']));
+                       $fname = 'addon/' . $addonname . '/' . $addonname . '.php';
+                       $t = @filemtime($fname);
+                       if (!file_exists($fname) || ($addon['timestamp'] == $t)) {
+                               continue;
                        }
 
-                       $addon_list = explode(',', $addons);
-
-                       foreach ($addon_list as $addon) {
-                               $addon = Strings::sanitizeFilePathItem(trim($addon));
-                               $fname = 'addon/' . $addon . '/' . $addon . '.php';
-                               if (file_exists($fname)) {
-                                       $t = @filemtime($fname);
-                                       foreach ($installed as $i) {
-                                               if (($i['name'] == $addon) && ($i['timestamp'] != $t)) {
-
-                                                       Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $i['name']]);
-                                                       @include_once($fname);
-
-                                                       if (function_exists($addon . '_uninstall')) {
-                                                               $func = $addon . '_uninstall';
-                                                               $func(DI::app());
-                                                       }
-                                                       if (function_exists($addon . '_install')) {
-                                                               $func = $addon . '_install';
-                                                               $func(DI::app());
-                                                       }
-                                                       DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
-                                               }
-                                       }
-                               }
-                       }
+                       Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]);
+
+                       self::uninstall($fname);
+                       self::install($fname);
                }
        }
 
@@ -283,8 +221,6 @@ class Addon
         */
        public static function getInfo($addon)
        {
-               $a = DI::app();
-
                $addon = Strings::sanitizeFilePathItem($addon);
 
                $info = [
@@ -302,7 +238,7 @@ class Addon
 
                $stamp1 = microtime(true);
                $f = file_get_contents("addon/$addon/$addon.php");
-               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file");
 
                $r = preg_match("|/\*.*\*/|msU", $f, $m);
 
@@ -357,16 +293,6 @@ class Addon
                return self::$addons;
        }
 
-       /**
-        * Saves the current enabled addon list in the system.addon config key
-        *
-        * @return boolean
-        */
-       public static function saveEnabledList()
-       {
-               return DI::config()->set('system', 'addon', implode(',', self::$addons));
-       }
-
        /**
         * Returns the list of non-hidden enabled addon names
         *