X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FLegacyModule.php;h=38c3e9a8fb4d0b8ff68309f25aa95418a37322b4;hb=c95d47b0b4d01552804ebcf26e5ae42fc576fc60;hp=737101b5c287ac911fa2649344bf41218cf423ba;hpb=7ee8bdafc53a88fe51f233e14169bb4af0d376ab;p=friendica.git

diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index 737101b5c2..38c3e9a8fb 100644
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica;
 
@@ -16,42 +35,45 @@ class LegacyModule extends BaseModule
 	 *
 	 * @var string
 	 */
-	private static $moduleName = '';
+	private $moduleName = '';
+
+	public function __construct(string $file_path = '', array $parameters = [])
+	{
+		parent::__construct($parameters);
+
+		$this->setModuleFile($file_path);
+	}
 
 	/**
 	 * The only method that needs to be called, with the module/addon file name.
 	 *
 	 * @param string $file_path
+	 * @throws \Exception
 	 */
-	public static function setModuleFile($file_path)
+	private function setModuleFile($file_path)
 	{
 		if (!is_readable($file_path)) {
-			throw new Exception(Core\L10n::t('Legacy module file not found: %s', $file_path));
+			throw new \Exception(DI::l10n()->t('Legacy module file not found: %s', $file_path));
 		}
 
-		self::$moduleName = basename($file_path, '.php');
+		$this->moduleName = basename($file_path, '.php');
 
 		require_once $file_path;
 	}
 
-	public static function init()
-	{
-		self::runModuleFunction('init');
-	}
-
-	public static function content()
+	public function init()
 	{
-		return self::runModuleFunction('content');
+		$this->runModuleFunction('init');
 	}
 
-	public static function post()
+	public function content(): string
 	{
-		self::runModuleFunction('post');
+		return $this->runModuleFunction('content');
 	}
 
-	public static function afterpost()
+	public function post()
 	{
-		self::runModuleFunction('afterpost');
+		$this->runModuleFunction('post');
 	}
 
 	/**
@@ -59,15 +81,17 @@ class LegacyModule extends BaseModule
 	 *
 	 * @param string $function_suffix
 	 * @return string
+	 * @throws \Exception
 	 */
-	private static function runModuleFunction($function_suffix)
+	private function runModuleFunction(string $function_suffix)
 	{
-		$function_name = static::$moduleName . '_' . $function_suffix;
+		$function_name = $this->moduleName . '_' . $function_suffix;
 
 		if (\function_exists($function_name)) {
-			return $function_name(self::getApp());
+			$a = DI::app();
+			return $function_name($a);
 		} else {
-			return parent::{$function_suffix}();
+			return parent::{$function_suffix}($this->parameters);
 		}
 	}
 }