Stop scrollToItem() animate twice.

[friendica.git] / src / BaseModule.php

diff --git a/src/BaseModule.php b/src/BaseModule.php
index fe09693b3b6d15897d105cb2ae89b9bd49e22ca4..61bfe8e8d3d7fbcaf802f39e640f7d59d16b6782 100644 (file)
--- 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
@@ -15,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()
@@ -23,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 = [])
        {
        }
 
@@ -33,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;
        }
 
        /**
@@ -46,7 +47,7 @@ abstract class BaseModule extends BaseObject
         *
         * @return string
         */
-       public static function content()
+       public static function content(array $parameters = [])
        {
                $o = '';
 
@@ -59,7 +60,7 @@ 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 = [])
        {
                // $a = self::getApp();
                // $a->internalRedirect('module');
@@ -70,9 +71,8 @@ abstract class BaseModule extends BaseObject
         *
         * Unknown purpose
         */
-       public static function afterpost()
+       public static function afterpost(array $parameters = [])
        {
-
        }
 
        /*
@@ -88,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);
@@ -116,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;
                }
 
@@ -136,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();
+                       $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());
-                       $a->internalRedirect($err_redirect);
+                       DI::baseUrl()->redirect($err_redirect);
                }
        }
 
        public static function checkFormSecurityTokenForbiddenOnError($typename = '', $formname = 'form_security_token')
        {
                if (!self::checkFormSecurityToken($typename, $formname)) {
-                       $a = get_app();
+                       $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);
-                       header('HTTP/1.1 403 Forbidden');
-                       killme();
+
+                       throw new \Friendica\Network\HTTPException\ForbiddenException();
                }
        }
 }