Merge pull request #11506 from annando/featured-worker

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

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index db358db450a66f82512145a9c0e39dcf8702b686..f6d0d49740f5be46b14de93b52b78396895b0dd4 100644 (file)
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,6 +23,7 @@ namespace Friendica\Core;
 
 use Friendica\Database\DBA;
 use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Util\Strings;
 
 /**
@@ -152,14 +153,16 @@ class Addon
        {
                $addon = Strings::sanitizeFilePathItem($addon);
 
+               $addon_file_path = 'addon/' . $addon . '/' . $addon . '.php';
+
                // silently fail if addon was removed of if $addon is funky
-               if (!file_exists('addon/' . $addon . '/' . $addon . '.php')) {
+               if (!file_exists($addon_file_path)) {
                        return false;
                }
 
                Logger::notice("Addon {addon}: {action}", ['action' => 'install', 'addon' => $addon]);
-               $t = @filemtime('addon/' . $addon . '/' . $addon . '.php');
-               @include_once('addon/' . $addon . '/' . $addon . '.php');
+               $t = @filemtime($addon_file_path);
+               @include_once($addon_file_path);
                if (function_exists($addon . '_install')) {
                        $func = $addon . '_install';
                        $func(DI::app());
@@ -189,16 +192,16 @@ class Addon
 
                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)) {
+                       $addon_file_path = 'addon/' . $addonname . '/' . $addonname . '.php';
+                       if (file_exists($addon_file_path) && $addon['timestamp'] == filemtime($addon_file_path)) {
+                               // Addon unmodified, skipping
                                continue;
                        }
 
                        Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $addon['name']]);
 
-                       self::uninstall($fname);
-                       self::install($fname);
+                       self::uninstall($addon['name']);
+                       self::install($addon['name']);
                }
        }
 
@@ -257,6 +260,12 @@ class Addon
                                        if ($type == "author" || $type == "maintainer") {
                                                $r = preg_match("|([^<]+)<([^>]+)>|", $v, $m);
                                                if ($r) {
+                                                       if (!empty($m[2]) && empty(parse_url($m[2], PHP_URL_SCHEME))) {
+                                                               $contact = Contact::getByURL($m[2], false);
+                                                               if (!empty($contact['url'])) {
+                                                                       $m[2] = $contact['url'];
+                                                               }
+                                                       }
                                                        $info[$type][] = ['name' => $m[1], 'link' => $m[2]];
                                                } else {
                                                        $info[$type][] = ['name' => $v];
@@ -311,51 +320,4 @@ class Addon
 
                return $visible_addons;
        }
-
-       /**
-        * Shim of Hook::register left for backward compatibility purpose.
-        *
-        * @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)
-       {
-               return Hook::register($hook, $file, $function, $priority);
-       }
-
-       /**
-        * Shim of Hook::unregister left for backward compatibility purpose.
-        *
-        * @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)
-       {
-               return Hook::unregister($hook, $file, $function);
-       }
-
-       /**
-        * Shim of Hook::callAll left for backward-compatibility purpose.
-        *
-        * @see        Hook::callAll
-        * @deprecated since version 2018.12
-        * @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)
-       {
-               Hook::callAll($name, $data);
-       }
 }