X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FBaseModule.php;h=61bfe8e8d3d7fbcaf802f39e640f7d59d16b6782;hb=f3ea4a4f45daa41d0aa032b1dc4804a5f6ff503c;hp=0f6fbd785b28369e472afdf8ba1a7dc1b005d113;hpb=f3fc1f36caf9139f8d72611b85849a2b7e6759c3;p=friendica.git

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 0f6fbd785b..61bfe8e8d3 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -3,7 +3,7 @@
 namespace Friendica;
 
 use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Logger;
 
 /**
  * All modules in Friendica should extend BaseModule, although not all modules
@@ -14,7 +14,7 @@ use Friendica\Core\System;
  *
  * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
-abstract class BaseModule extends BaseObject
+abstract class BaseModule
 {
 	/**
 	 * @brief Initialization method common to both content() and post()
@@ -22,7 +22,7 @@ abstract class BaseModule extends BaseObject
 	 * Extend this method if you need to do any shared processing before both
 	 * content() or post()
 	 */
-	public static function init()
+	public static function init(array $parameters = [])
 	{
 	}
 
@@ -32,8 +32,10 @@ abstract class BaseModule extends BaseObject
 	 * Extend this method if the module is supposed to return communication data,
 	 * e.g. from protocol implementations.
 	 */
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
+		// echo '';
+		// exit;
 	}
 
 	/**
@@ -45,7 +47,7 @@ abstract class BaseModule extends BaseObject
 	 *
 	 * @return string
 	 */
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$o = '';
 
@@ -58,9 +60,10 @@ abstract class BaseModule extends BaseObject
 	 * Extend this method if the module is supposed to process POST requests.
 	 * Doesn't display any content
 	 */
-	public static function post()
+	public static function post(array $parameters = [])
 	{
-		// goaway('module');
+		// $a = self::getApp();
+		// $a->internalRedirect('module');
 	}
 
 	/**
@@ -68,9 +71,8 @@ abstract class BaseModule extends BaseObject
 	 *
 	 * Unknown purpose
 	 */
-	public static function afterpost()
+	public static function afterpost(array $parameters = [])
 	{
-
 	}
 
 	/*
@@ -86,7 +88,7 @@ abstract class BaseModule extends BaseObject
 	 */
 	public static function getFormSecurityToken($typename = '')
 	{
-		$a = get_app();
+		$a = DI::app();
 
 		$timestamp = time();
 		$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
@@ -114,10 +116,10 @@ abstract class BaseModule extends BaseObject
 
 		$max_livetime = 10800; // 3 hours
 
-		$a = get_app();
+		$a = DI::app();
 
 		$x = explode('.', $hash);
-		if (time() > (IntVal($x[0]) + $max_livetime)) {
+		if (time() > (intval($x[0]) + $max_livetime)) {
 			return false;
 		}
 
@@ -134,22 +136,22 @@ abstract class BaseModule extends BaseObject
 	public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token')
 	{
 		if (!self::checkFormSecurityToken($typename, $formname)) {
-			$a = get_app();
-			logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
-			logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
-			notice(check_form_security_std_err_msg());
-			goaway(System::baseUrl() . $err_redirect);
+			$a = DI::app();
+			Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
+			Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
+			notice(self::getFormSecurityStandardErrorMessage());
+			DI::baseUrl()->redirect($err_redirect);
 		}
 	}
 
 	public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
 	{
 		if (!self::checkFormSecurityToken($typename, $formname)) {
-			$a = get_app();
-			logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
-			logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
-			header('HTTP/1.1 403 Forbidden');
-			killme();
+			$a = DI::app();
+			Logger::log('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
+			Logger::log('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), Logger::DATA);
+
+			throw new \Friendica\Network\HTTPException\ForbiddenException();
 		}
 	}
 }