Use more Attach model

[friendica.git] / src / BaseModule.php

diff --git a/src/BaseModule.php b/src/BaseModule.php
index 522f0b783fa0f3fa2bcddd7801330ed8b2a118da..85a506beaadb79353ee64a91b9f1f61ada2db285 100644 (file)
--- 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;
 
 /**
@@ -87,7 +88,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);
@@ -115,7 +116,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)) {
@@ -135,9 +136,9 @@ 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('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
-                       logger('checkFormSecurityToken failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
+                       $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);
                }
@@ -146,11 +147,11 @@ abstract class BaseModule extends BaseObject
        public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
        {
                if (!self::checkFormSecurityToken($typename, $formname)) {
-                       $a = get_app();
-                       logger('checkFormSecurityToken failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
-                       logger('checkFormSecurityToken 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);
+
+                       System::httpExit(403);
                }
        }
 }