Merge pull request #9039 from MrPetovan/task/frio-accent-scheme

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

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 3dd28af44bf8ea25077013c4b1378a5e303a528f..0462504e70a29d01457fa5a1d5ecf4fd56c011c5 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -113,13 +113,7 @@ class Addon
        public static function loadAddons()
        {
                $installed_addons = DBA::selectToArray('addon', ['name'], ['installed' => true]);
-
-               $addons_arr = [];
-               foreach ($installed_addons as $addon) {
-                       $addons_arr[] = $addon['name'];
-               }
-
-               self::$addons = $addons_arr;
+               self::$addons = array_column($installed_addons, 'name');
        }
 
        /**
@@ -142,7 +136,7 @@ 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)]);
        }
@@ -199,36 +193,20 @@ class Addon
         */
        public static function reload()
        {
-               $installed = DBA::selectToArray('addon', [], ['installed' => 1]);
-
-               $addon_list = [];
-               foreach ($installed as $addon) {
-                       $addon_list[] = $addon['name'];
-               }
-
-               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)) {
+               $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;
+                       }
 
-                                               Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $i['name']]);
-                                               @include_once($fname);
+                       Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]);
 
-                                               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']]);
-                                       }
-                               }
-                       }
+                       self::uninstall($fname);
+                       self::install($fname);
                }
        }
 
@@ -270,7 +248,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);