X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FBaseModule.php;h=5d752bb4f7450065bec2642c8f997fa8f067c91c;hb=ce578a77453fd421e9598c994ef008ad7e128de6;hp=d7ca5798deb61ae48bbc0eabd96a40689d7c6362;hpb=c81e81dc8d96ffc42548fdcd2ca6887a1a847837;p=friendica.git

diff --git a/src/BaseModule.php b/src/BaseModule.php
index d7ca5798de..5d752bb4f7 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,70 @@ use Friendica\Model\User;
  *
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-abstract class BaseModule
+abstract class BaseModule implements ICanHandleRequests
 {
-	/**
-	 * Initialization method common to both content() and post()
-	 *
-	 * Extend this method if you need to do any shared processing before both
-	 * content() or post()
-	 */
-	public static function init(array $parameters = [])
+	/** @var array */
+	protected $parameters = [];
+
+	/** @var L10n */
+	protected $l10n;
+
+	public function __construct(L10n $l10n, array $parameters = [])
 	{
+		$this->parameters = $parameters;
+		$this->l10n       = $l10n;
 	}
 
 	/**
-	 * Module GET method to display raw content from technical endpoints
-	 *
-	 * Extend this method if the module is supposed to return communication data,
-	 * e.g. from protocol implementations.
+	 * {@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;
 	}
 
 	/*
@@ -183,8 +161,8 @@ abstract class BaseModule
 	public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token')
 	{
 		if (!self::checkFormSecurityToken($typename, $formname)) {
-			Logger::log('checkFormSecurityToken failed: user ' . DI::app()->getLoggedInUserNickname() . ' - form element ' . $typename);
-			Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
+			Logger::notice('checkFormSecurityToken failed: user ' . DI::app()->getLoggedInUserNickname() . ' - form element ' . $typename);
+			Logger::debug('checkFormSecurityToken failed', ['request' => $_REQUEST]);
 			notice(self::getFormSecurityStandardErrorMessage());
 			DI::baseUrl()->redirect($err_redirect);
 		}
@@ -193,8 +171,8 @@ abstract class BaseModule
 	public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
 	{
 		if (!self::checkFormSecurityToken($typename, $formname)) {
-			Logger::log('checkFormSecurityToken failed: user ' . DI::app()->getLoggedInUserNickname() . ' - form element ' . $typename);
-			Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
+			Logger::notice('checkFormSecurityToken failed: user ' . DI::app()->getLoggedInUserNickname() . ' - form element ' . $typename);
+			Logger::debug('checkFormSecurityToken failed', ['request' => $_REQUEST]);
 
 			throw new \Friendica\Network\HTTPException\ForbiddenException();
 		}