X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FAddon.php;h=a06982820e11530dd8e605789b3150d48bb3f42c;hb=4bf27019125f0426aef952f3bbb166b3bd12ca46;hp=6b2d341708a67c064f6e1a2bb916a707d9de2900;hpb=ca9cad3491bee6aaf3688ab896f29933aaa1ef63;p=friendica.git

diff --git a/src/Core/Addon.php b/src/Core/Addon.php
index 6b2d341708..a06982820e 100644
--- a/src/Core/Addon.php
+++ b/src/Core/Addon.php
@@ -6,10 +6,9 @@ namespace Friendica\Core;
 
 use Friendica\App;
 use Friendica\BaseObject;
+use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 
-require_once 'include/dba.php';
-
 /**
  * Some functions to handle addons
  */
@@ -77,7 +76,7 @@ class Addon extends BaseObject
 	 */
 	public static function uninstall($addon)
 	{
-		logger("Addons: uninstalling " . $addon);
+		Logger::log("Addons: uninstalling " . $addon);
 		DBA::delete('addon', ['name' => $addon]);
 
 		@include_once('addon/' . $addon . '/' . $addon . '.php');
@@ -86,7 +85,7 @@ class Addon extends BaseObject
 			$func();
 		}
 
-		unset(self::$addons[$idx]);
+		unset(self::$addons[array_search($addon, self::$addons)]);
 	}
 
 	/**
@@ -102,7 +101,7 @@ class Addon extends BaseObject
 		if (!file_exists('addon/' . $addon . '/' . $addon . '.php')) {
 			return false;
 		}
-		logger("Addons: installing " . $addon);
+		Logger::log("Addons: installing " . $addon);
 		$t = @filemtime('addon/' . $addon . '/' . $addon . '.php');
 		@include_once('addon/' . $addon . '/' . $addon . '.php');
 		if (function_exists($addon . '_install')) {
@@ -127,7 +126,7 @@ class Addon extends BaseObject
 			}
 			return true;
 		} else {
-			logger("Addons: FAILED installing " . $addon);
+			Logger::log("Addons: FAILED installing " . $addon);
 			return false;
 		}
 	}
@@ -157,7 +156,7 @@ class Addon extends BaseObject
 						$t = @filemtime($fname);
 						foreach ($installed as $i) {
 							if (($i['name'] == $addon) && ($i['timestamp'] != $t)) {
-								logger('Reloading addon: ' . $i['name']);
+								Logger::log('Reloading addon: ' . $i['name']);
 								@include_once($fname);
 
 								if (function_exists($addon . '_uninstall')) {
@@ -257,6 +256,11 @@ class Addon extends BaseObject
 		return in_array($addon, self::$addons);
 	}
 
+	/**
+	 * Returns a list of the enabled addon names
+	 *
+	 * @return array
+	 */
 	public static function getEnabledList()
 	{
 		return self::$addons;