X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FAddon.php;h=d5a7a6f1b4d853b7d96f810daa63ff1fb23b655c;hb=31148e25cf6d800851064813689f8fba6340fb5c;hp=eb2b7d1aac6b6e22630d20ed45d8d77c913d4cd1;hpb=daa1177e3a1e42b4c95e0a8759f1610942b952c7;p=friendica.git

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index eb2b7d1aac..d5a7a6f1b4 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -5,16 +5,73 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\BaseObject;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
 /**
  * Some functions to handle addons
  */
-class Addon
+class Addon extends BaseObject
 {
+	/**
+	 * @brief Synchronise addons:
+	 *
+	 * system.addon contains a comma-separated list of names
+	 * of addons which are used on this system.
+	 * Go through the database list of already installed addons, and if we have
+	 * an entry, but it isn't in the config list, call the uninstall procedure
+	 * and mark it uninstalled in the database (for now we'll remove it).
+	 * Then go through the config list and if we have a addon that isn't installed,
+	 * call the install procedure and add it to the database.
+	 *
+	 */
+	public static function check()
+	{
+		$a = self::getApp();
+
+		$r = DBA::select('addon', [], ['installed' => 1]);
+		if (DBA::isResult($r)) {
+			$installed = DBA::toArray($r);
+		} else {
+			$installed = [];
+		}
+
+		$addons = Config::get('system', 'addon');
+		$addons_arr = [];
+
+		if ($addons) {
+			$addons_arr = explode(',', str_replace(' ', '', $addons));
+		}
+
+		$a->addons = $addons_arr;
+
+		$installed_arr = [];
+
+		if (count($installed)) {
+			foreach ($installed as $i) {
+				if (!in_array($i['name'], $addons_arr)) {
+					self::uninstall($i['name']);
+				} else {
+					$installed_arr[] = $i['name'];
+				}
+			}
+		}
+
+		if (count($addons_arr)) {
+			foreach ($addons_arr as $p) {
+				if (!in_array($p, $installed_arr)) {
+					self::install($p);
+				}
+			}
+		}
+
+		self::loadHooks();
+
+		return;
+	}
+
 	/**
 	 * @brief uninstalls an addon.
 	 *
@@ -24,7 +81,7 @@ class Addon
 	public static function uninstall($addon)
 	{
 		logger("Addons: uninstalling " . $addon);
-		dba::delete('addon', ['name' => $addon]);
+		DBA::delete('addon', ['name' => $addon]);
 
 		@include_once('addon/' . $addon . '/' . $addon . '.php');
 		if (function_exists($addon . '_uninstall')) {
@@ -55,7 +112,7 @@ class Addon
 
 			$addon_admin = (function_exists($addon."_addon_admin") ? 1 : 0);
 
-			dba::insert('addon', ['name' => $addon, 'installed' => true,
+			DBA::insert('addon', ['name' => $addon, 'installed' => true,
 						'timestamp' => $t, 'plugin_admin' => $addon_admin]);
 
 			// we can add the following with the previous SQL
@@ -63,7 +120,7 @@ class Addon
 			// 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]);
+				DBA::update('addon', ['hidden' => true], ['name' => $addon]);
 			}
 			return true;
 		} else {
@@ -79,9 +136,9 @@ class Addon
 	{
 		$addons = Config::get('system', 'addon');
 		if (strlen($addons)) {
-			$r = dba::select('addon', [], ['installed' => 1]);
-			if (DBM::is_result($r)) {
-				$installed = dba::inArray($r);
+			$r = DBA::select('addon', [], ['installed' => 1]);
+			if (DBA::isResult($r)) {
+				$installed = DBA::toArray($r);
 			} else {
 				$installed = [];
 			}
@@ -108,7 +165,7 @@ class Addon
 									$func = $addon . '_install';
 									$func();
 								}
-								dba::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
+								DBA::update('addon', ['timestamp' => $t], ['id' => $i['id']]);
 							}
 						}
 					}
@@ -125,7 +182,7 @@ class Addon
 	 */
 	public static function isEnabled($addon)
 	{
-		return dba::exists('addon', ['installed' => true, 'name' => $addon]);
+		return DBA::exists('addon', ['installed' => true, 'name' => $addon]);
 	}
 
 
@@ -140,13 +197,15 @@ class Addon
 	 */
 	public static function registerHook($hook, $file, $function, $priority = 0)
 	{
+		$file = str_replace(self::getApp()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
+
 		$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
-		$exists = dba::exists('hook', $condition);
+		$exists = DBA::exists('hook', $condition);
 		if ($exists) {
 			return true;
 		}
 
-		$r = dba::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
+		$r = DBA::insert('hook', ['hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority]);
 
 		return $r;
 	}
@@ -161,8 +220,14 @@ class Addon
 	 */
 	public static function unregisterHook($hook, $file, $function)
 	{
+		$relative_file = str_replace(self::getApp()->get_basepath() . DIRECTORY_SEPARATOR, '', $file);
+
+		// This here is only needed for fixing a problem that existed on the develop branch
 		$condition = ['hook' => $hook, 'file' => $file, 'function' => $function];
-		$r = dba::delete('hook', $condition);
+		DBA::delete('hook', $condition);
+
+		$condition = ['hook' => $hook, 'file' => $relative_file, 'function' => $function];
+		$r = DBA::delete('hook', $condition);
 		return $r;
 	}
 
@@ -171,17 +236,17 @@ class Addon
 	 */
 	public static function loadHooks()
 	{
-		$a = get_app();
+		$a = self::getApp();
 		$a->hooks = [];
-		$r = dba::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
+		$r = DBA::select('hook', ['hook', 'file', 'function'], [], ['order' => ['priority' => 'desc', 'file']]);
 
-		while ($rr = dba::fetch($r)) {
+		while ($rr = DBA::fetch($r)) {
 			if (! array_key_exists($rr['hook'], $a->hooks)) {
 				$a->hooks[$rr['hook']] = [];
 			}
 			$a->hooks[$rr['hook']][] = [$rr['file'],$rr['function']];
 		}
-		dba::close($r);
+		DBA::close($r);
 	}
 
 	/**
@@ -194,7 +259,7 @@ class Addon
 	 */
 	public static function forkHooks($priority, $name, $data = null)
 	{
-		$a = get_app();
+		$a = self::getApp();
 
 		if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
 			foreach ($a->hooks[$name] as $hook) {
@@ -214,7 +279,7 @@ class Addon
 	 */
 	public static function callHooks($name, &$data = null)
 	{
-		$a = get_app();
+		$a = self::getApp();
 
 		if (is_array($a->hooks) && array_key_exists($name, $a->hooks)) {
 			foreach ($a->hooks[$name] as $hook) {
@@ -245,7 +310,7 @@ class Addon
 		} else {
 			// remove orphan hooks
 			$condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];
-			dba::delete('hook', $condition, ['cascade' => false]);
+			DBA::delete('hook', $condition, ['cascade' => false]);
 		}
 	}
 
@@ -255,7 +320,7 @@ class Addon
 	 */
 	public static function isApp($name)
 	{
-		$a = get_app();
+		$a = self::getApp();
 
 		if (is_array($a->hooks) && (array_key_exists('app_menu', $a->hooks))) {
 			foreach ($a->hooks['app_menu'] as $hook) {
@@ -286,7 +351,7 @@ class Addon
 	 */
 	public static function getInfo($addon)
 	{
-		$a = get_app();
+		$a = self::getApp();
 
 		$info = [
 			'name' => $addon,
@@ -312,7 +377,12 @@ class Addon
 			foreach ($ll as $l) {
 				$l = trim($l, "\t\n\r */");
 				if ($l != "") {
-					list($type, $v) = array_map("trim", explode(":", $l, 2));
+					$addon_info = array_map("trim", explode(":", $l, 2));
+					if (count($addon_info) < 2) {
+						continue;
+					}
+
+					list($type, $v) = $addon_info;
 					$type = strtolower($type);
 					if ($type == "author" || $type == "maintainer") {
 						$r = preg_match("|([^<]+)<([^>]+)>|", $v, $m);