X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FBaseModule.php;h=be4788045c2d283d73c5c30080c1ebf661ee7710;hb=f00792d370cfbf1d52b37e3eed7e80e682df9d8a;hp=ced1e55c397c51d81f2f6b866cac58ea83f422f3;hpb=a497bd3a3daf7e47e98fee0af9384544d8f691b8;p=friendica.git

diff --git a/src/BaseModule.php b/src/BaseModule.php
index ced1e55c39..be4788045c 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -21,6 +21,8 @@
 
 namespace Friendica;
 
+use Friendica\Capabilities\ICanHandleRequests;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Model\User;
 
@@ -33,94 +35,90 @@ use Friendica\Model\User;
  *
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-abstract class BaseModule
+abstract class BaseModule implements ICanHandleRequests
 {
+	/** @var array */
+	protected $parameters = [];
+
+	/** @var L10n */
+	protected $l10n;
+
+	public function __construct(L10n $l10n, array $parameters = [])
+	{
+		$this->parameters = $parameters;
+		$this->l10n       = $l10n;
+	}
+
 	/**
-	 * Initialization method common to both content() and post()
+	 * Wraps the L10n::t() function for Modules
 	 *
-	 * Extend this method if you need to do any shared processing before both
-	 * content() or post()
+	 * @see L10n::t()
 	 */
-	public static function init(array $parameters = [])
+	protected function t(string $s, ...$args): string
 	{
+		return $this->l10n->t($s, $args);
 	}
 
 	/**
-	 * Module GET method to display raw content from technical endpoints
+	 * Wraps the L10n::tt() function for Modules
 	 *
-	 * Extend this method if the module is supposed to return communication data,
-	 * e.g. from protocol implementations.
+	 * @see L10n::tt()
+	 */
+	protected function tt(string $singular, string $plurarl, int $count): string
+	{
+		return $this->l10n->tt($singular, $plurarl, $count);
+	}
+
+	/**
+	 * {@inheritDoc}
 	 */
-	public static function rawContent(array $parameters = [])
+	public function rawContent()
 	{
 		// echo '';
 		// exit;
 	}
 
 	/**
-	 * Module GET method to display any content
-	 *
-	 * Extend this method if the module is supposed to return any display
-	 * through a GET request. It can be an HTML page through templating or a
-	 * XML feed or a JSON output.
-	 *
-	 * @return string
+	 * {@inheritDoc}
 	 */
-	public static function content(array $parameters = [])
+	public function content(): string
 	{
-		$o = '';
-
-		return $o;
+		return '';
 	}
 
 	/**
-	 * Module DELETE method to process submitted data
-	 *
-	 * Extend this method if the module is supposed to process DELETE requests.
-	 * Doesn't display any content
+	 * {@inheritDoc}
 	 */
-	public static function delete(array $parameters = [])
+	public function delete()
 	{
 	}
 
 	/**
-	 * Module PATCH method to process submitted data
-	 *
-	 * Extend this method if the module is supposed to process PATCH requests.
-	 * Doesn't display any content
+	 * {@inheritDoc}
 	 */
-	public static function patch(array $parameters = [])
+	public function patch()
 	{
 	}
 
 	/**
-	 * Module POST method to process submitted data
-	 *
-	 * Extend this method if the module is supposed to process POST requests.
-	 * Doesn't display any content
+	 * {@inheritDoc}
 	 */
-	public static function post(array $parameters = [])
+	public function post()
 	{
 		// DI::baseurl()->redirect('module');
 	}
 
 	/**
-	 * Called after post()
-	 *
-	 * Unknown purpose
+	 * {@inheritDoc}
 	 */
-	public static function afterpost(array $parameters = [])
+	public function put()
 	{
 	}
 
-	/**
-	 * Module PUT method to process submitted data
-	 *
-	 * Extend this method if the module is supposed to process PUT requests.
-	 * Doesn't display any content
-	 */
-	public static function put(array $parameters = [])
+	/** Gets the name of the current class */
+	public function getClassName(): string
 	{
+		return static::class;
 	}
 
 	/*