Added parameters

diff --git a/src/App/Page.php b/src/App/Page.php
index ea94f9cfef6a73ba37d7bdc08c206ec243447924..de75db32fed95f081c94b2aec89b5e4f081e17dc 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -308,7 +308,7 @@ class Page implements ArrayAccess
                        $arr = ['content' => $content];
                        Hook::callAll($moduleClass . '_mod_content', $arr);
                        $content = $arr['content'];
-                       $arr     = ['content' => call_user_func([$moduleClass, 'content'])];
+                       $arr     = ['content' => call_user_func([$moduleClass, 'content'], [])];
                        Hook::callAll($moduleClass . '_mod_aftercontent', $arr);
                        $content .= $arr['content'];
                } catch (HTTPException $e) {

diff --git a/src/BaseModule.php b/src/BaseModule.php
index e049e9a944f8f12bb59edb8ae81976f07b669e79..3bc2ac9ff277a324d7a6095978596285296bf1d1 100644 (file)
--- a/src/BaseModule.php
+++ b/src/BaseModule.php
@@ -22,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($parameters)
        {
        }
 
@@ -34,8 +34,6 @@ abstract class BaseModule extends BaseObject
         */
        public static function rawContent($parameters)
        {
-               // echo '';
-               // exit;
        }
 
        /**
@@ -47,7 +45,7 @@ abstract class BaseModule extends BaseObject
         *
         * @return string
         */
-       public static function content()
+       public static function content($parameters)
        {
                $o = '';
 
@@ -60,10 +58,8 @@ 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($parameters)
        {
-               // $a = self::getApp();
-               // $a->internalRedirect('module');
        }
 
        /**
@@ -71,9 +67,8 @@ abstract class BaseModule extends BaseObject
         *
         * Unknown purpose
         */
-       public static function afterpost()
+       public static function afterpost($parameters)
        {
-
        }
 
        /*

diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index a0b23a5419d2e2d453f9537468ffbe048aedce5c..7252e7bef34673bcbf6ccbfe8d899ee83c91ef49 100644 (file)
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -35,24 +35,24 @@ class LegacyModule extends BaseModule
                require_once $file_path;
        }
 
-       public static function init()
+       public static function init($parameters)
        {
-               self::runModuleFunction('init');
+               self::runModuleFunction('init', $parameters);
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               return self::runModuleFunction('content');
+               return self::runModuleFunction('content', $parameters);
        }
 
-       public static function post()
+       public static function post($parameters)
        {
-               self::runModuleFunction('post');
+               self::runModuleFunction('post', $parameters);
        }
 
-       public static function afterpost()
+       public static function afterpost($parameters)
        {
-               self::runModuleFunction('afterpost');
+               self::runModuleFunction('afterpost', $parameters);
        }
 
        /**
@@ -62,7 +62,7 @@ class LegacyModule extends BaseModule
         * @return string
         * @throws \Exception
         */
-       private static function runModuleFunction($function_suffix)
+       private static function runModuleFunction($function_suffix, $parameters)
        {
                $function_name = static::$moduleName . '_' . $function_suffix;
 
@@ -70,7 +70,7 @@ class LegacyModule extends BaseModule
                        $a = self::getApp();
                        return $function_name($a);
                } else {
-                       return parent::{$function_suffix}();
+                       return parent::{$function_suffix}($parameters);
                }
        }
 }

diff --git a/src/Module/Acctlink.php b/src/Module/Acctlink.php
index 1c2500a224e6cc6dd0e2fcffa0200650cb8c5694..bef407eb1c87eaa67f281905e61d3bb0b278e998 100644 (file)
--- a/src/Module/Acctlink.php
+++ b/src/Module/Acctlink.php
@@ -11,7 +11,7 @@ use Friendica\Core\System;
  */
 class Acctlink extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $addr = trim($_GET['addr'] ?? '');
 

diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php
index 1965102f03ef5fe4d8abac2420baf47a96d5d0c8..7508cdbf69c6c517341331ad9b7f737c9cc6875a 100644 (file)
--- a/src/Module/Admin/Addons/Details.php
+++ b/src/Module/Admin/Addons/Details.php
@@ -11,9 +11,9 @@ use Friendica\Util\Strings;
 
 class Details extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                $a = self::getApp();
 
@@ -35,9 +35,9 @@ class Details extends BaseAdminModule
                $a->internalRedirect('admin/addons');
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php
index eed47defb4a973fc43581f080de1930040072848..645bd431e3f76cfdb7f8b3b197d3883e0b5e2e40 100644 (file)
--- a/src/Module/Admin/Addons/Index.php
+++ b/src/Module/Admin/Addons/Index.php
@@ -9,9 +9,9 @@ use Friendica\Module\BaseAdminModule;
 
 class Index extends BaseAdminModule
 {
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php
index bf1c7bc081d86cfec1dacb12a2c681dbbeb130bb..b0707fc70c572940ea4bce11cd88f251365b6a33 100644 (file)
--- a/src/Module/Admin/Blocklist/Contact.php
+++ b/src/Module/Admin/Blocklist/Contact.php
@@ -11,9 +11,9 @@ use Friendica\Model;
 
 class Contact extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                $contact_url  = $_POST['contact_url'] ?? '';
                $block_reason = $_POST['contact_block_reason'] ?? '';
@@ -41,9 +41,9 @@ class Contact extends BaseAdminModule
                self::getApp()->internalRedirect('admin/blocklist/contact');
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php
index 384e346b0d67c5db1f26d6d2163e48b8a1688e7d..a8c2fd812d8c4fd5727300b45d971db047352217 100644 (file)
--- a/src/Module/Admin/Blocklist/Server.php
+++ b/src/Module/Admin/Blocklist/Server.php
@@ -10,9 +10,9 @@ use Friendica\Util\Strings;
 
 class Server extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                if (empty($_POST['page_blocklist_save']) && empty($_POST['page_blocklist_edit'])) {
                        return;
@@ -50,9 +50,9 @@ class Server extends BaseAdminModule
                self::getApp()->internalRedirect('admin/blocklist/server');
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index 4c29eea34f550e15bb64c72dcc457096dc93c054..38c3970580d699d60bee84cc693286d7d5032fcf 100644 (file)
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -12,9 +12,9 @@ use Friendica\Module\BaseAdminModule;
 
 class DBSync extends BaseAdminModule
 {
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php
index 328e7e68b57c1e2d91d5c3fa32df7972a995d6be..2523c4af1344565a2a9a69a0e2d1d8ee98cf27c6 100644 (file)
--- a/src/Module/Admin/Features.php
+++ b/src/Module/Admin/Features.php
@@ -10,9 +10,9 @@ use Friendica\Module\BaseAdminModule;
 
 class Features extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                parent::checkFormSecurityTokenRedirectOnError('/admin/features', 'admin_manage_features');
 
@@ -42,9 +42,9 @@ class Features extends BaseAdminModule
                self::getApp()->internalRedirect('admin/features');
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $arr = [];
                $features = Feature::get(false);

diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index 8776f21e194bacd7b881ce96edb8bc1444faf005..2bc15d8ae6d1f75085fbeb8ba3a09764a4dd4a08 100644 (file)
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -10,9 +10,9 @@ use Friendica\Module\BaseAdminModule;
 
 class Federation extends BaseAdminModule
 {
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                // get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
                // social and statusnet nodes this node is knowing

diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php
index 766e65c9a0eeccc38c2b9060fd7a2901869c61d3..3616b3d2f613e21dba8bdbcd9fe97c7a7190e425 100644 (file)
--- a/src/Module/Admin/Item/Delete.php
+++ b/src/Module/Admin/Item/Delete.php
@@ -10,9 +10,9 @@ use Friendica\Util\Strings;
 
 class Delete extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                if (empty($_POST['page_deleteitem_submit'])) {
                        return;
@@ -36,9 +36,9 @@ class Delete extends BaseAdminModule
                self::getApp()->internalRedirect('admin/item/delete');
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $t = Renderer::getMarkupTemplate('admin/item/delete.tpl');
 

diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php
index 6da9eec6d320da91c94dc261f1db3e3abacd034e..78953fd07087bff272b2fae49a3bd95903b9225a 100644 (file)
--- a/src/Module/Admin/Item/Source.php
+++ b/src/Module/Admin/Item/Source.php
@@ -13,9 +13,9 @@ use Friendica\Module\BaseAdminModule;
 class Source extends BaseAdminModule
 
 {
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php
index be060e05359baf2012ffa540e62ef1a41ad918fe..b731dd0d6e84e21c148b7e137e82e45e7c1d1d0b 100644 (file)
--- a/src/Module/Admin/Logs/Settings.php
+++ b/src/Module/Admin/Logs/Settings.php
@@ -11,9 +11,9 @@ use Psr\Log\LogLevel;
 
 class Settings extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                if (!empty($_POST['page_logs'])) {
                        parent::checkFormSecurityTokenRedirectOnError('/admin/logs', 'admin_logs');
@@ -37,9 +37,9 @@ class Settings extends BaseAdminModule
                self::getApp()->internalRedirect('admin/logs');
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php
index b66a6781e50836cc9dbfb5a32606dc0a8e0fe1c0..7feee32bef574e8df843f6c2b13cf6c529dcb97f 100644 (file)
--- a/src/Module/Admin/Logs/View.php
+++ b/src/Module/Admin/Logs/View.php
@@ -10,9 +10,9 @@ use Friendica\Util\Strings;
 
 class View extends BaseAdminModule
 {
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $t = Renderer::getMarkupTemplate('admin/logs/view.tpl');
                $f = Config::get('system', 'logfile');

diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index aadd5b768d42fb9ce5928ce107d9026496134bef..9b4241a8a82a8d03d4dad0546abb58e2530c481b 100644 (file)
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -19,9 +19,9 @@ use Friendica\Util\DateTimeFormat;
  */
 class Queue extends BaseAdminModule
 {
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 18a1cbf2a835f5d214e1731a478945c52672e492..bfb4659aa8cf9389391921b0ed7d9a59460123c4 100644 (file)
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -21,9 +21,9 @@ require_once __DIR__ . '/../../../boot.php';
 
 class Site extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                self::checkFormSecurityTokenRedirectOnError('/admin/site', 'admin_site');
 
@@ -412,9 +412,9 @@ class Site extends BaseAdminModule
                $a->internalRedirect('admin/site' . $active_panel);
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index cfd9aa984041edc7e2d7ed389601f9be3e27eeef..24e1cc58458c0b64b5fc96b01ec46051a9cedc58 100644 (file)
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -20,9 +20,9 @@ use Friendica\Util\Network;
 
 class Summary extends BaseAdminModule
 {
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php
index 3750e96070ad9fd7514f63f34c8adc1c3f49ef76..45f9239aa19fb2e66e54165cf224971888a434de 100644 (file)
--- a/src/Module/Admin/Themes/Details.php
+++ b/src/Module/Admin/Themes/Details.php
@@ -11,9 +11,9 @@ use Friendica\Util\Strings;
 
 class Details extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                $a = self::getApp();
 
@@ -39,9 +39,9 @@ class Details extends BaseAdminModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php
index 904d9eb46e8dcc1f6098b624c745bdba0388e1eb..dc4b6f136e6ee69d4f0858d5361c2cfb7041ff1e 100644 (file)
--- a/src/Module/Admin/Themes/Embed.php
+++ b/src/Module/Admin/Themes/Embed.php
@@ -9,7 +9,7 @@ use Friendica\Util\Strings;
 
 class Embed extends BaseAdminModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                $a = self::getApp();
 
@@ -23,9 +23,9 @@ class Embed extends BaseAdminModule
                }
        }
 
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                $a = self::getApp();
 
@@ -53,9 +53,9 @@ class Embed extends BaseAdminModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php
index af2d1f28e11e0ae91e6b90ab79d2afaf93251c8c..331f4c477deb0e37f59a5f1f39f296ac8fa8032f 100644 (file)
--- a/src/Module/Admin/Themes/Index.php
+++ b/src/Module/Admin/Themes/Index.php
@@ -11,9 +11,9 @@ use Friendica\Util\Strings;
 
 class Index extends BaseAdminModule
 {
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
index 4eb6e3426c477358567d034f87dbf2667709e5b4..3e6a25f4651e505f78fd1747192a7c7510563c60 100644 (file)
--- a/src/Module/Admin/Tos.php
+++ b/src/Module/Admin/Tos.php
@@ -9,9 +9,9 @@ use Friendica\Module\BaseAdminModule;
 
 class Tos extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                parent::checkFormSecurityTokenRedirectOnError('/admin/tos', 'admin_tos');
 
@@ -32,9 +32,9 @@ class Tos extends BaseAdminModule
                self::getApp()->internalRedirect('admin/tos');
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $tos = new \Friendica\Module\Tos();
                $t = Renderer::getMarkupTemplate('admin/tos.tpl');

diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index a949c9331b51c37df41e8196850dcce11f115767..592b49495af4ae05a3e7e2a696655a35038da53b 100644 (file)
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -15,9 +15,9 @@ use Friendica\Util\Temporal;
 
 class Users extends BaseAdminModule
 {
-       public static function post()
+       public static function post($parameters)
        {
-               parent::post();
+               parent::post($parameters);
 
                $a = self::getApp();
 
@@ -131,9 +131,9 @@ class Users extends BaseAdminModule
                $a->internalRedirect('admin/users');
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                $a = self::getApp();
 

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index e5fbe697128d576374fd6fed2d9b2e75da3ee3ab..76453a02c3574d543b94e798feea7f02df950ed6 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -16,7 +16,7 @@ use Friendica\Util\Proxy as ProxyUtils;
  */
 class AllFriends extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $app = self::getApp();
 

diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index efba071aa3010b3a3cd5f6a0b345401136053b49..940bf6b641b2805baa936096b8c79975215b29cc 100644 (file)
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -13,7 +13,7 @@ use Friendica\Core\Renderer;
  */
 class Apps extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                $privateaddons = Config::get('config', 'private_addons');
                if ($privateaddons === "1" && !local_user()) {
@@ -21,7 +21,7 @@ class Apps extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                $apps = Nav::getAppMenu();
 

diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php
index 61b3b4ff9fbabf3a53472f4fb04c28fc96c25a13..30c3766640e9fcd8fd98ac3032e55176bb6c6651 100644 (file)
--- a/src/Module/BaseAdminModule.php
+++ b/src/Module/BaseAdminModule.php
@@ -23,7 +23,7 @@ require_once 'boot.php';
  */
 abstract class BaseAdminModule extends BaseModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                if (!is_site_admin()) {
                        return;
@@ -48,7 +48,7 @@ abstract class BaseAdminModule extends BaseModule
                return '';
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/BaseSettingsModule.php b/src/Module/BaseSettingsModule.php
index 4b5e9bf9150c997efe5f1444449baf8cc9c45d6b..6a58ecfe40a46647b3437143d63c46c33b912236 100644 (file)
--- a/src/Module/BaseSettingsModule.php
+++ b/src/Module/BaseSettingsModule.php
@@ -9,7 +9,7 @@ use Friendica\Core\Renderer;
 
 class BaseSettingsModule extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index 92130eeff1510d7adc5c5707db9525aaf2379c54..2b0b198814a7dd059bbaf98aa7bd81945241585a 100644 (file)
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -14,7 +14,7 @@ use Friendica\Util\Strings;
  */
 class Bookmarklet extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $_GET['mode'] = 'minimal';
 

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index c8bbbfe2e69a1d45b9467670375fd235d14e682e..2c5428e0b5c90fc9be2f1c2a6b2347190d3f49c3 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -75,7 +75,7 @@ class Contact extends BaseModule
                $a->internalRedirect('contact');
        }
 
-       public static function post()
+       public static function post($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Credits.php b/src/Module/Credits.php
index b0a6545c38b0ca8d875595657353d1f97d1a7f52..5abe1601ea89498ab977439967bf214c93a55462 100644 (file)
--- a/src/Module/Credits.php
+++ b/src/Module/Credits.php
@@ -13,7 +13,7 @@ use Friendica\Core\Renderer;
  */
 class Credits extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                /* fill the page with credits */
                $credits_string = file_get_contents('CREDITS.txt');

diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php
index cf1f869552e6116b0c3bb097c97120bdafdb5851..e1a8b694bd6ec6932231bfcff422a16dca60494f 100644 (file)
--- a/src/Module/Debug/Babel.php
+++ b/src/Module/Debug/Babel.php
@@ -14,7 +14,7 @@ use Friendica\Util\XML;
  */
 class Babel extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                function visible_whitespace($s)
                {

diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index cc0be643b3030b858230b3248d8c9ed1af9f7e1a..1583b3c88279b625cc7de8d018370d917bff1341 100644 (file)
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.php
@@ -14,7 +14,7 @@ use Friendica\Util\Network;
  */
 class Feed extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                if (!local_user()) {
                        info(L10n::t('You must be logged in to use this module'));
@@ -22,7 +22,7 @@ class Feed extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                $result = [];
                if (!empty($_REQUEST['url'])) {

diff --git a/src/Module/Debug/ItemBody.php b/src/Module/Debug/ItemBody.php
index fead2553585bf6162665c64ba0f82a2ecc8f7d76..a2cf8df6bff685c540f312dae9cf6a83b4fa48e2 100644 (file)
--- a/src/Module/Debug/ItemBody.php
+++ b/src/Module/Debug/ItemBody.php
@@ -12,7 +12,7 @@ use Friendica\Network\HTTPException;
  */
 class ItemBody extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        throw new HTTPException\UnauthorizedException(L10n::t('Access denied.'));

diff --git a/src/Module/Debug/Localtime.php b/src/Module/Debug/Localtime.php
index 197149837ae5f161f2e4d6caaf1b271b669b3921..8c3eac8b6159578061ea0820bbf3fe46f6a28aa1 100644 (file)
--- a/src/Module/Debug/Localtime.php
+++ b/src/Module/Debug/Localtime.php
@@ -10,7 +10,7 @@ use Friendica\Util\Temporal;
 
 class Localtime extends BaseModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                $time = ($_REQUEST['time'] ?? '') ?: 'now';
 
@@ -21,7 +21,7 @@ class Localtime extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                $app = self::getApp();
 

diff --git a/src/Module/Debug/Probe.php b/src/Module/Debug/Probe.php
index 6762c5b82c99bc87bba154da10d283338ad5334e..a5785e1aa749f4a3de06d01b5e5a21e0385014e0 100644 (file)
--- a/src/Module/Debug/Probe.php
+++ b/src/Module/Debug/Probe.php
@@ -13,7 +13,7 @@ use Friendica\Network\Probe as NetworkProbe;
  */
 class Probe extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        $e           = new HTTPException\ForbiddenException(L10n::t('Only logged in users are permitted to perform a probing.'));

diff --git a/src/Module/Debug/WebFinger.php b/src/Module/Debug/WebFinger.php
index 18cf4bb2a7386cbc86df382b8265a5097bf80d09..2b2ebacbf59d870752465d95a95ef96bc9c30f6a 100644 (file)
--- a/src/Module/Debug/WebFinger.php
+++ b/src/Module/Debug/WebFinger.php
@@ -12,7 +12,7 @@ use Friendica\Network\Probe;
  */
 class WebFinger extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        $e           = new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Only logged in users are permitted to perform a probing.'));

diff --git a/src/Module/Delegation.php b/src/Module/Delegation.php
index 77baefeaa5871321adfd47418476c4c1ad0872a8..46dc7025ee9fd8600cdc0b033dcf0a6774c50ac0 100644 (file)
--- a/src/Module/Delegation.php
+++ b/src/Module/Delegation.php
@@ -17,7 +17,7 @@ use Friendica\Network\HTTPException\ForbiddenException;
  */
 class Delegation extends BaseModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user()) {
                        return;
@@ -92,7 +92,7 @@ class Delegation extends BaseModule
                // NOTREACHED
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        throw new ForbiddenException(L10n::t('Permission denied.'));

diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php
index c787b5f97068d0164319aba888e7c3149f5c5509..d487ab63e5e83782c3c015412270f13709a2062d 100644 (file)
--- a/src/Module/Diaspora/Receive.php
+++ b/src/Module/Diaspora/Receive.php
@@ -21,13 +21,13 @@ class Receive extends BaseModule
        /** @var LoggerInterface */
        private static $logger;
 
-       public static function init()
+       public static function init($parameters)
        {
                /** @var LoggerInterface $logger */
                self::$logger = self::getClass(LoggerInterface::class);
        }
 
-       public static function post()
+       public static function post($parameters)
        {
                /** @var Configuration $config */
                $config = self::getClass(Configuration::class);

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 1cdd971e8ac21c8753c0b158112b16635473b46d..c8523148ff1cb7a94669583ff8ef421313a1354e 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -21,7 +21,7 @@ use Friendica\Util\Strings;
  */
 class Directory extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $app = self::getApp();
                $config = $app->getConfig();

diff --git a/src/Module/Feed.php b/src/Module/Feed.php
index 49ecfed96c166cd6d6676f77816ec1a100e77e43..70974e61f1c2b40f510bab6ef13a4a11a57b4fe9 100644 (file)
--- a/src/Module/Feed.php
+++ b/src/Module/Feed.php
@@ -23,7 +23,7 @@ use Friendica\Protocol\OStatus;
  */
 class Feed extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Filer/RemoveTag.php b/src/Module/Filer/RemoveTag.php
index 1dcc2e41e20a0f3a2a2b67bcc4d54c0e1f64bcb2..09284bec2eaca8a426490e19cb00f22579b29b95 100644 (file)
--- a/src/Module/Filer/RemoveTag.php
+++ b/src/Module/Filer/RemoveTag.php
@@ -12,7 +12,7 @@ use Friendica\Util\XML;
  */
 class RemoveTag extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        throw new HTTPException\ForbiddenException();

diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index 14eb368baab3f1cd902cfdf68e62c78051cbceba..1db3384ca5eed51977465a0f3c0a55b12ebe1916 100644 (file)
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -14,7 +14,7 @@ use Friendica\Util\XML;
  */
 class SaveTag extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                if (!local_user()) {
                        info(L10n::t('You must be logged in to use this module'));

diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php
index f4f2a877c4f55fb1833f443ead4ebf0b304b3f44..66ca661856ba65234153ebb9c4258eb0a223c847 100644 (file)
--- a/src/Module/FollowConfirm.php
+++ b/src/Module/FollowConfirm.php
@@ -18,7 +18,7 @@ use Friendica\Util\DateTimeFormat;
  */
 class FollowConfirm extends BaseModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php
index cadacb48b38dbad869d958d506e19a18426b940a..deb17b3859f678a1f939bc8f70353527f6747d6f 100644 (file)
--- a/src/Module/Friendica.php
+++ b/src/Module/Friendica.php
@@ -15,7 +15,7 @@ use Friendica\Model\User;
  */
 class Friendica extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $app = self::getApp();
                $config = $app->getConfig();

diff --git a/src/Module/Group.php b/src/Module/Group.php
index d8d5fb1c592086e9e2574fb246fbdf8eb08a5992..6368690efd85c460a37f16e6f8796338a12ea737 100644 (file)
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -19,7 +19,7 @@ require_once 'boot.php';
 
 class Group extends BaseModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                $a = self::getApp();
 
@@ -132,7 +132,7 @@ class Group extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                $change = false;
 

diff --git a/src/Module/HTTPException/MethodNotAllowed.php b/src/Module/HTTPException/MethodNotAllowed.php
index 8d2d280a59385060052423671088aa6f242ea1c7..3e5d159e702923738982d1dc3ba581d05131ddda 100644 (file)
--- a/src/Module/HTTPException/MethodNotAllowed.php
+++ b/src/Module/HTTPException/MethodNotAllowed.php
@@ -8,7 +8,7 @@ use Friendica\Network\HTTPException;
 
 class MethodNotAllowed extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                throw new HTTPException\MethodNotAllowedException(L10n::t('Method Not Allowed.'));
        }

diff --git a/src/Module/HTTPException/PageNotFound.php b/src/Module/HTTPException/PageNotFound.php
index d848905c5e2e4857b5b6b213202a403fa5f95ad9..90192efca16dc4fa6520fc9f55b1493cfd3e1786 100644 (file)
--- a/src/Module/HTTPException/PageNotFound.php
+++ b/src/Module/HTTPException/PageNotFound.php
@@ -8,7 +8,7 @@ use Friendica\Network\HTTPException;
 
 class PageNotFound extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                throw new HTTPException\NotFoundException(L10n::t('Page not found.'));
        }

diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php
index 411da5ce5eafd0300b0a1d38eb318d59acb53792..8708a464a9e3d09069f174e8986ba031b373117f 100644 (file)
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -15,7 +15,7 @@ use Friendica\Util\Strings;
 class Hashtag extends BaseModule
 {
 
-       public static function content()
+       public static function content($parameters)
        {
                $result = [];
 

diff --git a/src/Module/Help.php b/src/Module/Help.php
index ddf5b06d8337398015598897d4df0ae591367623..ae5100d63345d8dc078f1a2e070be35506d455ee 100644 (file)
--- a/src/Module/Help.php
+++ b/src/Module/Help.php
@@ -14,7 +14,7 @@ use Friendica\Util\Strings;
  */
 class Help extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                Nav::setSelected('help');
 

diff --git a/src/Module/Home.php b/src/Module/Home.php
index 5a1dccde2a7bd0e47c3e8dc55941454d3ff6949f..5e9c28af1dffba9da5cd46fb65602024289c6970 100644 (file)
--- a/src/Module/Home.php
+++ b/src/Module/Home.php
@@ -12,7 +12,7 @@ use Friendica\Core\Renderer;
  */
 class Home extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $app = self::getApp();
                $config = $app->getConfig();

diff --git a/src/Module/Install.php b/src/Module/Install.php
index 39d6a062afd438cb47437da531660251e4117f14..f4e2c4c76fcc3e35421dcd4ae768ce0387d34710 100644 (file)
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -46,7 +46,7 @@ class Install extends BaseModule
         */
        private static $installer;
 
-       public static function init()
+       public static function init($parameters)
        {
                $a = self::getApp();
 
@@ -76,7 +76,7 @@ class Install extends BaseModule
                self::$currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK;
        }
 
-       public static function post()
+       public static function post($parameters)
        {
                $a           = self::getApp();
                $configCache = $a->getConfigCache();
@@ -149,7 +149,7 @@ class Install extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                $a           = self::getApp();
                $configCache = $a->getConfigCache();

diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index 7860c703c116239074ba0de762993f476a9147cf..162d4489d7ed9daaa7780c45418a3983730d86da 100644 (file)
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -16,7 +16,7 @@ use Friendica\Util\Strings;
  */
 class Invite extends BaseModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user()) {
                        throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));
@@ -104,7 +104,7 @@ class Invite extends BaseModule
                notice(L10n::tt('%d message sent.', '%d messages sent.', $total) . EOL);
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index c44e4c61ab8f66eef3afc77276f43569fa2a9d19..1a88ebbc58accb8cf95a2b87069573ac633d2e4d 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.php
@@ -21,7 +21,7 @@ use Friendica\Util\Crypto;
 
 class Compose extends BaseModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                if (!empty($_REQUEST['body'])) {
                        $_REQUEST['return'] = 'network';
@@ -32,7 +32,7 @@ class Compose extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        return Login::form('compose', false);

diff --git a/src/Module/Login.php b/src/Module/Login.php
index 0048fefaaebcb6a638b2b344bb082c4aa2d21175..4cdac27aeabf1aaece18ed58307bb2a3aadf4a10 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -30,7 +30,7 @@ use LightOpenID;
  */
 class Login extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $a = self::getApp();
 
@@ -41,7 +41,7 @@ class Login extends BaseModule
                return self::form(Session::get('return_path'), intval(Config::get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED);
        }
 
-       public static function post()
+       public static function post($parameters)
        {
                $openid_identity = Session::get('openid_identity');
                $openid_server = Session::get('openid_server');

diff --git a/src/Module/Logout.php b/src/Module/Logout.php
index bf6a39e19f961a55a38a64b2e9d8ee5a4ecaa77c..ad7eac6b51ff9efff75cd42aae7eb2a8aa002b40 100644 (file)
--- a/src/Module/Logout.php
+++ b/src/Module/Logout.php
@@ -23,7 +23,7 @@ class Logout extends BaseModule
        /**
         * @brief Process logout requests
         */
-       public static function init()
+       public static function init($parameters)
        {
                $visitor_home = null;
                if (remote_user()) {

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index b04ea80c04bdd73f84ae90a4b515fa7f02c05dd5..43c17d72594b81229721146288d2af30fddc21b5 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -20,7 +20,7 @@ use Friendica\Util\Strings;
  */
 class Magic extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                $a = self::getApp();
                $ret = ['success' => false, 'url' => '', 'message' => ''];

diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php
index 24140bb3512e981cdfb6e466e86043357d3d6eb7..0a7b67cf80c7c18e8e6e4c61f2b9b5577c2691ef 100644 (file)
--- a/src/Module/Maintenance.php
+++ b/src/Module/Maintenance.php
@@ -14,7 +14,7 @@ use Friendica\Util\Strings;
  */
 class Maintenance extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $config = self::getApp()->getConfig();
 

diff --git a/src/Module/NodeInfo.php b/src/Module/NodeInfo.php
index f4ecc5da6879f166807e8ef04c76bb237ffeac80..22e26e97a48bd16e3a5ffead32980c86f9a0cef6 100644 (file)
--- a/src/Module/NodeInfo.php
+++ b/src/Module/NodeInfo.php
@@ -13,7 +13,7 @@ use Friendica\Core\System;
  */
 class NodeInfo extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                $config = self::getApp()->getConfig();
 

diff --git a/src/Module/Notifications/Notify.php b/src/Module/Notifications/Notify.php
index 360204d94bf2d30eaafc604eb468eaf100b25ffc..28047c698932c41563b549dad8ac88e76f407fe3 100644 (file)
--- a/src/Module/Notifications/Notify.php
+++ b/src/Module/Notifications/Notify.php
@@ -14,7 +14,7 @@ use Friendica\Network\HTTPException;
  */
 class Notify extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                if (!local_user()) {
                        throw new HTTPException\UnauthorizedException(L10n::t('Permission denied.'));
@@ -45,7 +45,7 @@ class Notify extends BaseModule
         * @return string|void
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function content()
+       public static function content($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php
index 0107782122b5c0c877025d09805eca4a22794315..e31fde6313ccf6cb07377d774532c641e9b2e582 100644 (file)
--- a/src/Module/Oembed.php
+++ b/src/Module/Oembed.php
@@ -17,7 +17,7 @@ use Friendica\Util\Strings;
  */
 class Oembed extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Owa.php b/src/Module/Owa.php
index 7243c111344b4d159e5fa6d5a86b701936ecd241..a8c980373d0998175a81ceed510e539b224e7faf 100644 (file)
--- a/src/Module/Owa.php
+++ b/src/Module/Owa.php
@@ -27,7 +27,7 @@ use Friendica\Util\Strings;
  */
 class Owa extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
 
                $ret = [ 'success' => false ];

diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index 4ec4f204c3c4efee2973ca7f94454fbe479ba9a9..58199a08da763aeb2794648cce5f9dd8b46e8398 100644 (file)
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -23,7 +23,7 @@ class Photo extends BaseModule
         * Fetch a photo or an avatar, in optional size, check for permissions and
         * return the image
         */
-       public static function init()
+       public static function init($parameters)
        {
                $a = self::getApp();
                // @TODO: Replace with parameter from router

diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index ab2fad2e2f88a0b7286ae81a3a2241c4164e13b7..527c7118e9de445a018d2dd35df66c0405d438ab 100644 (file)
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -33,7 +33,7 @@ class Profile extends BaseModule
        public static $which = '';
        public static $profile = 0;
 
-       public static function init()
+       public static function init($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 1bf88d7c5b820b7da0741f0674d7d5740cc057e7..3df256b9d5f9c28d3d304ba6a69cc8870326bb26 100644 (file)
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -18,7 +18,7 @@ use Friendica\Util\Proxy as ProxyUtils;
 
 class Contacts extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
                        throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('User not found.'));

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 2b8ad01ddadfd9cd89346ceec962350850845ff5..17509f662d6d6e70cbe20546dbcd320e8efd34ef 100644 (file)
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -30,7 +30,7 @@ class Proxy extends BaseModule
         * Sets application instance and checks if /proxy/ path is writable.
         *
         */
-       public static function init()
+       public static function init($parameters)
        {
                // Set application instance here
                $a = self::getApp();

diff --git a/src/Module/RandomProfile.php b/src/Module/RandomProfile.php
index 3ecaa54b7607bc51f32099997380cd47defc64bc..8edc43bf0cf7e07d30d136d2a0c9b99993850309 100644 (file)
--- a/src/Module/RandomProfile.php
+++ b/src/Module/RandomProfile.php
@@ -11,7 +11,7 @@ use Friendica\Model\GContact;
  */
 class RandomProfile extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Register.php b/src/Module/Register.php
index 0837b5706edf8099d8201acbdbd37e260e11910c..6993415e66d493c932070582b03928df8c181cd7 100644 (file)
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -35,7 +35,7 @@ class Register extends BaseModule
         *
         * @return string
         */
-       public static function content()
+       public static function content($parameters)
        {
                // logged in users can register others (people/pages/groups)
                // even with closed registrations, unless specifically prohibited by site policy.
@@ -152,7 +152,7 @@ class Register extends BaseModule
         * 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($parameters)
        {
                BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 

diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php
index 405fb0cc8246c313b914526420ddcf7c7ae9ed50..c6734ac87c2769adcbfe7f7d0fa4c437dbf4d372 100644 (file)
--- a/src/Module/Search/Directory.php
+++ b/src/Module/Search/Directory.php
@@ -13,7 +13,7 @@ use Friendica\Util\Strings;
  */
 class Directory extends BaseSearchModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        notice(L10n::t('Permission denied.'));

diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 73de090a71acb429e32100ff67d66e607e116074..6f0f21f62a83050b0dcd854e38abe608826356df 100644 (file)
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -23,7 +23,7 @@ use Friendica\Util\Strings;
 
 class Index extends BaseSearchModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $search = (!empty($_GET['q']) ? Strings::escapeTags(trim(rawurldecode($_GET['q']))) : '');
 

diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php
index 9d8d84b55a9bb10337af8801500435e1e36f723a..42429c47bd226380b59c3b31f610601199c62b83 100644 (file)
--- a/src/Module/Search/Saved.php
+++ b/src/Module/Search/Saved.php
@@ -10,7 +10,7 @@ use Friendica\Util\Strings;
 
 class Saved extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                /** @var Arguments $args */
                $args = self::getClass(Arguments::class);

diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php
index f7edc72c946b84027a4a5ebf162afc0d2f81578a..8048d3bf8f87369e6e731d30962b444cd43998ba 100644 (file)
--- a/src/Module/Settings/Delegation.php
+++ b/src/Module/Settings/Delegation.php
@@ -20,7 +20,7 @@ use Friendica\Util\Strings;
  */
 class Delegation extends BaseSettingsModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user() || !empty(self::getApp()->user['uid']) && self::getApp()->user['uid'] != local_user()) {
                        throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));
@@ -46,9 +46,9 @@ class Delegation extends BaseSettingsModule
                DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]);
        }
 
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                if (!local_user()) {
                        throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));

diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index c62b0bbff0e00851797ccfc036312b00bcf0472f..720fb9a8312353625a5462fa00fbe232bc943f2e 100644 (file)
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -20,7 +20,7 @@ class AppSpecific extends BaseSettingsModule
 {
        private static $appSpecificPassword = null;
 
-       public static function init()
+       public static function init($parameters)
        {
                if (!local_user()) {
                        return;
@@ -38,7 +38,7 @@ class AppSpecific extends BaseSettingsModule
                }
        }
 
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user()) {
                        return;
@@ -81,13 +81,13 @@ class AppSpecific extends BaseSettingsModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        return Login::form('settings/2fa/app_specific');
                }
 
-               parent::content();
+               parent::content($parameters);
 
                $appSpecificPasswords = AppSpecificPassword::getListForUser(local_user());
 

diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index e7694225c43f9bb3ef607e42bc7bf50d838c1a80..9a661ef731fbd28e15355b392acbe276b0cabfe3 100644 (file)
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -17,7 +17,7 @@ use PragmaRX\Google2FA\Google2FA;
 
 class Index extends BaseSettingsModule
 {
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user()) {
                        return;
@@ -73,13 +73,13 @@ class Index extends BaseSettingsModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        return Login::form('settings/2fa');
                }
 
-               parent::content();
+               parent::content($parameters);
 
                $has_secret = (bool) PConfig::get(local_user(), '2fa', 'secret');
                $verified = PConfig::get(local_user(), '2fa', 'verified');

diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index 6937fa503f4eec65a0bc3bfe92cb8fff668d84c5..b3155f6e9e257555af3e5977ffcf49be797dabb2 100644 (file)
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -18,7 +18,7 @@ use Friendica\Module\Login;
  */
 class Recovery extends BaseSettingsModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                if (!local_user()) {
                        return;
@@ -36,7 +36,7 @@ class Recovery extends BaseSettingsModule
                }
        }
 
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user()) {
                        return;
@@ -53,13 +53,13 @@ class Recovery extends BaseSettingsModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        return Login::form('settings/2fa/recovery');
                }
 
-               parent::content();
+               parent::content($parameters);
 
                if (!RecoveryCode::countValidForUser(local_user())) {
                        RecoveryCode::generateForUser(local_user());

diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index b9205852d835199170a6ac79c2a14d2c5d91ebcd..3957a5350a97bbafc0d4101f578e438212500831 100644 (file)
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -24,7 +24,7 @@ use PragmaRX\Google2FA\Google2FA;
  */
 class Verify extends BaseSettingsModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                if (!local_user()) {
                        return;
@@ -43,7 +43,7 @@ class Verify extends BaseSettingsModule
                }
        }
 
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user()) {
                        return;
@@ -69,13 +69,13 @@ class Verify extends BaseSettingsModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        return Login::form('settings/2fa/verify');
                }
 
-               parent::content();
+               parent::content($parameters);
 
                $company = 'Friendica';
                $holder = Session::get('my_address');

diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index 9c4e4913cfdfdedbbcb4cb3418733ca64eb893ae..c571be2505c00b538bfcf9ce06f8e3ba68c95687 100644 (file)
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -32,9 +32,9 @@ class UserExport extends BaseSettingsModule
         * If there is an action required through the URL / path, react
         * accordingly and export the requested data.
         **/
-       public static function content()
+       public static function content($parameters)
        {
-               parent::content();
+               parent::content($parameters);
 
                /**
                 * options shown on "Export personal data" page

diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php
index 9a81a888e907840fffda24840dcb8788dc825479..a2b91f54de9d18c07d9d18365d2091a49db6c47d 100644 (file)
--- a/src/Module/Smilies.php
+++ b/src/Module/Smilies.php
@@ -26,7 +26,7 @@ class Smilies extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                $smilies = Content\Smilies::getList();
                $count = count($smilies['texts'] ?? []);

diff --git a/src/Module/Starred.php b/src/Module/Starred.php
index 5c79c4fac87344cb99ac0a9686260dc9cd8101e9..1aab10307ddcd0a989c3e2448c1d7152daacb940 100644 (file)
--- a/src/Module/Starred.php
+++ b/src/Module/Starred.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Model\Item;
-use Friendica\Core\System;
 
 /**
  * Toggle starred items
@@ -28,7 +27,7 @@ class Starred extends BaseModule
                        exit();
                }
 
-               $starred = !$item['starred'];
+               $starred = !(bool)$item['starred'];
 
                Item::update(['starred' => $starred], ['id' => $itemId]);
 
@@ -40,6 +39,7 @@ class Starred extends BaseModule
                }
 
                // the json doesn't really matter, it will either be 0 or 1
-               System::jsonExit($starred);
+               echo json_encode((int)$starred);
+               exit();
        }
 }

diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php
index 7400943237b558e368caafa4b17c20bf77d35708..53f9acf95fcddbf3f88b0c7ed722dc26cab0f776 100644 (file)
--- a/src/Module/Statistics.php
+++ b/src/Module/Statistics.php
@@ -8,7 +8,7 @@ use Friendica\Core\System;
 
 class Statistics extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                $config = self::getApp()->getConfig();
 

diff --git a/src/Module/ToggleMobile.php b/src/Module/ToggleMobile.php
index 9788c0b5db40700021a07aa7c65a84bfb46ac85c..07e6fd87d12b9a07c02c90dd6834497d584dda61 100644 (file)
--- a/src/Module/ToggleMobile.php
+++ b/src/Module/ToggleMobile.php
@@ -9,7 +9,7 @@ use Friendica\BaseModule;
  */
 class ToggleMobile extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $a = self::getApp();
 

diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index c26085b48bb2e9fdbbe5adaef26f0f6e9cdcce31..c69557d5dcebc7a8f4c419fa48b941adb8e5fd55 100644 (file)
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -47,7 +47,7 @@ class Tos extends BaseModule
         * dealings with their own node so a TOS is not necessary.
         *
         **/
-       public static function init()
+       public static function init($parameters)
        {
                if (strlen(Config::get('system','singleuser'))) {
                        self::getApp()->internalRedirect('profile/' . Config::get('system','singleuser'));
@@ -66,7 +66,7 @@ class Tos extends BaseModule
         * @return string
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function content() {
+       public static function content($parameters) {
                $tpl = Renderer::getMarkupTemplate('tos.tpl');
                if (Config::get('system', 'tosdisplay')) {
                        return Renderer::replaceMacros($tpl, [

diff --git a/src/Module/TwoFactor/Recovery.php b/src/Module/TwoFactor/Recovery.php
index 7c17fdace028893003c69bfd61057522b810d38e..82cfc80eaca3c63bb2bd35bddc755fd7eefef969 100644 (file)
--- a/src/Module/TwoFactor/Recovery.php
+++ b/src/Module/TwoFactor/Recovery.php
@@ -15,14 +15,14 @@ use Friendica\Model\TwoFactor\RecoveryCode;
  */
 class Recovery extends BaseModule
 {
-       public static function init()
+       public static function init($parameters)
        {
                if (!local_user()) {
                        return;
                }
        }
 
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user()) {
                        return;
@@ -48,7 +48,7 @@ class Recovery extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        self::getApp()->internalRedirect();

diff --git a/src/Module/TwoFactor/Verify.php b/src/Module/TwoFactor/Verify.php
index 4b1c974d8ff7ddf84b4f4f5217335960b9244a51..daef9f60a5491c02a1671ac955f32bd9c43ed527 100644 (file)
--- a/src/Module/TwoFactor/Verify.php
+++ b/src/Module/TwoFactor/Verify.php
@@ -18,7 +18,7 @@ class Verify extends BaseModule
 {
        private static $errors = [];
 
-       public static function post()
+       public static function post($parameters)
        {
                if (!local_user()) {
                        return;
@@ -45,7 +45,7 @@ class Verify extends BaseModule
                }
        }
 
-       public static function content()
+       public static function content($parameters)
        {
                if (!local_user()) {
                        self::getApp()->internalRedirect();

diff --git a/src/Module/Welcome.php b/src/Module/Welcome.php
index 9e1eace9b6ec80cc6d33906b57f2a3ee915018a7..d92f4109ce35612bd89fb12a0a03ff2e9a2ff99a 100644 (file)
--- a/src/Module/Welcome.php
+++ b/src/Module/Welcome.php
@@ -11,7 +11,7 @@ use Friendica\Core\Renderer;
  */
 class Welcome extends BaseModule
 {
-       public static function content()
+       public static function content($parameters)
        {
                $config = self::getApp()->getConfig();