Merge pull request #6456 from annando/long-url

[friendica.git] / src / BaseModule.php

diff --git a/src/BaseModule.php b/src/BaseModule.php
index bb88b50ba3d64f77ee23d348a4b04bed3cc51f1a..6c14d6ba77aa6b6838c90316cdd30773f2a9460d 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;
 
 /**
@@ -61,7 +62,7 @@ abstract class BaseModule extends BaseObject
        public static function post()
        {
                // $a = self::getApp();
-               // $a->redirect('module');
+               // $a->internalRedirect('module');
        }
 
        /**
@@ -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,20 +136,20 @@ 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());
-                       goaway(System::baseUrl() . $err_redirect);
+                       $a->internalRedirect($err_redirect);
                }
        }
 
        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);
+                       $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();
                }