X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FBaseModule.php;h=5185771d1c51294f0f921c1e13a4cc36bf29a991;hb=c07cb2c8f31154cc424e99c95740d753501e09b7;hp=fe09693b3b6d15897d105cb2ae89b9bd49e22ca4;hpb=8821d33f73785884cfce83e7b23d3ef19cc1bc11;p=friendica.git

diff --git a/src/BaseModule.php b/src/BaseModule.php
index fe09693b3b..5185771d1c 100644
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -4,7 +4,6 @@ namespace Friendica;
 
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 
 /**
  * All modules in Friendica should extend BaseModule, although not all modules
@@ -35,6 +34,8 @@ abstract class BaseModule extends BaseObject
 	 */
 	public static function rawContent()
 	{
+		// echo '';
+		// exit;
 	}
 
 	/**
@@ -88,7 +89,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);
@@ -116,10 +117,10 @@ 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)) {
+		if (time() > (intval($x[0]) + $max_livetime)) {
 			return false;
 		}
 
@@ -136,7 +137,7 @@ abstract class BaseModule extends BaseObject
 	public static function checkFormSecurityTokenRedirectOnError($err_redirect, $typename = '', $formname = 'form_security_token')
 	{
 		if (!self::checkFormSecurityToken($typename, $formname)) {
-			$a = get_app();
+			$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());
@@ -147,11 +148,11 @@ abstract class BaseModule extends BaseObject
 	public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
 	{
 		if (!self::checkFormSecurityToken($typename, $formname)) {
-			$a = get_app();
+			$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);
-			header('HTTP/1.1 403 Forbidden');
-			killme();
+
+			throw new \Friendica\Network\HTTPException\ForbiddenException();
 		}
 	}
 }