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

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index be4e94152f..357c02bcb6 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, 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;
 
 /**
@@ -112,37 +113,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 +137,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();
 	}
 
 	/**
@@ -183,42 +153,34 @@ 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());
+		}
 
-			$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 +188,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']));
+			$addon_file_path = 'addon/' . $addonname . '/' . $addonname . '.php';
+			if (file_exists($addon_file_path) && $addon['timestamp'] == filemtime($addon_file_path)) {
+				// Addon unmodified, skipping
+				continue;
 			}
 
-			$addon_list = explode(',', $addons);
+			Logger::notice("Addon {addon}: {action}", ['action' => 'reload', 'addon' => $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)) {
-
-							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']]);
-						}
-					}
-				}
-			}
+			self::uninstall($addon['name']);
+			self::install($addon['name']);
 		}
 	}
 
@@ -283,8 +224,6 @@ class Addon
 	 */
 	public static function getInfo($addon)
 	{
-		$a = DI::app();
-
 		$addon = Strings::sanitizeFilePathItem($addon);
 
 		$info = [
@@ -300,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", System::callstack());
+		DI::profiler()->stopRecording();
 
 		$r = preg_match("|/\*.*\*/|msU", $f, $m);
 
@@ -321,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];
@@ -357,16 +302,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
 	 *
@@ -385,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);
-	}
 }