Merge pull request #7819 from annando/pinned

Added parameters to module classes

mod/update_contact.php

@@ -14,7 +14,7 @@ function update_contact_content(App $a)
 	echo "<section>";
 
 	if ($_GET["force"] == 1) {
-		$text = Contact::content(true);
+		$text = Contact::content([], true);
 	} else {
 		$text = '';
 	}

mod/update_profile.php

@@ -28,7 +28,7 @@ function update_profile_content(App $a) {
 	 * on the client side and then swap the image back.
 	 */
 
-	$text = Profile::content($profile_uid);
+	$text = Profile::content([], $profile_uid);
 
 	if (PConfig::get(local_user(), "system", "bandwidth_saver")) {
 		$replace = "<br />".L10n::t("[Embedded content - reload page to view]")."<br />";

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) {

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(array $parameters = [])
 	{
 	}
 
@@ -32,7 +32,7 @@ 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;
@@ -47,7 +47,7 @@ abstract class BaseModule extends BaseObject
 	 *
 	 * @return string
 	 */
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$o = '';
 
@@ -60,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');
@@ -71,9 +71,8 @@ abstract class BaseModule extends BaseObject
 	 *
 	 * Unknown purpose
 	 */
-	public static function afterpost()
+	public static function afterpost(array $parameters = [])
 	{
-
 	}
 
 	/*

src/LegacyModule.php

@@ -35,24 +35,24 @@ class LegacyModule extends BaseModule
 		require_once $file_path;
 	}
 
-	public static function init()
+	public static function init(array $parameters = [])
 	{
-		self::runModuleFunction('init');
+		self::runModuleFunction('init', $parameters);
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
-		return self::runModuleFunction('content');
+		return self::runModuleFunction('content', $parameters);
 	}
 
-	public static function post()
+	public static function post(array $parameters = [])
 	{
-		self::runModuleFunction('post');
+		self::runModuleFunction('post', $parameters);
 	}
 
-	public static function afterpost()
+	public static function afterpost(array $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, array $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);
 		}
 	}
 }

src/Module/AccountManagementControlDocument.php

@@ -11,7 +11,7 @@ use Friendica\BaseModule;
  */
 class AccountManagementControlDocument extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$output = [
 			'version' => 1,

src/Module/Acctlink.php

@@ -11,7 +11,7 @@ use Friendica\Core\System;
  */
 class Acctlink extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$addr = trim($_GET['addr'] ?? '');
 

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$arr = [];
 		$features = Feature::get(false);

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
 		// social and statusnet nodes this node is knowing

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$t = Renderer::getMarkupTemplate('admin/item/delete.tpl');
 

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$t = Renderer::getMarkupTemplate('admin/logs/view.tpl');
 		$f = Config::get('system', 'logfile');

src/Module/Admin/PhpInfo.php

@@ -6,9 +6,9 @@ use Friendica\Module\BaseAdminModule;
 
 class PhpInfo extends BaseAdminModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
-		parent::rawContent();
+		parent::rawContent($parameters);
 
 		phpinfo();
 		exit();

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
 		$a = self::getApp();
 
@@ -23,9 +23,9 @@ class Embed extends BaseAdminModule
 		}
 	}
 
-	public static function post()
+	public static function post(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$tos = new \Friendica\Module\Tos();
 		$t = Renderer::getMarkupTemplate('admin/tos.tpl');

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
 		$app = self::getApp();
 

src/Module/Apps.php

@@ -13,7 +13,7 @@ use Friendica\Core\Renderer;
  */
 class Apps extends BaseModule
 {
-	public static function init()
+	public static function init(array $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(array $parameters = [])
 	{
 		$apps = Nav::getAppMenu();
 

src/Module/Attach.php

@@ -20,7 +20,7 @@ class Attach extends BaseModule
 	/**
 	 * @brief Return to user an attached file given the id
 	 */
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$a = self::getApp();
 		if ($a->argc != 2) {

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(array $parameters = [])
 	{
 		if (!is_site_admin()) {
 			return;
@@ -35,7 +35,7 @@ abstract class BaseAdminModule extends BaseModule
 		}
 	}
 
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		if (!is_site_admin()) {
 			return '';
@@ -48,7 +48,7 @@ abstract class BaseAdminModule extends BaseModule
 		return '';
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/BaseSettingsModule.php

@@ -9,7 +9,7 @@ use Friendica\Core\Renderer;
 
 class BaseSettingsModule extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/Bookmarklet.php

@@ -14,7 +14,7 @@ use Friendica\Util\Strings;
  */
 class Bookmarklet extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$_GET['mode'] = 'minimal';
 

src/Module/Contact.php

@@ -75,7 +75,7 @@ class Contact extends BaseModule
 		$a->internalRedirect('contact');
 	}
 
-	public static function post()
+	public static function post(array $parameters = [])
 	{
 		$a = self::getApp();
 
@@ -240,7 +240,7 @@ class Contact extends BaseModule
 		Model\Contact::remove($orig_record['id']);
 	}
 
-	public static function content($update = 0)
+	public static function content(array $parameters = [], $update = 0)
 	{
 		if (!local_user()) {
 			return Login::form($_SERVER['REQUEST_URI']);

src/Module/Contact/Hovercard.php

@@ -18,7 +18,7 @@ use Friendica\Util\Proxy;
  */
 class Hovercard extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$contact_url = $_REQUEST['url'] ?? '';
 

src/Module/Credits.php

@@ -13,7 +13,7 @@ use Friendica\Core\Renderer;
  */
 class Credits extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		/* fill the page with credits */
 		$credits_string = file_get_contents('CREDITS.txt');

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(array $parameters = [])
 	{
 		function visible_whitespace($s)
 		{

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(array $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(array $parameters = [])
 	{
 		$result = [];
 		if (!empty($_REQUEST['url'])) {

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(L10n::t('Access denied.'));

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(array $parameters = [])
 	{
 		$time = ($_REQUEST['time'] ?? '') ?: 'now';
 
@@ -21,7 +21,7 @@ class Localtime extends BaseModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$app = self::getApp();
 

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			$e           = new HTTPException\ForbiddenException(L10n::t('Only logged in users are permitted to perform a probing.'));

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			$e           = new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Only logged in users are permitted to perform a probing.'));

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			return;
@@ -92,7 +92,7 @@ class Delegation extends BaseModule
 		// NOTREACHED
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		if (!local_user()) {
 			throw new ForbiddenException(L10n::t('Permission denied.'));

src/Module/Diaspora/Fetch.php

@@ -17,7 +17,7 @@ use Friendica\Util\Strings;
  */
 class Fetch extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$app = self::getApp();
 

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(array $parameters = [])
 	{
 		/** @var LoggerInterface $logger */
 		self::$logger = self::getClass(LoggerInterface::class);
 	}
 
-	public static function post()
+	public static function post(array $parameters = [])
 	{
 		/** @var Configuration $config */
 		$config = self::getClass(Configuration::class);

src/Module/Directory.php

@@ -21,7 +21,7 @@ use Friendica\Util\Strings;
  */
 class Directory extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$app = self::getApp();
 		$config = $app->getConfig();

src/Module/Feed.php

@@ -23,7 +23,7 @@ use Friendica\Protocol\OStatus;
  */
 class Feed extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException();

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			info(L10n::t('You must be logged in to use this module'));
@@ -22,7 +22,7 @@ class SaveTag extends BaseModule
 		}
 	}
 
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$a = self::getApp();
 		$logger = $a->getLogger();

src/Module/FollowConfirm.php

@@ -18,7 +18,7 @@ use Friendica\Util\DateTimeFormat;
  */
 class FollowConfirm extends BaseModule
 {
-	public static function post()
+	public static function post(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/Followers.php

@@ -14,7 +14,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Followers extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/Following.php

@@ -14,7 +14,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Following extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/Friendica.php

@@ -15,7 +15,7 @@ use Friendica\Model\User;
  */
 class Friendica extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$app = self::getApp();
 		$config = $app->getConfig();
@@ -88,7 +88,7 @@ class Friendica extends BaseModule
 		]);
 	}
 
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$app = self::getApp();
 

src/Module/Group.php

@@ -19,7 +19,7 @@ require_once 'boot.php';
 
 class Group extends BaseModule
 {
-	public static function post()
+	public static function post(array $parameters = [])
 	{
 		$a = self::getApp();
 
@@ -132,7 +132,7 @@ class Group extends BaseModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$change = false;
 

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(array $parameters = [])
 	{
 		throw new HTTPException\MethodNotAllowedException(L10n::t('Method Not Allowed.'));
 	}

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(array $parameters = [])
 	{
 		throw new HTTPException\NotFoundException(L10n::t('Page not found.'));
 	}

src/Module/Hashtag.php

@@ -15,7 +15,7 @@ use Friendica\Util\Strings;
 class Hashtag extends BaseModule
 {
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$result = [];
 

src/Module/Help.php

@@ -14,7 +14,7 @@ use Friendica\Util\Strings;
  */
 class Help extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		Nav::setSelected('help');
 

src/Module/Home.php

@@ -12,7 +12,7 @@ use Friendica\Core\Renderer;
  */
 class Home extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$app = self::getApp();
 		$config = $app->getConfig();

src/Module/Inbox.php

@@ -19,7 +19,7 @@ use Friendica\Util\Network;
  */
 class Inbox extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/Install.php

@@ -46,7 +46,7 @@ class Install extends BaseModule
 	 */
 	private static $installer;
 
-	public static function init()
+	public static function init(array $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(array $parameters = [])
 	{
 		$a           = self::getApp();
 		$configCache = $a->getConfigCache();
@@ -149,7 +149,7 @@ class Install extends BaseModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$a           = self::getApp();
 		$configCache = $a->getConfigCache();

src/Module/Invite.php

@@ -16,7 +16,7 @@ use Friendica\Util\Strings;
  */
 class Invite extends BaseModule
 {
-	public static function post()
+	public static function post(array $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(array $parameters = [])
 	{
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));

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(array $parameters = [])
 	{
 		if (!empty($_REQUEST['body'])) {
 			$_REQUEST['return'] = 'network';
@@ -32,7 +32,7 @@ class Compose extends BaseModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		if (!local_user()) {
 			return Login::form('compose', false);

src/Module/Item/Ignore.php

@@ -16,7 +16,7 @@ use Friendica\Network\HTTPException;
  */
 class Ignore extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		/** @var L10n $l10n */
 		$l10n = self::getClass(L10n::class);

src/Module/Like.php

@@ -13,7 +13,7 @@ use Friendica\Util\Strings;
  */
 class Like extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		if (!Session::isAuthenticated()) {
 			throw new HTTPException\ForbiddenException();

src/Module/Login.php

@@ -30,7 +30,7 @@ use LightOpenID;
  */
 class Login extends BaseModule
 {
-	public static function content()
+	public static function content(array $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(array $parameters = [])
 	{
 		$openid_identity = Session::get('openid_identity');
 		$openid_server = Session::get('openid_server');

src/Module/Logout.php

@@ -23,7 +23,7 @@ class Logout extends BaseModule
 	/**
 	 * @brief Process logout requests
 	 */
-	public static function init()
+	public static function init(array $parameters = [])
 	{
 		$visitor_home = null;
 		if (remote_user()) {

src/Module/Magic.php

@@ -20,7 +20,7 @@ use Friendica\Util\Strings;
  */
 class Magic extends BaseModule
 {
-	public static function init()
+	public static function init(array $parameters = [])
 	{
 		$a = self::getApp();
 		$ret = ['success' => false, 'url' => '', 'message' => ''];

src/Module/Maintenance.php

@@ -14,7 +14,7 @@ use Friendica\Util\Strings;
  */
 class Maintenance extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$config = self::getApp()->getConfig();
 

src/Module/Manifest.php

@@ -7,7 +7,7 @@ use Friendica\Core\Renderer;
 
 class Manifest extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$app = self::getApp();
 		$config = $app->getConfig();

src/Module/NodeInfo.php

@@ -13,7 +13,7 @@ use Friendica\Core\System;
  */
 class NodeInfo extends BaseModule
 {
-	public static function init()
+	public static function init(array $parameters = [])
 	{
 		$config = self::getApp()->getConfig();
 
@@ -22,7 +22,7 @@ class NodeInfo extends BaseModule
 		}
 	}
 
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$app = self::getApp();
 

src/Module/Notifications/Notify.php

@@ -14,14 +14,14 @@ use Friendica\Network\HTTPException;
  */
 class Notify extends BaseModule
 {
-	public static function init()
+	public static function init(array $parameters = [])
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(L10n::t('Permission denied.'));
 		}
 	}
 
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$a = self::getApp();
 
@@ -45,7 +45,7 @@ class Notify extends BaseModule
 	 * @return string|void
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/Objects.php

@@ -15,7 +15,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Objects extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/Oembed.php

@@ -17,7 +17,7 @@ use Friendica\Util\Strings;
  */
 class Oembed extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/OpenSearch.php

@@ -16,7 +16,7 @@ class OpenSearch extends BaseModule
 	/**
 	 * @throws \Exception
 	 */
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		header('Content-type: application/opensearchdescription+xml');
 

src/Module/Outbox.php

@@ -14,7 +14,7 @@ use Friendica\Protocol\ActivityPub;
  */
 class Outbox extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/Owa.php

@@ -27,7 +27,7 @@ use Friendica\Util\Strings;
  */
 class Owa extends BaseModule
 {
-	public static function init()
+	public static function init(array $parameters = [])
 	{
 
 		$ret = [ 'success' => false ];

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(array $parameters = [])
 	{
 		$a = self::getApp();
 		// @TODO: Replace with parameter from router

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(array $parameters = [])
 	{
 		$a = self::getApp();
 
@@ -51,7 +51,7 @@ class Profile extends BaseModule
 		}
 	}
 
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		if (ActivityPub::isRequest()) {
 			$user = DBA::selectFirst('user', ['uid'], ['nickname' => self::$which]);
@@ -75,7 +75,7 @@ class Profile extends BaseModule
 		}
 	}
 
-	public static function content($update = 0)
+	public static function content(array $parameters = [], $update = 0)
 	{
 		$a = self::getApp();
 

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(array $parameters = [])
 	{
 		if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
 			throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('User not found.'));

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(array $parameters = [])
 	{
 		// Set application instance here
 		$a = self::getApp();

src/Module/PublicRSAKey.php

@@ -12,7 +12,7 @@ use Friendica\Network\HTTPException\BadRequestException;
  */
 class PublicRSAKey extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$app = self::getApp();
 

src/Module/RandomProfile.php

@@ -11,7 +11,7 @@ use Friendica\Model\GContact;
  */
 class RandomProfile extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$a = self::getApp();
 

src/Module/ReallySimpleDiscovery.php

@@ -11,7 +11,7 @@ use Friendica\Util\XML;
  */
 class ReallySimpleDiscovery extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		header('Content-Type: text/xml');
 

src/Module/Register.php

@@ -35,7 +35,7 @@ class Register extends BaseModule
 	 *
 	 * @return string
 	 */
-	public static function content()
+	public static function content(array $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(array $parameters = [])
 	{
 		BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register');
 

src/Module/RobotsTxt.php

@@ -9,7 +9,7 @@ use Friendica\BaseModule;
  */
 class RobotsTxt extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$allDisalloweds = [
 			'/settings/',

src/Module/Search/Acl.php

@@ -31,7 +31,7 @@ class Acl extends BaseModule
 	const TYPE_PRIVATE_MESSAGE       = 'm';
 	const TYPE_ANY_CONTACT           = 'a';
 
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		if (!local_user()) {
 			throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this module.'));

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			notice(L10n::t('Permission denied.'));

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(array $parameters = [])
 	{
 		$search = (!empty($_GET['q']) ? Strings::escapeTags(trim(rawurldecode($_GET['q']))) : '');
 

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(array $parameters = [])
 	{
 		/** @var Arguments $args */
 		$args = self::getClass(Arguments::class);

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(array $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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException(L10n::t('Permission denied.'));

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			return;
@@ -38,7 +38,7 @@ class AppSpecific extends BaseSettingsModule
 		}
 	}
 
-	public static function post()
+	public static function post(array $parameters = [])
 	{
 		if (!local_user()) {
 			return;
@@ -81,13 +81,13 @@ class AppSpecific extends BaseSettingsModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/app_specific');
 		}
 
-		parent::content();
+		parent::content($parameters);
 
 		$appSpecificPasswords = AppSpecificPassword::getListForUser(local_user());
 

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			return;
@@ -73,13 +73,13 @@ class Index extends BaseSettingsModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $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');

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			return;
@@ -36,7 +36,7 @@ class Recovery extends BaseSettingsModule
 		}
 	}
 
-	public static function post()
+	public static function post(array $parameters = [])
 	{
 		if (!local_user()) {
 			return;
@@ -53,13 +53,13 @@ class Recovery extends BaseSettingsModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/recovery');
 		}
 
-		parent::content();
+		parent::content($parameters);
 
 		if (!RecoveryCode::countValidForUser(local_user())) {
 			RecoveryCode::generateForUser(local_user());

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(array $parameters = [])
 	{
 		if (!local_user()) {
 			return;
@@ -43,7 +43,7 @@ class Verify extends BaseSettingsModule
 		}
 	}
 
-	public static function post()
+	public static function post(array $parameters = [])
 	{
 		if (!local_user()) {
 			return;
@@ -69,13 +69,13 @@ class Verify extends BaseSettingsModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		if (!local_user()) {
 			return Login::form('settings/2fa/verify');
 		}
 
-		parent::content();
+		parent::content($parameters);
 
 		$company = 'Friendica';
 		$holder = Session::get('my_address');

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(array $parameters = [])
 	{
-		parent::content();
+		parent::content($parameters);
 
 		/**
 		 * options shown on "Export personal data" page
@@ -59,7 +59,7 @@ class UserExport extends BaseSettingsModule
 	 * to the browser which then offers a save / open dialog
 	 * to the user.
 	 **/
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$args = self::getClass(Arguments::class);
 		if ($args->getArgc() == 3) {

src/Module/Smilies.php

@@ -12,7 +12,7 @@ use Friendica\Core\System;
  */
 class Smilies extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$app = self::getApp();
 
@@ -26,7 +26,7 @@ class Smilies extends BaseModule
 		}
 	}
 
-	public static function content()
+	public static function content(array $parameters = [])
 	{
 		$smilies = Content\Smilies::getList();
 		$count = count($smilies['texts'] ?? []);

src/Module/Starred.php

@@ -10,51 +10,36 @@ use Friendica\Model\Item;
  */
 class Starred extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
-		$a = self::getApp();
-		$starred = 0;
-		$itemId = null;
-
 		if (!local_user()) {
-			exit();
+			throw new \Friendica\Network\HTTPException\ForbiddenException();
 		}
 
-		// @TODO: Replace with parameter from router
+		if (empty($parameters['item'])) {
-		if ($a->argc > 1) {
+			throw new \Friendica\Network\HTTPException\BadRequestException();
-			$itemId = intval($a->argv[1]);
 		}
 
-		if (!$itemId) {
+		$itemId = intval($parameters['item']);
-			exit();
-		}
 
 		$item = Item::selectFirstForUser(local_user(), ['starred'], ['uid' => local_user(), 'id' => $itemId]);
 		if (empty($item)) {
-			exit();
+			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
 
-		if (!intval($item['starred'])) {
+		$starred = !(bool)$item['starred'];
-			$starred = 1;
-		}
 
 		Item::update(['starred' => $starred], ['id' => $itemId]);
 
 		// See if we've been passed a return path to redirect to
 		$returnPath = $_REQUEST['return'] ?? '';
-		if ($returnPath) {
+		if (!empty($returnPath)) {
-			$rand = '_=' . time();
+			$rand = '_=' . time() . (strpos($returnPath, '?') ? '&' : '?') . 'rand';
-			if (strpos($returnPath, '?')) {
+			self::getApp()->internalRedirect($returnPath . $rand);
-				$rand = "&$rand";
-			} else {
-				$rand = "?$rand";
-			}
-
-			$a->internalRedirect($returnPath . $rand);
 		}
 
 		// the json doesn't really matter, it will either be 0 or 1
-		echo json_encode($starred);
+		echo json_encode((int)$starred);
 		exit();
 	}
 }

src/Module/Statistics.php

@@ -8,7 +8,7 @@ use Friendica\Core\System;
 
 class Statistics extends BaseModule
 {
-	public static function init()
+	public static function init(array $parameters = [])
 	{
 		$config = self::getApp()->getConfig();
 
@@ -17,7 +17,7 @@ class Statistics extends BaseModule
 		}
 	}
 
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		$config = self::getApp()->getConfig();
 		$logger = self::getApp()->getLogger();

src/Module/Theme.php

@@ -10,7 +10,7 @@ use Friendica\Util\Strings;
  */
 class Theme extends BaseModule
 {
-	public static function rawContent()
+	public static function rawContent(array $parameters = [])
 	{
 		header("Content-Type: text/css");