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

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 0f6fbd785b..dd9059bfba 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -3,6 +3,7 @@
 namespace Friendica;
 
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\System;
 
 /**
@@ -34,6 +35,8 @@ abstract class BaseModule extends BaseObject
 	 */
 	public static function rawContent()
 	{
+		// echo '';
+		// exit;
 	}
 
 	/**
@@ -60,7 +63,8 @@ abstract class BaseModule extends BaseObject
 	 */
 	public static function post()
 	{
-		// goaway('module');
+		// $a = self::getApp();
+		// $a->internalRedirect('module');
 	}
 
 	/**
@@ -86,7 +90,7 @@ abstract class BaseModule extends BaseObject
 	 */
 	public static function getFormSecurityToken($typename = '')
 	{
-		$a = get_app();
+		$a = \get_app();
 
 		$timestamp = time();
 		$sec_hash = hash('whirlpool', $a->user['guid'] . $a->user['prvkey'] . session_id() . $timestamp . $typename);
@@ -114,7 +118,7 @@ abstract class BaseModule extends BaseObject
 
 		$max_livetime = 10800; // 3 hours
 
-		$a = get_app();
+		$a = \get_app();
 
 		$x = explode('.', $hash);
 		if (time() > (IntVal($x[0]) + $max_livetime)) {
@@ -134,22 +138,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 = \get_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());
+			$a->internalRedirect($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 = \get_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();
 		}
 	}
 }