X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FAddon.php;h=357c02bcb6bd1b34734240c42a508b8c35004053;hb=06284e60073f374c1bd411e0bba6474a13c14f10;hp=dd0236551bbab62757774896cb6db8d23d6a49cb;hpb=53e38b03130ea798bba44db44ccb7f331dc4b91d;p=friendica.git

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index dd0236551b..357c02bcb6 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -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']);
 		}
 	}
 
@@ -236,9 +239,9 @@ class Addon
 			return $info;
 		}
 
-		$stamp1 = microtime(true);
+		DI::profiler()->startRecording('file');
 		$f = file_get_contents("addon/$addon/$addon.php");
-		DI::profiler()->saveTimestamp($stamp1, "file");
+		DI::profiler()->stopRecording();
 
 		$r = preg_match("|/\*.*\*/|msU", $f, $m);
 
@@ -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);
-	}
 }