From 714f0febc4918f5569eb09f8800b6739cff36347 Mon Sep 17 00:00:00 2001 From: Philipp Date: Sun, 14 Nov 2021 20:46:25 +0100 Subject: [PATCH] Replace `$parameters` argument per method with `static::$parameters` --- src/App/Module.php | 14 ++++---- src/App/Page.php | 2 +- src/BaseModule.php | 24 +++++-------- src/Capabilities/ICanHandleRequests.php | 18 +++++----- src/LegacyModule.php | 16 ++++----- .../AccountManagementControlDocument.php | 2 +- src/Module/Acctlink.php | 2 +- src/Module/ActivityPub/Followers.php | 6 ++-- src/Module/ActivityPub/Following.php | 6 ++-- src/Module/ActivityPub/Inbox.php | 8 ++--- src/Module/ActivityPub/Objects.php | 20 +++++------ src/Module/ActivityPub/Outbox.php | 6 ++-- src/Module/Admin/Addons/Details.php | 10 +++--- src/Module/Admin/Addons/Index.php | 4 +-- src/Module/Admin/Blocklist/Contact.php | 6 ++-- src/Module/Admin/Blocklist/Server/Add.php | 6 ++-- src/Module/Admin/Blocklist/Server/Index.php | 6 ++-- src/Module/Admin/DBSync.php | 8 ++--- src/Module/Admin/Features.php | 6 ++-- src/Module/Admin/Federation.php | 4 +-- src/Module/Admin/Item/Delete.php | 6 ++-- src/Module/Admin/Item/Source.php | 6 ++-- src/Module/Admin/Logs/Settings.php | 6 ++-- src/Module/Admin/Logs/View.php | 6 ++-- src/Module/Admin/PhpInfo.php | 2 +- src/Module/Admin/Queue.php | 6 ++-- src/Module/Admin/Site.php | 6 ++-- src/Module/Admin/Storage.php | 8 ++--- src/Module/Admin/Summary.php | 4 +-- src/Module/Admin/Themes/Details.php | 6 ++-- src/Module/Admin/Themes/Embed.php | 14 ++++---- src/Module/Admin/Themes/Index.php | 4 +-- src/Module/Admin/Tos.php | 8 ++--- src/Module/Admin/Users/Active.php | 10 +++--- src/Module/Admin/Users/Blocked.php | 10 +++--- src/Module/Admin/Users/Create.php | 6 ++-- src/Module/Admin/Users/Deleted.php | 6 ++-- src/Module/Admin/Users/Index.php | 10 +++--- src/Module/Admin/Users/Pending.php | 10 +++--- src/Module/Api/Friendica/Activity.php | 10 +++--- .../Api/Friendica/DirectMessages/Setseen.php | 8 ++--- src/Module/Api/Friendica/Events/Index.php | 4 +-- src/Module/Api/Friendica/Index.php | 6 ++-- src/Module/Api/Friendica/Notification.php | 6 ++-- src/Module/Api/Friendica/Photo/Delete.php | 4 +-- .../Api/Friendica/Photoalbum/Delete.php | 4 +-- .../Api/Friendica/Photoalbum/Update.php | 4 +-- src/Module/Api/Friendica/Profile/Show.php | 6 ++-- .../Api/GNUSocial/GNUSocial/Version.php | 4 +-- src/Module/Api/GNUSocial/Help/Test.php | 6 ++-- src/Module/Api/Mastodon/Accounts.php | 13 ++++--- src/Module/Api/Mastodon/Accounts/Block.php | 8 ++--- .../Api/Mastodon/Accounts/FeaturedTags.php | 3 +- src/Module/Api/Mastodon/Accounts/Follow.php | 6 ++-- .../Api/Mastodon/Accounts/Followers.php | 9 +++-- .../Api/Mastodon/Accounts/Following.php | 9 +++-- .../Api/Mastodon/Accounts/IdentityProofs.php | 3 +- src/Module/Api/Mastodon/Accounts/Lists.php | 7 ++-- src/Module/Api/Mastodon/Accounts/Mute.php | 8 ++--- src/Module/Api/Mastodon/Accounts/Note.php | 8 ++--- .../Api/Mastodon/Accounts/Relationships.php | 3 +- src/Module/Api/Mastodon/Accounts/Search.php | 3 +- src/Module/Api/Mastodon/Accounts/Statuses.php | 7 ++-- src/Module/Api/Mastodon/Accounts/Unblock.php | 8 ++--- src/Module/Api/Mastodon/Accounts/Unfollow.php | 8 ++--- src/Module/Api/Mastodon/Accounts/Unmute.php | 8 ++--- .../Mastodon/Accounts/UpdateCredentials.php | 2 +- .../Mastodon/Accounts/VerifyCredentials.php | 3 +- src/Module/Api/Mastodon/Announcements.php | 3 +- src/Module/Api/Mastodon/Apps.php | 3 +- .../Api/Mastodon/Apps/VerifyCredentials.php | 2 +- src/Module/Api/Mastodon/Blocks.php | 9 +++-- src/Module/Api/Mastodon/Bookmarks.php | 3 +- src/Module/Api/Mastodon/Conversations.php | 11 +++--- .../Api/Mastodon/Conversations/Read.php | 8 ++--- src/Module/Api/Mastodon/CustomEmojis.php | 3 +- src/Module/Api/Mastodon/Directory.php | 3 +- src/Module/Api/Mastodon/Endorsements.php | 3 +- src/Module/Api/Mastodon/Favourited.php | 3 +- src/Module/Api/Mastodon/Filters.php | 5 ++- src/Module/Api/Mastodon/FollowRequests.php | 10 +++--- src/Module/Api/Mastodon/Instance.php | 3 +- src/Module/Api/Mastodon/Instance/Peers.php | 3 +- src/Module/Api/Mastodon/Instance/Rules.php | 3 +- src/Module/Api/Mastodon/Lists.php | 23 ++++++------ src/Module/Api/Mastodon/Lists/Accounts.php | 11 +++--- src/Module/Api/Mastodon/Markers.php | 5 ++- src/Module/Api/Mastodon/Media.php | 17 +++++---- src/Module/Api/Mastodon/Mutes.php | 9 +++-- src/Module/Api/Mastodon/Notifications.php | 7 ++-- .../Api/Mastodon/Notifications/Clear.php | 2 +- .../Api/Mastodon/Notifications/Dismiss.php | 6 ++-- src/Module/Api/Mastodon/Preferences.php | 3 +- src/Module/Api/Mastodon/Proofs.php | 3 +- src/Module/Api/Mastodon/PushSubscription.php | 8 ++--- src/Module/Api/Mastodon/ScheduledStatuses.php | 17 +++++---- src/Module/Api/Mastodon/Search.php | 5 ++- src/Module/Api/Mastodon/Statuses.php | 15 ++++---- src/Module/Api/Mastodon/Statuses/Bookmark.php | 8 ++--- src/Module/Api/Mastodon/Statuses/Card.php | 7 ++-- src/Module/Api/Mastodon/Statuses/Context.php | 7 ++-- .../Api/Mastodon/Statuses/Favourite.php | 8 ++--- .../Api/Mastodon/Statuses/FavouritedBy.php | 7 ++-- src/Module/Api/Mastodon/Statuses/Mute.php | 10 +++--- src/Module/Api/Mastodon/Statuses/Pin.php | 10 +++--- src/Module/Api/Mastodon/Statuses/Reblog.php | 8 ++--- .../Api/Mastodon/Statuses/RebloggedBy.php | 7 ++-- .../Api/Mastodon/Statuses/Unbookmark.php | 8 ++--- .../Api/Mastodon/Statuses/Unfavourite.php | 8 ++--- src/Module/Api/Mastodon/Statuses/Unmute.php | 10 +++--- src/Module/Api/Mastodon/Statuses/Unpin.php | 10 +++--- src/Module/Api/Mastodon/Statuses/Unreblog.php | 8 ++--- src/Module/Api/Mastodon/Suggestions.php | 3 +- src/Module/Api/Mastodon/Timelines/Direct.php | 3 +- src/Module/Api/Mastodon/Timelines/Home.php | 3 +- .../Api/Mastodon/Timelines/ListTimeline.php | 7 ++-- .../Api/Mastodon/Timelines/PublicTimeline.php | 3 +- src/Module/Api/Mastodon/Timelines/Tag.php | 7 ++-- src/Module/Api/Mastodon/Trends.php | 3 +- src/Module/Api/Mastodon/Unimplemented.php | 15 +++----- .../Api/Twitter/Account/RateLimitStatus.php | 6 ++-- src/Module/Api/Twitter/ContactEndpoint.php | 4 +-- src/Module/Api/Twitter/FollowersIds.php | 2 +- src/Module/Api/Twitter/FollowersList.php | 2 +- src/Module/Api/Twitter/FriendsIds.php | 2 +- src/Module/Api/Twitter/FriendsList.php | 2 +- src/Module/Api/Twitter/SavedSearches.php | 4 +-- src/Module/Apps.php | 4 +-- src/Module/Attach.php | 6 ++-- src/Module/BaseAdmin.php | 2 +- src/Module/BaseApi.php | 9 +++-- src/Module/BaseNotifications.php | 4 +-- src/Module/BaseSettings.php | 2 +- src/Module/Bookmarklet.php | 2 +- src/Module/Contact.php | 4 +-- src/Module/Contact/Advanced.php | 10 +++--- src/Module/Contact/Contacts.php | 6 ++-- src/Module/Contact/Hovercard.php | 2 +- src/Module/Contact/Media.php | 4 +-- src/Module/Contact/Poke.php | 14 ++++---- src/Module/Contact/Revoke.php | 12 +++---- src/Module/Conversation/Community.php | 15 ++++---- src/Module/Conversation/Network.php | 16 ++++----- src/Module/Credits.php | 2 +- src/Module/DFRN/Notify.php | 6 ++-- src/Module/DFRN/Poll.php | 4 +-- src/Module/Debug/ActivityPubConversion.php | 2 +- src/Module/Debug/Babel.php | 2 +- src/Module/Debug/Feed.php | 4 +-- src/Module/Debug/ItemBody.php | 6 ++-- src/Module/Debug/Localtime.php | 4 +-- src/Module/Debug/Probe.php | 2 +- src/Module/Debug/WebFinger.php | 2 +- src/Module/Delegation.php | 4 +-- src/Module/Diaspora/Fetch.php | 6 ++-- src/Module/Diaspora/Receive.php | 10 +++--- src/Module/Directory.php | 2 +- src/Module/Events/Json.php | 2 +- src/Module/Feed.php | 4 +-- src/Module/Filer/RemoveTag.php | 4 +-- src/Module/Filer/SaveTag.php | 6 ++-- src/Module/FollowConfirm.php | 2 +- src/Module/FriendSuggest.php | 10 +++--- src/Module/Friendica.php | 4 +-- src/Module/Group.php | 4 +-- src/Module/HCard.php | 8 ++--- src/Module/HTTPException/MethodNotAllowed.php | 2 +- src/Module/HTTPException/PageNotFound.php | 2 +- src/Module/Hashtag.php | 2 +- src/Module/Help.php | 2 +- src/Module/Home.php | 2 +- src/Module/Install.php | 6 ++-- src/Module/Invite.php | 4 +-- src/Module/Item/Activity.php | 8 ++--- src/Module/Item/Compose.php | 6 ++-- src/Module/Item/Follow.php | 6 ++-- src/Module/Item/Ignore.php | 6 ++-- src/Module/Item/Pin.php | 6 ++-- src/Module/Item/Star.php | 6 ++-- src/Module/Magic.php | 2 +- src/Module/Maintenance.php | 2 +- src/Module/Manifest.php | 2 +- src/Module/NoScrape.php | 8 ++--- src/Module/NodeInfo110.php | 2 +- src/Module/NodeInfo120.php | 2 +- src/Module/NodeInfo210.php | 2 +- src/Module/Notifications/Introductions.php | 2 +- src/Module/Notifications/Notification.php | 10 +++--- src/Module/Notifications/Notifications.php | 2 +- src/Module/OAuth/Acknowledge.php | 4 +-- src/Module/OAuth/Authorize.php | 5 ++- src/Module/OAuth/Revoke.php | 2 +- src/Module/OAuth/Token.php | 2 +- src/Module/Oembed.php | 2 +- src/Module/OpenSearch.php | 2 +- src/Module/Owa.php | 2 +- src/Module/ParseUrl.php | 2 +- src/Module/PermissionTooltip.php | 6 ++-- src/Module/Photo.php | 36 +++++++++---------- src/Module/Profile/Common.php | 4 +-- src/Module/Profile/Contacts.php | 6 ++-- src/Module/Profile/Index.php | 8 ++--- src/Module/Profile/Media.php | 4 +-- src/Module/Profile/Profile.php | 16 ++++----- src/Module/Profile/Schedule.php | 6 ++-- src/Module/Profile/Status.php | 12 +++---- src/Module/Proxy.php | 10 +++--- src/Module/PublicRSAKey.php | 6 ++-- src/Module/RandomProfile.php | 2 +- src/Module/ReallySimpleDiscovery.php | 2 +- src/Module/Register.php | 6 ++-- src/Module/RemoteFollow.php | 10 +++--- src/Module/RobotsTxt.php | 2 +- src/Module/Search/Acl.php | 2 +- src/Module/Search/Directory.php | 2 +- src/Module/Search/Filed.php | 2 +- src/Module/Search/Index.php | 2 +- src/Module/Search/Saved.php | 2 +- src/Module/Security/Login.php | 4 +-- src/Module/Security/Logout.php | 2 +- src/Module/Security/OpenID.php | 2 +- src/Module/Security/TwoFactor/Recovery.php | 6 ++-- src/Module/Security/TwoFactor/Verify.php | 4 +-- src/Module/Settings/Delegation.php | 6 ++-- src/Module/Settings/Display.php | 6 ++-- src/Module/Settings/Profile/Index.php | 4 +-- src/Module/Settings/Profile/Photo/Crop.php | 8 ++--- src/Module/Settings/Profile/Photo/Index.php | 4 +-- src/Module/Settings/TwoFactor/AppSpecific.php | 8 ++--- src/Module/Settings/TwoFactor/Index.php | 6 ++-- src/Module/Settings/TwoFactor/Recovery.php | 8 ++--- src/Module/Settings/TwoFactor/Trusted.php | 8 ++--- src/Module/Settings/TwoFactor/Verify.php | 8 ++--- src/Module/Settings/UserExport.php | 8 ++--- src/Module/Smilies.php | 4 +-- src/Module/Statistics.php | 4 +-- src/Module/Theme.php | 4 +-- src/Module/ThemeDetails.php | 2 +- src/Module/ToggleMobile.php | 2 +- src/Module/Tos.php | 10 +++--- src/Module/Update/Community.php | 4 +-- src/Module/Update/Network.php | 4 +-- src/Module/Update/Profile.php | 2 +- src/Module/Welcome.php | 2 +- src/Module/WellKnown/HostMeta.php | 2 +- src/Module/WellKnown/NodeInfo.php | 2 +- src/Module/WellKnown/SecurityTxt.php | 2 +- src/Module/WellKnown/XSocialRelay.php | 2 +- src/Module/Xrd.php | 2 +- 249 files changed, 710 insertions(+), 775 deletions(-) diff --git a/src/App/Module.php b/src/App/Module.php index 98d2d620d..0f0cfa656 100644 --- a/src/App/Module.php +++ b/src/App/Module.php @@ -297,32 +297,32 @@ class Module Core\Hook::callAll($this->module . '_mod_init', $placeholder); - $this->module_class::init($this->module_class::getParameters()); + $this->module_class::init(); $profiler->set(microtime(true) - $timestamp, 'init'); if ($server['REQUEST_METHOD'] === Router::DELETE) { - $this->module_class::delete($this->module_class::getParameters()); + $this->module_class::delete(); } if ($server['REQUEST_METHOD'] === Router::PATCH) { - $this->module_class::patch($this->module_class::getParameters()); + $this->module_class::patch(); } if ($server['REQUEST_METHOD'] === Router::POST) { Core\Hook::callAll($this->module . '_mod_post', $post); - $this->module_class::post($this->module_class::getParameters()); + $this->module_class::post(); } if ($server['REQUEST_METHOD'] === Router::PUT) { - $this->module_class::put($this->module_class::getParameters()); + $this->module_class::put(); } Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder); - $this->module_class::afterpost($this->module_class::getParameters()); + $this->module_class::afterpost(); // "rawContent" is especially meant for technical endpoints. // This endpoint doesn't need any theme initialization or other comparable stuff. - $this->module_class::rawContent($this->module_class::getParameters()); + $this->module_class::rawContent(); } } diff --git a/src/App/Page.php b/src/App/Page.php index c20f26cef..c29517b1c 100644 --- a/src/App/Page.php +++ b/src/App/Page.php @@ -352,7 +352,7 @@ class Page implements ArrayAccess $arr = ['content' => $content]; Hook::callAll( $moduleClass::getClassName() . '_mod_content', $arr); $content = $arr['content']; - $arr = ['content' => $moduleClass::content($moduleClass::getParameters())]; + $arr = ['content' => $moduleClass::content()]; Hook::callAll($moduleClass::getClassName() . '_mod_aftercontent', $arr); $content .= $arr['content']; } catch (HTTPException $e) { diff --git a/src/BaseModule.php b/src/BaseModule.php index 90ba9e132..b9db1953e 100644 --- a/src/BaseModule.php +++ b/src/BaseModule.php @@ -44,25 +44,17 @@ abstract class BaseModule implements ICanHandleRequests static::$parameters = $parameters; } - /** - * @return array - */ - public static function getParameters(): array - { - return self::$parameters; - } - /** * {@inheritDoc} */ - public static function init(array $parameters = []) + public static function init() { } /** * {@inheritDoc} */ - public static function rawContent(array $parameters = []) + public static function rawContent() { // echo ''; // exit; @@ -71,7 +63,7 @@ abstract class BaseModule implements ICanHandleRequests /** * {@inheritDoc} */ - public static function content(array $parameters = []) + public static function content() { return ''; } @@ -79,21 +71,21 @@ abstract class BaseModule implements ICanHandleRequests /** * {@inheritDoc} */ - public static function delete(array $parameters = []) + public static function delete() { } /** * {@inheritDoc} */ - public static function patch(array $parameters = []) + public static function patch() { } /** * {@inheritDoc} */ - public static function post(array $parameters = []) + public static function post() { // DI::baseurl()->redirect('module'); } @@ -101,14 +93,14 @@ abstract class BaseModule implements ICanHandleRequests /** * {@inheritDoc} */ - public static function afterpost(array $parameters = []) + public static function afterpost() { } /** * {@inheritDoc} */ - public static function put(array $parameters = []) + public static function put() { } diff --git a/src/Capabilities/ICanHandleRequests.php b/src/Capabilities/ICanHandleRequests.php index 0e1582bf6..1d4420877 100644 --- a/src/Capabilities/ICanHandleRequests.php +++ b/src/Capabilities/ICanHandleRequests.php @@ -13,7 +13,7 @@ interface ICanHandleRequests * Extend this method if you need to do any shared processing before both * content() or post() */ - public static function init(array $parameters = []); + public static function init(); /** * Module GET method to display raw content from technical endpoints @@ -21,7 +21,7 @@ interface ICanHandleRequests * Extend this method if the module is supposed to return communication data, * e.g. from protocol implementations. */ - public static function rawContent(array $parameters = []); + public static function rawContent(); /** * Module GET method to display any content @@ -32,7 +32,7 @@ interface ICanHandleRequests * * @return string */ - public static function content(array $parameters = []); + public static function content(); /** * Module DELETE method to process submitted data @@ -40,7 +40,7 @@ interface ICanHandleRequests * Extend this method if the module is supposed to process DELETE requests. * Doesn't display any content */ - public static function delete(array $parameters = []); + public static function delete(); /** * Module PATCH method to process submitted data @@ -48,7 +48,7 @@ interface ICanHandleRequests * Extend this method if the module is supposed to process PATCH requests. * Doesn't display any content */ - public static function patch(array $parameters = []); + public static function patch(); /** * Module POST method to process submitted data @@ -56,14 +56,14 @@ interface ICanHandleRequests * Extend this method if the module is supposed to process POST requests. * Doesn't display any content */ - public static function post(array $parameters = []); + public static function post(); /** * Called after post() * * Unknown purpose */ - public static function afterpost(array $parameters = []); + public static function afterpost(); /** * Module PUT method to process submitted data @@ -71,9 +71,7 @@ interface ICanHandleRequests * Extend this method if the module is supposed to process PUT requests. * Doesn't display any content */ - public static function put(array $parameters = []); + public static function put(); public static function getClassName(): string; - - public static function getParameters(): array; } diff --git a/src/LegacyModule.php b/src/LegacyModule.php index 224b94deb..ac4d5cd2c 100644 --- a/src/LegacyModule.php +++ b/src/LegacyModule.php @@ -54,24 +54,24 @@ class LegacyModule extends BaseModule require_once $file_path; } - public static function init(array $parameters = []) + public static function init() { - self::runModuleFunction('init', $parameters); + self::runModuleFunction('init', static::$parameters); } - public static function content(array $parameters = []) + public static function content() { - return self::runModuleFunction('content', $parameters); + return self::runModuleFunction('content', static::$parameters); } - public static function post(array $parameters = []) + public static function post() { - self::runModuleFunction('post', $parameters); + self::runModuleFunction('post', static::$parameters); } - public static function afterpost(array $parameters = []) + public static function afterpost() { - self::runModuleFunction('afterpost', $parameters); + self::runModuleFunction('afterpost', static::$parameters); } /** diff --git a/src/Module/AccountManagementControlDocument.php b/src/Module/AccountManagementControlDocument.php index ddd22dc3d..8c87343d5 100644 --- a/src/Module/AccountManagementControlDocument.php +++ b/src/Module/AccountManagementControlDocument.php @@ -30,7 +30,7 @@ use Friendica\BaseModule; */ class AccountManagementControlDocument extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $output = [ 'version' => 1, diff --git a/src/Module/Acctlink.php b/src/Module/Acctlink.php index 898386f3f..f8184c82f 100644 --- a/src/Module/Acctlink.php +++ b/src/Module/Acctlink.php @@ -30,7 +30,7 @@ use Friendica\Model\Contact; */ class Acctlink extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $addr = trim($_GET['addr'] ?? ''); diff --git a/src/Module/ActivityPub/Followers.php b/src/Module/ActivityPub/Followers.php index e1f1ccc4c..8c90b2ac0 100644 --- a/src/Module/ActivityPub/Followers.php +++ b/src/Module/ActivityPub/Followers.php @@ -31,14 +31,14 @@ use Friendica\Protocol\ActivityPub; */ class Followers extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - if (empty($parameters['nickname'])) { + if (empty(static::$parameters['nickname'])) { throw new \Friendica\Network\HTTPException\NotFoundException(); } // @TODO: Replace with parameter from router - $owner = User::getOwnerDataByNick($parameters['nickname']); + $owner = User::getOwnerDataByNick(static::$parameters['nickname']); if (empty($owner)) { throw new \Friendica\Network\HTTPException\NotFoundException(); } diff --git a/src/Module/ActivityPub/Following.php b/src/Module/ActivityPub/Following.php index e9cb10be1..08574b546 100644 --- a/src/Module/ActivityPub/Following.php +++ b/src/Module/ActivityPub/Following.php @@ -31,13 +31,13 @@ use Friendica\Protocol\ActivityPub; */ class Following extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - if (empty($parameters['nickname'])) { + if (empty(static::$parameters['nickname'])) { throw new \Friendica\Network\HTTPException\NotFoundException(); } - $owner = User::getOwnerDataByNick($parameters['nickname']); + $owner = User::getOwnerDataByNick(static::$parameters['nickname']); if (empty($owner)) { throw new \Friendica\Network\HTTPException\NotFoundException(); } diff --git a/src/Module/ActivityPub/Inbox.php b/src/Module/ActivityPub/Inbox.php index 2ef12a83d..3e0ca1856 100644 --- a/src/Module/ActivityPub/Inbox.php +++ b/src/Module/ActivityPub/Inbox.php @@ -35,7 +35,7 @@ use Friendica\Util\Network; */ class Inbox extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $postdata = Network::postdata(); @@ -50,12 +50,12 @@ class Inbox extends BaseModule $filename = 'failed-activitypub'; } $tempfile = tempnam(System::getTempPath(), $filename); - file_put_contents($tempfile, json_encode(['parameters' => $parameters, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); + file_put_contents($tempfile, json_encode(['parameters' => static::$parameters, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)); Logger::notice('Incoming message stored', ['file' => $tempfile]); } - if (!empty($parameters['nickname'])) { - $user = DBA::selectFirst('user', ['uid'], ['nickname' => $parameters['nickname']]); + if (!empty(static::$parameters['nickname'])) { + $user = DBA::selectFirst('user', ['uid'], ['nickname' => static::$parameters['nickname']]); if (!DBA::isResult($user)) { throw new \Friendica\Network\HTTPException\NotFoundException(); } diff --git a/src/Module/ActivityPub/Objects.php b/src/Module/ActivityPub/Objects.php index 232c80e5b..826bfd10c 100644 --- a/src/Module/ActivityPub/Objects.php +++ b/src/Module/ActivityPub/Objects.php @@ -41,9 +41,9 @@ use Friendica\Util\Strings; */ class Objects extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - if (empty($parameters['guid'])) { + if (empty(static::$parameters['guid'])) { throw new HTTPException\BadRequestException(); } @@ -51,10 +51,10 @@ class Objects extends BaseModule DI::baseUrl()->redirect(str_replace('objects/', 'display/', DI::args()->getQueryString())); } - $itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $parameters['guid']]); + $itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => static::$parameters['guid']]); if (DBA::isResult($itemuri)) { - Logger::info('Provided GUID found.', ['guid' => $parameters['guid'], 'uri-id' => $itemuri['id']]); + Logger::info('Provided GUID found.', ['guid' => static::$parameters['guid'], 'uri-id' => $itemuri['id']]); } else { // The item URI does not always contain the GUID. This means that we have to search the URL instead $url = DI::baseUrl()->get() . '/' . DI::args()->getQueryString(); @@ -104,11 +104,11 @@ class Objects extends BaseModule throw new HTTPException\NotFoundException(); } - $etag = md5($parameters['guid'] . '-' . $item['changed']); + $etag = md5(static::$parameters['guid'] . '-' . $item['changed']); $last_modified = $item['changed']; Network::checkEtagModified($etag, $last_modified); - if (empty($parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) { + if (empty(static::$parameters['activity']) && ($item['gravity'] != GRAVITY_ACTIVITY)) { $activity = ActivityPub\Transmitter::createActivityFromItem($item['id'], true); if (empty($activity['type'])) { throw new HTTPException\NotFoundException(); @@ -123,16 +123,16 @@ class Objects extends BaseModule $data = ['@context' => ActivityPub::CONTEXT]; $data = array_merge($data, $activity['object']); - } elseif (empty($parameters['activity']) || in_array($parameters['activity'], + } elseif (empty(static::$parameters['activity']) || in_array(static::$parameters['activity'], ['Create', 'Announce', 'Update', 'Like', 'Dislike', 'Accept', 'Reject', 'TentativeAccept', 'Follow', 'Add'])) { $data = ActivityPub\Transmitter::createActivityFromItem($item['id']); if (empty($data)) { throw new HTTPException\NotFoundException(); } - if (!empty($parameters['activity']) && ($parameters['activity'] != 'Create')) { - $data['type'] = $parameters['activity']; - $data['id'] = str_replace('/Create', '/' . $parameters['activity'], $data['id']); + if (!empty(static::$parameters['activity']) && (static::$parameters['activity'] != 'Create')) { + $data['type'] = static::$parameters['activity']; + $data['id'] = str_replace('/Create', '/' . static::$parameters['activity'], $data['id']); } } else { throw new HTTPException\NotFoundException(); diff --git a/src/Module/ActivityPub/Outbox.php b/src/Module/ActivityPub/Outbox.php index fe838960d..a2ae10839 100644 --- a/src/Module/ActivityPub/Outbox.php +++ b/src/Module/ActivityPub/Outbox.php @@ -31,13 +31,13 @@ use Friendica\Util\HTTPSignature; */ class Outbox extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - if (empty($parameters['nickname'])) { + if (empty(static::$parameters['nickname'])) { throw new \Friendica\Network\HTTPException\NotFoundException(); } - $owner = User::getOwnerDataByNick($parameters['nickname']); + $owner = User::getOwnerDataByNick(static::$parameters['nickname']); if (empty($owner)) { throw new \Friendica\Network\HTTPException\NotFoundException(); } diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php index 79660dee3..dbb2a67a0 100644 --- a/src/Module/Admin/Addons/Details.php +++ b/src/Module/Admin/Addons/Details.php @@ -30,11 +30,11 @@ use Friendica\Util\Strings; class Details extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); - $addon = Strings::sanitizeFilePathItem($parameters['addon']); + $addon = Strings::sanitizeFilePathItem(static::$parameters['addon']); $redirect = 'admin/addons/' . $addon; @@ -52,15 +52,15 @@ class Details extends BaseAdmin DI::baseUrl()->redirect($redirect); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $a = DI::app(); $addons_admin = Addon::getAdminList(); - $addon = Strings::sanitizeFilePathItem($parameters['addon']); + $addon = Strings::sanitizeFilePathItem(static::$parameters['addon']); if (!is_file("addon/$addon/$addon.php")) { notice(DI::l10n()->t('Addon not found.')); Addon::uninstall($addon); diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php index 56d570b28..e018b7c70 100644 --- a/src/Module/Admin/Addons/Index.php +++ b/src/Module/Admin/Addons/Index.php @@ -28,9 +28,9 @@ use Friendica\Module\BaseAdmin; class Index extends BaseAdmin { - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); // reload active themes if (!empty($_GET['action'])) { diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php index bd30e2f8d..33041ee9b 100644 --- a/src/Module/Admin/Blocklist/Contact.php +++ b/src/Module/Admin/Blocklist/Contact.php @@ -32,7 +32,7 @@ use Friendica\Util\Network; class Contact extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -76,9 +76,9 @@ class Contact extends BaseAdmin DI::baseUrl()->redirect('admin/blocklist/contact'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $condition = ['uid' => 0, 'blocked' => true]; diff --git a/src/Module/Admin/Blocklist/Server/Add.php b/src/Module/Admin/Blocklist/Server/Add.php index 03f102640..56b7400f1 100644 --- a/src/Module/Admin/Blocklist/Server/Add.php +++ b/src/Module/Admin/Blocklist/Server/Add.php @@ -32,7 +32,7 @@ use GuzzleHttp\Psr7\Uri; class Add extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -66,9 +66,9 @@ class Add extends BaseAdmin DI::baseUrl()->redirect('admin/blocklist/server'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $gservers = []; diff --git a/src/Module/Admin/Blocklist/Server/Index.php b/src/Module/Admin/Blocklist/Server/Index.php index 7dd59678a..e819c9366 100644 --- a/src/Module/Admin/Blocklist/Server/Index.php +++ b/src/Module/Admin/Blocklist/Server/Index.php @@ -27,7 +27,7 @@ use Friendica\Module\BaseAdmin; class Index extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -56,9 +56,9 @@ class Index extends BaseAdmin DI::baseUrl()->redirect('admin/blocklist/server'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $blocklist = DI::config()->get('system', 'blocklist'); $blocklistform = []; diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php index 9449e3be7..ef9df4491 100644 --- a/src/Module/Admin/DBSync.php +++ b/src/Module/Admin/DBSync.php @@ -30,14 +30,14 @@ use Friendica\Module\BaseAdmin; class DBSync extends BaseAdmin { - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $a = DI::app(); - $action = $parameters['action'] ?? ''; - $update = $parameters['update'] ?? 0; + $action = static::$parameters['action'] ?? ''; + $update = static::$parameters['update'] ?? 0; switch ($action) { case 'mark': diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php index d3af3ebc0..76bb35f53 100644 --- a/src/Module/Admin/Features.php +++ b/src/Module/Admin/Features.php @@ -28,7 +28,7 @@ use Friendica\Module\BaseAdmin; class Features extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -60,9 +60,9 @@ class Features extends BaseAdmin DI::baseUrl()->redirect('admin/features'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $features = []; diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php index 4be231975..9d0070e2d 100644 --- a/src/Module/Admin/Federation.php +++ b/src/Module/Admin/Federation.php @@ -28,9 +28,9 @@ use Friendica\Module\BaseAdmin; class Federation extends BaseAdmin { - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); // get counts on active federation systems this node is knowing // We list the more common systems by name. The rest is counted as "other" diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php index 7afc3b090..9380b02e0 100644 --- a/src/Module/Admin/Item/Delete.php +++ b/src/Module/Admin/Item/Delete.php @@ -29,7 +29,7 @@ use Friendica\Util\Strings; class Delete extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -55,9 +55,9 @@ class Delete extends BaseAdmin DI::baseUrl()->redirect('admin/item/delete'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $t = Renderer::getMarkupTemplate('admin/item/delete.tpl'); diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php index 61e598a68..a6dac1a1a 100644 --- a/src/Module/Admin/Item/Source.php +++ b/src/Module/Admin/Item/Source.php @@ -29,11 +29,11 @@ use Friendica\Module\BaseAdmin; class Source extends BaseAdmin { - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $guid = basename($_REQUEST['guid'] ?? $parameters['guid'] ?? ''); + $guid = basename($_REQUEST['guid'] ?? static::$parameters['guid'] ?? ''); $source = ''; $item_uri = ''; diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php index b0fcaebc3..faf742663 100644 --- a/src/Module/Admin/Logs/Settings.php +++ b/src/Module/Admin/Logs/Settings.php @@ -29,7 +29,7 @@ use Psr\Log\LogLevel; class Settings extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -56,9 +56,9 @@ class Settings extends BaseAdmin DI::baseUrl()->redirect('admin/logs'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $log_choices = [ LogLevel::ERROR => 'Error', diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php index e0e12760b..d1d44c00f 100644 --- a/src/Module/Admin/Logs/View.php +++ b/src/Module/Admin/Logs/View.php @@ -31,9 +31,9 @@ class View extends BaseAdmin { const LIMIT = 500; - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $t = Renderer::getMarkupTemplate('admin/logs/view.tpl'); DI::page()->registerFooterScript(Theme::getPathForFile('js/module/admin/logs/view.js')); @@ -75,7 +75,7 @@ class View extends BaseAdmin ->withLimit(self::LIMIT) ->withFilters($filters) ->withSearch($search); - } catch (Exception $e) { + } catch (\Exception $e) { $error = DI::l10n()->t('Couldn\'t open %1$s log file.
Check to see if file %1$s is readable.', $f); } } diff --git a/src/Module/Admin/PhpInfo.php b/src/Module/Admin/PhpInfo.php index 74cbc3d90..8bf15cb0e 100644 --- a/src/Module/Admin/PhpInfo.php +++ b/src/Module/Admin/PhpInfo.php @@ -25,7 +25,7 @@ use Friendica\Module\BaseAdmin; class PhpInfo extends BaseAdmin { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAdminAccess(); diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php index f0883b361..69c16c39d 100644 --- a/src/Module/Admin/Queue.php +++ b/src/Module/Admin/Queue.php @@ -38,11 +38,11 @@ use Friendica\Util\DateTimeFormat; */ class Queue extends BaseAdmin { - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $status = $parameters['status'] ?? ''; + $status = static::$parameters['status'] ?? ''; // get jobs from the workerqueue table if ($status == 'deferred') { diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 0edc713ae..e8d463f80 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -43,7 +43,7 @@ require_once __DIR__ . '/../../../boot.php'; class Site extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -384,9 +384,9 @@ class Site extends BaseAdmin DI::baseUrl()->redirect('admin/site' . $active_panel); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); /* Installed langs */ $lang_choices = DI::l10n()->getAvailableLanguages(); diff --git a/src/Module/Admin/Storage.php b/src/Module/Admin/Storage.php index 51e70d841..1f598c1a2 100644 --- a/src/Module/Admin/Storage.php +++ b/src/Module/Admin/Storage.php @@ -31,13 +31,13 @@ use Friendica\Util\Strings; class Storage extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); self::checkFormSecurityTokenRedirectOnError('/admin/storage', 'admin_storage'); - $storagebackend = trim($parameters['name'] ?? ''); + $storagebackend = trim(static::$parameters['name'] ?? ''); try { /** @var ICanConfigureStorage|false $newStorageConfig */ @@ -91,9 +91,9 @@ class Storage extends BaseAdmin DI::baseUrl()->redirect('admin/storage'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $current_storage_backend = DI::storage(); $available_storage_forms = []; diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index ca244260f..1eeba4883 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -37,9 +37,9 @@ use Friendica\Util\DateTimeFormat; class Summary extends BaseAdmin { - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $a = DI::app(); diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php index b8ecfe1ce..bd0257268 100644 --- a/src/Module/Admin/Themes/Details.php +++ b/src/Module/Admin/Themes/Details.php @@ -30,11 +30,11 @@ use Friendica\Util\Strings; class Details extends BaseAdmin { - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $theme = Strings::sanitizeFilePathItem($parameters['theme']); + $theme = Strings::sanitizeFilePathItem(static::$parameters['theme']); if (!is_dir("view/theme/$theme")) { notice(DI::l10n()->t("Item not found.")); return ''; diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php index dabc9209e..59855b13b 100644 --- a/src/Module/Admin/Themes/Embed.php +++ b/src/Module/Admin/Themes/Embed.php @@ -28,19 +28,19 @@ use Friendica\Util\Strings; class Embed extends BaseAdmin { - public static function init(array $parameters = []) + public static function init() { - $theme = Strings::sanitizeFilePathItem($parameters['theme']); + $theme = Strings::sanitizeFilePathItem(static::$parameters['theme']); if (is_file("view/theme/$theme/config.php")) { DI::app()->setCurrentTheme($theme); } } - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); - $theme = Strings::sanitizeFilePathItem($parameters['theme']); + $theme = Strings::sanitizeFilePathItem(static::$parameters['theme']); if (is_file("view/theme/$theme/config.php")) { require_once "view/theme/$theme/config.php"; if (function_exists('theme_admin_post')) { @@ -56,11 +56,11 @@ class Embed extends BaseAdmin DI::baseUrl()->redirect('admin/themes/' . $theme . '/embed?mode=minimal'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $theme = Strings::sanitizeFilePathItem($parameters['theme']); + $theme = Strings::sanitizeFilePathItem(static::$parameters['theme']); if (!is_dir("view/theme/$theme")) { notice(DI::l10n()->t('Unknown theme.')); return ''; diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php index d9cb326b4..7bd09695e 100644 --- a/src/Module/Admin/Themes/Index.php +++ b/src/Module/Admin/Themes/Index.php @@ -29,9 +29,9 @@ use Friendica\Util\Strings; class Index extends BaseAdmin { - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $allowed_themes = Theme::getAllowedList(); diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php index 282e5daf1..a31b403f9 100644 --- a/src/Module/Admin/Tos.php +++ b/src/Module/Admin/Tos.php @@ -27,7 +27,7 @@ use Friendica\Module\BaseAdmin; class Tos extends BaseAdmin { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -48,11 +48,11 @@ class Tos extends BaseAdmin DI::baseUrl()->redirect('admin/tos'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $tos = new \Friendica\Module\Tos(); + $tos = new \Friendica\Module\Tos(static::$parameters); $t = Renderer::getMarkupTemplate('admin/tos.tpl'); return Renderer::replaceMacros($t, [ '$title' => DI::l10n()->t('Administration'), diff --git a/src/Module/Admin/Users/Active.php b/src/Module/Admin/Users/Active.php index 7eac47d11..4882ac4eb 100644 --- a/src/Module/Admin/Users/Active.php +++ b/src/Module/Admin/Users/Active.php @@ -30,7 +30,7 @@ use Friendica\Module\Admin\BaseUsers; class Active extends BaseUsers { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -60,12 +60,12 @@ class Active extends BaseUsers DI::baseUrl()->redirect(DI::args()->getQueryString()); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $action = $parameters['action'] ?? ''; - $uid = $parameters['uid'] ?? 0; + $action = static::$parameters['action'] ?? ''; + $uid = static::$parameters['uid'] ?? 0; if ($uid) { $user = User::getById($uid, ['username', 'blocked']); diff --git a/src/Module/Admin/Users/Blocked.php b/src/Module/Admin/Users/Blocked.php index 35e7c25bf..6b8008165 100644 --- a/src/Module/Admin/Users/Blocked.php +++ b/src/Module/Admin/Users/Blocked.php @@ -31,7 +31,7 @@ use Friendica\Util\Temporal; class Blocked extends BaseUsers { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -61,12 +61,12 @@ class Blocked extends BaseUsers DI::baseUrl()->redirect('admin/users/blocked'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $action = $parameters['action'] ?? ''; - $uid = $parameters['uid'] ?? 0; + $action = static::$parameters['action'] ?? ''; + $uid = static::$parameters['uid'] ?? 0; if ($uid) { $user = User::getById($uid, ['username', 'blocked']); diff --git a/src/Module/Admin/Users/Create.php b/src/Module/Admin/Users/Create.php index 078547f46..b80866603 100644 --- a/src/Module/Admin/Users/Create.php +++ b/src/Module/Admin/Users/Create.php @@ -28,7 +28,7 @@ use Friendica\Module\Admin\BaseUsers; class Create extends BaseUsers { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -51,9 +51,9 @@ class Create extends BaseUsers DI::baseUrl()->redirect('admin/users/create'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $t = Renderer::getMarkupTemplate('admin/users/create.tpl'); return self::getTabsHTML('all') . Renderer::replaceMacros($t, [ diff --git a/src/Module/Admin/Users/Deleted.php b/src/Module/Admin/Users/Deleted.php index 2ebaec8b7..8d71b4792 100644 --- a/src/Module/Admin/Users/Deleted.php +++ b/src/Module/Admin/Users/Deleted.php @@ -33,7 +33,7 @@ use Friendica\Util\Temporal; class Deleted extends BaseUsers { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -44,9 +44,9 @@ class Deleted extends BaseUsers DI::baseUrl()->redirect('admin/users/deleted'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 100); diff --git a/src/Module/Admin/Users/Index.php b/src/Module/Admin/Users/Index.php index d391feb44..1137b2cf9 100644 --- a/src/Module/Admin/Users/Index.php +++ b/src/Module/Admin/Users/Index.php @@ -30,7 +30,7 @@ use Friendica\Module\Admin\BaseUsers; class Index extends BaseUsers { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -67,12 +67,12 @@ class Index extends BaseUsers DI::baseUrl()->redirect(DI::args()->getQueryString()); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $action = $parameters['action'] ?? ''; - $uid = $parameters['uid'] ?? 0; + $action = static::$parameters['action'] ?? ''; + $uid = static::$parameters['uid'] ?? 0; if ($uid) { $user = User::getById($uid, ['username', 'blocked']); diff --git a/src/Module/Admin/Users/Pending.php b/src/Module/Admin/Users/Pending.php index 14381682f..ef7d7b12e 100644 --- a/src/Module/Admin/Users/Pending.php +++ b/src/Module/Admin/Users/Pending.php @@ -33,7 +33,7 @@ use Friendica\Util\Temporal; class Pending extends BaseUsers { - public static function post(array $parameters = []) + public static function post() { self::checkAdminAccess(); @@ -58,12 +58,12 @@ class Pending extends BaseUsers DI::baseUrl()->redirect('admin/users/pending'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); - $action = $parameters['action'] ?? ''; - $uid = $parameters['uid'] ?? 0; + $action = static::$parameters['action'] ?? ''; + $uid = static::$parameters['uid'] ?? 0; if ($uid) { $user = User::getById($uid, ['username', 'blocked']); diff --git a/src/Module/Api/Friendica/Activity.php b/src/Module/Api/Friendica/Activity.php index 00228c0cc..b80d0585b 100644 --- a/src/Module/Api/Friendica/Activity.php +++ b/src/Module/Api/Friendica/Activity.php @@ -40,7 +40,7 @@ use Friendica\Module\BaseApi; */ class Activity extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -49,17 +49,17 @@ class Activity extends BaseApi 'id' => 0, // Id of the post ]); - $res = Item::performActivity($request['id'], $parameters['verb'], $uid); + $res = Item::performActivity($request['id'], static::$parameters['verb'], $uid); if ($res) { - if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) { + if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) { $ok = 'true'; } else { $ok = 'ok'; } - DI::apiResponse()->exit('ok', ['ok' => $ok], $parameters['extension'] ?? null); + DI::apiResponse()->exit('ok', ['ok' => $ok], static::$parameters['extension'] ?? null); } else { - DI::apiResponse()->error(500, 'Error adding activity', '', $parameters['extension'] ?? null); + DI::apiResponse()->error(500, 'Error adding activity', '', static::$parameters['extension'] ?? null); } } } diff --git a/src/Module/Api/Friendica/DirectMessages/Setseen.php b/src/Module/Api/Friendica/DirectMessages/Setseen.php index e55ad74b9..dfffe3bbf 100644 --- a/src/Module/Api/Friendica/DirectMessages/Setseen.php +++ b/src/Module/Api/Friendica/DirectMessages/Setseen.php @@ -30,7 +30,7 @@ use Friendica\Module\BaseApi; */ class Setseen extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -42,13 +42,13 @@ class Setseen extends BaseApi // return error if id is zero if (empty($request['id'])) { $answer = ['result' => 'error', 'message' => 'message id not specified']; - DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null); + DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null); } // error message if specified id is not in database if (!DBA::exists('mail', ['id' => $request['id'], 'uid' => $uid])) { $answer = ['result' => 'error', 'message' => 'message id not in database']; - DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null); + DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null); } // update seen indicator @@ -58,6 +58,6 @@ class Setseen extends BaseApi $answer = ['result' => 'error', 'message' => 'unknown error']; } - DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], $parameters['extension'] ?? null); + DI::apiResponse()->exit('direct_messages_setseen', ['$result' => $answer], static::$parameters['extension'] ?? null); } } diff --git a/src/Module/Api/Friendica/Events/Index.php b/src/Module/Api/Friendica/Events/Index.php index 31c55069d..8a610c9d1 100644 --- a/src/Module/Api/Friendica/Events/Index.php +++ b/src/Module/Api/Friendica/Events/Index.php @@ -33,7 +33,7 @@ use Friendica\Module\BaseApi; */ class Index extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); @@ -70,6 +70,6 @@ class Index extends BaseApi ]; } - DI::apiResponse()->exit('events', ['events' => $items], $parameters['extension'] ?? null); + DI::apiResponse()->exit('events', ['events' => $items], static::$parameters['extension'] ?? null); } } diff --git a/src/Module/Api/Friendica/Index.php b/src/Module/Api/Friendica/Index.php index 8891d218a..b028d8bb6 100644 --- a/src/Module/Api/Friendica/Index.php +++ b/src/Module/Api/Friendica/Index.php @@ -31,17 +31,17 @@ use Friendica\Module\BaseApi; */ class Index extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); } - public static function delete(array $parameters = []) + public static function delete() { self::checkAllowedScope(self::SCOPE_WRITE); } - public static function rawContent(array $parameters = []) + public static function rawContent() { echo api_call(DI::app()); exit(); diff --git a/src/Module/Api/Friendica/Notification.php b/src/Module/Api/Friendica/Notification.php index 2a50bde7b..6dc4f7831 100644 --- a/src/Module/Api/Friendica/Notification.php +++ b/src/Module/Api/Friendica/Notification.php @@ -31,7 +31,7 @@ use Friendica\Object\Api\Friendica\Notification as ApiNotification; */ class Notification extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); @@ -43,7 +43,7 @@ class Notification extends BaseApi $notifications[] = new ApiNotification($Notify); } - if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) { + if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) { $xmlnotes = []; foreach ($notifications as $notification) { $xmlnotes[] = ['@attributes' => $notification->toArray()]; @@ -56,6 +56,6 @@ class Notification extends BaseApi $result = false; } - DI::apiResponse()->exit('notes', ['note' => $result], $parameters['extension'] ?? null); + DI::apiResponse()->exit('notes', ['note' => $result], static::$parameters['extension'] ?? null); } } diff --git a/src/Module/Api/Friendica/Photo/Delete.php b/src/Module/Api/Friendica/Photo/Delete.php index cf287d3d3..4eb8e0dcc 100644 --- a/src/Module/Api/Friendica/Photo/Delete.php +++ b/src/Module/Api/Friendica/Photo/Delete.php @@ -33,7 +33,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException; */ class Delete extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -64,7 +64,7 @@ class Delete extends BaseApi Item::deleteForUser($condition, $uid); $result = ['result' => 'deleted', 'message' => 'photo with id `' . $request['photo_id'] . '` has been deleted from server.']; - DI::apiResponse()->exit('photo_delete', ['$result' => $result], $parameters['extension'] ?? null); + DI::apiResponse()->exit('photo_delete', ['$result' => $result], static::$parameters['extension'] ?? null); } else { throw new InternalServerErrorException("unknown error on deleting photo from database table"); } diff --git a/src/Module/Api/Friendica/Photoalbum/Delete.php b/src/Module/Api/Friendica/Photoalbum/Delete.php index dd18365b4..f6dc85fce 100644 --- a/src/Module/Api/Friendica/Photoalbum/Delete.php +++ b/src/Module/Api/Friendica/Photoalbum/Delete.php @@ -34,7 +34,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException; */ class Delete extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -67,7 +67,7 @@ class Delete extends BaseApi // return success of deletion or error message if ($result) { $answer = ['result' => 'deleted', 'message' => 'album `' . $request['album'] . '` with all containing photos has been deleted.']; - DI::apiResponse()->exit('photoalbum_delete', ['$result' => $answer], $parameters['extension'] ?? null); + DI::apiResponse()->exit('photoalbum_delete', ['$result' => $answer], static::$parameters['extension'] ?? null); } else { throw new InternalServerErrorException("unknown error - deleting from database failed"); } diff --git a/src/Module/Api/Friendica/Photoalbum/Update.php b/src/Module/Api/Friendica/Photoalbum/Update.php index 369d33e82..311396db3 100644 --- a/src/Module/Api/Friendica/Photoalbum/Update.php +++ b/src/Module/Api/Friendica/Photoalbum/Update.php @@ -32,7 +32,7 @@ use Friendica\Network\HTTPException\InternalServerErrorException; */ class Update extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -59,7 +59,7 @@ class Update extends BaseApi // return success of updating or error message if ($result) { $answer = ['result' => 'updated', 'message' => 'album `' . $request['album'] . '` with all containing photos has been renamed to `' . $request['album_new'] . '`.']; - DI::apiResponse()->exit('photoalbum_update', ['$result' => $answer], $parameters['extension'] ?? null); + DI::apiResponse()->exit('photoalbum_update', ['$result' => $answer], static::$parameters['extension'] ?? null); } else { throw new InternalServerErrorException("unknown error - updating in database failed"); } diff --git a/src/Module/Api/Friendica/Profile/Show.php b/src/Module/Api/Friendica/Profile/Show.php index e388405ef..ae14c8d41 100644 --- a/src/Module/Api/Friendica/Profile/Show.php +++ b/src/Module/Api/Friendica/Profile/Show.php @@ -34,7 +34,7 @@ use Friendica\Network\HTTPException; */ class Show extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); @@ -49,7 +49,7 @@ class Show extends BaseApi $profile = self::formatProfile($profile, $profileFields); $profiles = []; - if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) { + if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) { $profiles['0:profile'] = $profile; } else { $profiles[] = $profile; @@ -65,7 +65,7 @@ class Show extends BaseApi 'profiles' => $profiles ]; - DI::apiResponse()->exit('friendica_profiles', ['$result' => $result], $parameters['extension'] ?? null); + DI::apiResponse()->exit('friendica_profiles', ['$result' => $result], static::$parameters['extension'] ?? null); } /** diff --git a/src/Module/Api/GNUSocial/GNUSocial/Version.php b/src/Module/Api/GNUSocial/GNUSocial/Version.php index 52393702f..34fc3c692 100644 --- a/src/Module/Api/GNUSocial/GNUSocial/Version.php +++ b/src/Module/Api/GNUSocial/GNUSocial/Version.php @@ -29,8 +29,8 @@ use Friendica\DI; */ class Version extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { - DI::apiResponse()->exit('version', ['version' => '0.9.7'], $parameters['extension'] ?? null); + DI::apiResponse()->exit('version', ['version' => '0.9.7'], static::$parameters['extension'] ?? null); } } diff --git a/src/Module/Api/GNUSocial/Help/Test.php b/src/Module/Api/GNUSocial/Help/Test.php index 3df694c85..6eedfc1ca 100644 --- a/src/Module/Api/GNUSocial/Help/Test.php +++ b/src/Module/Api/GNUSocial/Help/Test.php @@ -29,14 +29,14 @@ use Friendica\DI; */ class Test extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { - if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) { + if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) { $ok = 'true'; } else { $ok = 'ok'; } - DI::apiResponse()->exit('ok', ['ok' => $ok], $parameters['extension'] ?? null); + DI::apiResponse()->exit('ok', ['ok' => $ok], static::$parameters['extension'] ?? null); } } diff --git a/src/Module/Api/Mastodon/Accounts.php b/src/Module/Api/Mastodon/Accounts.php index 781547854..360993397 100644 --- a/src/Module/Api/Mastodon/Accounts.php +++ b/src/Module/Api/Mastodon/Accounts.php @@ -33,27 +33,26 @@ use Friendica\Module\BaseApi; class Accounts extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $uid = self::getCurrentUserID(); - if (empty($parameters['id']) && empty($parameters['name'])) { + if (empty(static::$parameters['id']) && empty(static::$parameters['name'])) { DI::mstdnError()->UnprocessableEntity(); } - if (!empty($parameters['id'])) { - $id = $parameters['id']; + if (!empty(static::$parameters['id'])) { + $id = static::$parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } } else { - $contact = Contact::selectFirst(['id'], ['nick' => $parameters['name'], 'uid' => 0]); + $contact = Contact::selectFirst(['id'], ['nick' => static::$parameters['name'], 'uid' => 0]); if (!empty($contact['id'])) { $id = $contact['id']; - } elseif (!($id = Contact::getIdForURL($parameters['name'], 0, false))) { + } elseif (!($id = Contact::getIdForURL(static::$parameters['name'], 0, false))) { DI::mstdnError()->RecordNotFound(); } } diff --git a/src/Module/Api/Mastodon/Accounts/Block.php b/src/Module/Api/Mastodon/Accounts/Block.php index 463383df7..c32862ca4 100644 --- a/src/Module/Api/Mastodon/Accounts/Block.php +++ b/src/Module/Api/Mastodon/Accounts/Block.php @@ -32,12 +32,12 @@ use Friendica\Module\BaseApi; */ class Block extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_FOLLOW); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } @@ -46,7 +46,7 @@ class Block extends BaseApi DI::mstdnError()->Forbidden(); } - $cdata = Contact::getPublicAndUserContactID($parameters['id'], $uid); + $cdata = Contact::getPublicAndUserContactID(static::$parameters['id'], $uid); if (empty($cdata['user'])) { DI::mstdnError()->RecordNotFound(); } @@ -62,6 +62,6 @@ class Block extends BaseApi Contact::terminateFriendship($owner, $contact); Contact::revokeFollow($contact); - System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Accounts/FeaturedTags.php b/src/Module/Api/Mastodon/Accounts/FeaturedTags.php index c4a4a561c..cbb409d1b 100644 --- a/src/Module/Api/Mastodon/Accounts/FeaturedTags.php +++ b/src/Module/Api/Mastodon/Accounts/FeaturedTags.php @@ -30,10 +30,9 @@ use Friendica\Module\BaseApi; class FeaturedTags extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); diff --git a/src/Module/Api/Mastodon/Accounts/Follow.php b/src/Module/Api/Mastodon/Accounts/Follow.php index ab7038e97..b02ee1802 100644 --- a/src/Module/Api/Mastodon/Accounts/Follow.php +++ b/src/Module/Api/Mastodon/Accounts/Follow.php @@ -31,16 +31,16 @@ use Friendica\Module\BaseApi; */ class Follow extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_FOLLOW); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $cid = Contact::follow($parameters['id'], $uid); + $cid = Contact::follow(static::$parameters['id'], $uid); System::jsonExit(DI::mstdnRelationship()->createFromContactId($cid, $uid)->toArray()); } diff --git a/src/Module/Api/Mastodon/Accounts/Followers.php b/src/Module/Api/Mastodon/Accounts/Followers.php index e1f864acb..3d24da2df 100644 --- a/src/Module/Api/Mastodon/Accounts/Followers.php +++ b/src/Module/Api/Mastodon/Accounts/Followers.php @@ -32,19 +32,18 @@ use Friendica\Module\BaseApi; class Followers extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } @@ -73,7 +72,7 @@ class Followers extends BaseApi $params['order'] = ['cid']; } - $followers = DBA::select('contact-relation', ['relation-cid'], $condition, $parameters); + $followers = DBA::select('contact-relation', ['relation-cid'], $condition, static::$parameters); while ($follower = DBA::fetch($followers)) { self::setBoundaries($follower['relation-cid']); $accounts[] = DI::mstdnAccount()->createFromContactId($follower['relation-cid'], $uid); diff --git a/src/Module/Api/Mastodon/Accounts/Following.php b/src/Module/Api/Mastodon/Accounts/Following.php index e2b963e0c..d3d804704 100644 --- a/src/Module/Api/Mastodon/Accounts/Following.php +++ b/src/Module/Api/Mastodon/Accounts/Following.php @@ -32,19 +32,18 @@ use Friendica\Module\BaseApi; class Following extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } @@ -73,7 +72,7 @@ class Following extends BaseApi $params['order'] = ['cid']; } - $followers = DBA::select('contact-relation', ['cid'], $condition, $parameters); + $followers = DBA::select('contact-relation', ['cid'], $condition, static::$parameters); while ($follower = DBA::fetch($followers)) { self::setBoundaries($follower['cid']); $accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid); diff --git a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php index 6abb416d1..f36d656f5 100644 --- a/src/Module/Api/Mastodon/Accounts/IdentityProofs.php +++ b/src/Module/Api/Mastodon/Accounts/IdentityProofs.php @@ -30,10 +30,9 @@ use Friendica\Module\BaseApi; class IdentityProofs extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); diff --git a/src/Module/Api/Mastodon/Accounts/Lists.php b/src/Module/Api/Mastodon/Accounts/Lists.php index 908674940..3ec24bcc1 100644 --- a/src/Module/Api/Mastodon/Accounts/Lists.php +++ b/src/Module/Api/Mastodon/Accounts/Lists.php @@ -33,19 +33,18 @@ use Friendica\Module\BaseApi; class Lists extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } diff --git a/src/Module/Api/Mastodon/Accounts/Mute.php b/src/Module/Api/Mastodon/Accounts/Mute.php index 1d878269d..b0b14a614 100644 --- a/src/Module/Api/Mastodon/Accounts/Mute.php +++ b/src/Module/Api/Mastodon/Accounts/Mute.php @@ -31,17 +31,17 @@ use Friendica\Module\BaseApi; */ class Mute extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_FOLLOW); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - Contact\User::setIgnored($parameters['id'], $uid, true); + Contact\User::setIgnored(static::$parameters['id'], $uid, true); - System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Accounts/Note.php b/src/Module/Api/Mastodon/Accounts/Note.php index e63192202..ae6e582e8 100644 --- a/src/Module/Api/Mastodon/Accounts/Note.php +++ b/src/Module/Api/Mastodon/Accounts/Note.php @@ -32,12 +32,12 @@ use Friendica\Module\BaseApi; */ class Note extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } @@ -45,13 +45,13 @@ class Note extends BaseApi 'comment' => '', ]); - $cdata = Contact::getPublicAndUserContactID($parameters['id'], $uid); + $cdata = Contact::getPublicAndUserContactID(static::$parameters['id'], $uid); if (empty($cdata['user'])) { DI::mstdnError()->RecordNotFound(); } Contact::update(['info' => $request['comment']], ['id' => $cdata['user']]); - System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Accounts/Relationships.php b/src/Module/Api/Mastodon/Accounts/Relationships.php index 5631952d2..28135e5eb 100644 --- a/src/Module/Api/Mastodon/Accounts/Relationships.php +++ b/src/Module/Api/Mastodon/Accounts/Relationships.php @@ -32,10 +32,9 @@ use Friendica\Module\BaseApi; class Relationships extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Accounts/Search.php b/src/Module/Api/Mastodon/Accounts/Search.php index c31189a42..6b9d2d43f 100644 --- a/src/Module/Api/Mastodon/Accounts/Search.php +++ b/src/Module/Api/Mastodon/Accounts/Search.php @@ -35,10 +35,9 @@ use Friendica\Object\Search\ContactResult; class Search extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Accounts/Statuses.php b/src/Module/Api/Mastodon/Accounts/Statuses.php index 0e7a7fb33..c3252d59f 100644 --- a/src/Module/Api/Mastodon/Accounts/Statuses.php +++ b/src/Module/Api/Mastodon/Accounts/Statuses.php @@ -37,18 +37,17 @@ use Friendica\Protocol\Activity; class Statuses extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } diff --git a/src/Module/Api/Mastodon/Accounts/Unblock.php b/src/Module/Api/Mastodon/Accounts/Unblock.php index b1c93ea36..26a115042 100644 --- a/src/Module/Api/Mastodon/Accounts/Unblock.php +++ b/src/Module/Api/Mastodon/Accounts/Unblock.php @@ -31,17 +31,17 @@ use Friendica\Module\BaseApi; */ class Unblock extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_FOLLOW); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - Contact\User::setBlocked($parameters['id'], $uid, false); + Contact\User::setBlocked(static::$parameters['id'], $uid, false); - System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Accounts/Unfollow.php b/src/Module/Api/Mastodon/Accounts/Unfollow.php index 447b1cd65..cd7aef7ab 100644 --- a/src/Module/Api/Mastodon/Accounts/Unfollow.php +++ b/src/Module/Api/Mastodon/Accounts/Unfollow.php @@ -31,17 +31,17 @@ use Friendica\Module\BaseApi; */ class Unfollow extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_FOLLOW); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - Contact::unfollow($parameters['id'], $uid); + Contact::unfollow(static::$parameters['id'], $uid); - System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Accounts/Unmute.php b/src/Module/Api/Mastodon/Accounts/Unmute.php index bc2e50be9..eb1ad8bfa 100644 --- a/src/Module/Api/Mastodon/Accounts/Unmute.php +++ b/src/Module/Api/Mastodon/Accounts/Unmute.php @@ -31,17 +31,17 @@ use Friendica\Module\BaseApi; */ class Unmute extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_FOLLOW); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - Contact\User::setIgnored($parameters['id'], $uid, false); + Contact\User::setIgnored(static::$parameters['id'], $uid, false); - System::jsonExit(DI::mstdnRelationship()->createFromContactId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnRelationship()->createFromContactId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php index 449e26fb9..264a2a4a8 100644 --- a/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php +++ b/src/Module/Api/Mastodon/Accounts/UpdateCredentials.php @@ -32,7 +32,7 @@ use Friendica\Util\HTTPInputData; */ class UpdateCredentials extends BaseApi { - public static function patch(array $parameters = []) + public static function patch() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php index 1c1945438..f91545ee1 100644 --- a/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php +++ b/src/Module/Api/Mastodon/Accounts/VerifyCredentials.php @@ -33,10 +33,9 @@ use Friendica\Module\BaseApi; class VerifyCredentials extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Announcements.php b/src/Module/Api/Mastodon/Announcements.php index 5a414fda1..23ad0feeb 100644 --- a/src/Module/Api/Mastodon/Announcements.php +++ b/src/Module/Api/Mastodon/Announcements.php @@ -30,10 +30,9 @@ use Friendica\Module\BaseApi; class Announcements extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); diff --git a/src/Module/Api/Mastodon/Apps.php b/src/Module/Api/Mastodon/Apps.php index 040607137..adbcd723d 100644 --- a/src/Module/Api/Mastodon/Apps.php +++ b/src/Module/Api/Mastodon/Apps.php @@ -33,10 +33,9 @@ use Friendica\Util\Network; class Apps extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function post(array $parameters = []) + public static function post() { $request = self::getRequest([ 'client_name' => '', diff --git a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php index e4105f142..baa3aa7fa 100644 --- a/src/Module/Api/Mastodon/Apps/VerifyCredentials.php +++ b/src/Module/Api/Mastodon/Apps/VerifyCredentials.php @@ -30,7 +30,7 @@ use Friendica\Module\BaseApi; */ class VerifyCredentials extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $application = self::getCurrentApplication(); diff --git a/src/Module/Api/Mastodon/Blocks.php b/src/Module/Api/Mastodon/Blocks.php index 305914c1a..fbcaf2ded 100644 --- a/src/Module/Api/Mastodon/Blocks.php +++ b/src/Module/Api/Mastodon/Blocks.php @@ -32,19 +32,18 @@ use Friendica\Module\BaseApi; class Blocks extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } @@ -73,7 +72,7 @@ class Blocks extends BaseApi $params['order'] = ['cid']; } - $followers = DBA::select('user-contact', ['cid'], $condition, $parameters); + $followers = DBA::select('user-contact', ['cid'], $condition, static::$parameters); while ($follower = DBA::fetch($followers)) { self::setBoundaries($follower['cid']); $accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid); diff --git a/src/Module/Api/Mastodon/Bookmarks.php b/src/Module/Api/Mastodon/Bookmarks.php index a7141e3dc..6cfa08772 100644 --- a/src/Module/Api/Mastodon/Bookmarks.php +++ b/src/Module/Api/Mastodon/Bookmarks.php @@ -34,10 +34,9 @@ use Friendica\Network\HTTPException; class Bookmarks extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Conversations.php b/src/Module/Api/Mastodon/Conversations.php index 22774b57c..af2632ae6 100644 --- a/src/Module/Api/Mastodon/Conversations.php +++ b/src/Module/Api/Mastodon/Conversations.php @@ -31,26 +31,25 @@ use Friendica\Module\BaseApi; */ class Conversations extends BaseApi { - public static function delete(array $parameters = []) + public static function delete() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (!empty($parameters['id'])) { + if (!empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - DBA::delete('conv', ['id' => $parameters['id'], 'uid' => $uid]); - DBA::delete('mail', ['convid' => $parameters['id'], 'uid' => $uid]); + DBA::delete('conv', ['id' => static::$parameters['id'], 'uid' => $uid]); + DBA::delete('mail', ['convid' => static::$parameters['id'], 'uid' => $uid]); System::jsonExit([]); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Conversations/Read.php b/src/Module/Api/Mastodon/Conversations/Read.php index c469eea34..b23a95b5e 100644 --- a/src/Module/Api/Mastodon/Conversations/Read.php +++ b/src/Module/Api/Mastodon/Conversations/Read.php @@ -31,17 +31,17 @@ use Friendica\Module\BaseApi; */ class Read extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (!empty($parameters['id'])) { + if (!empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - DBA::update('mail', ['seen' => true], ['convid' => $parameters['id'], 'uid' => $uid]); + DBA::update('mail', ['seen' => true], ['convid' => static::$parameters['id'], 'uid' => $uid]); - System::jsonExit(DI::mstdnConversation()->CreateFromConvId($parameters['id'])->toArray()); + System::jsonExit(DI::mstdnConversation()->CreateFromConvId(static::$parameters['id'])->toArray()); } } diff --git a/src/Module/Api/Mastodon/CustomEmojis.php b/src/Module/Api/Mastodon/CustomEmojis.php index a9723414d..a16eedf2f 100644 --- a/src/Module/Api/Mastodon/CustomEmojis.php +++ b/src/Module/Api/Mastodon/CustomEmojis.php @@ -33,12 +33,11 @@ use Friendica\Network\HTTPException; class CustomEmojis extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException * @throws \ImagickException * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#pending-follows */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $emojis = DI::mstdnEmoji()->createCollectionFromSmilies(Smilies::getList()); diff --git a/src/Module/Api/Mastodon/Directory.php b/src/Module/Api/Mastodon/Directory.php index 115b02a86..ec579d2da 100644 --- a/src/Module/Api/Mastodon/Directory.php +++ b/src/Module/Api/Mastodon/Directory.php @@ -35,12 +35,11 @@ use Friendica\Network\HTTPException; class Directory extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException * @throws \ImagickException * @see https://docs.joinmastodon.org/methods/instance/directory/ */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $request = self::getRequest([ 'offset' => 0, // How many accounts to skip before returning results. Default 0. diff --git a/src/Module/Api/Mastodon/Endorsements.php b/src/Module/Api/Mastodon/Endorsements.php index 9c5e853bc..5b90cc48a 100644 --- a/src/Module/Api/Mastodon/Endorsements.php +++ b/src/Module/Api/Mastodon/Endorsements.php @@ -30,10 +30,9 @@ use Friendica\Module\BaseApi; class Endorsements extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { System::jsonExit([]); } diff --git a/src/Module/Api/Mastodon/Favourited.php b/src/Module/Api/Mastodon/Favourited.php index 31e760d3b..f49d35a7b 100644 --- a/src/Module/Api/Mastodon/Favourited.php +++ b/src/Module/Api/Mastodon/Favourited.php @@ -35,10 +35,9 @@ use Friendica\Protocol\Activity; class Favourited extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Filters.php b/src/Module/Api/Mastodon/Filters.php index f14b74a0b..365ed65f3 100644 --- a/src/Module/Api/Mastodon/Filters.php +++ b/src/Module/Api/Mastodon/Filters.php @@ -31,7 +31,7 @@ use Friendica\Module\BaseApi; */ class Filters extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); @@ -39,10 +39,9 @@ class Filters extends BaseApi } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); diff --git a/src/Module/Api/Mastodon/FollowRequests.php b/src/Module/Api/Mastodon/FollowRequests.php index bc7cc31bb..2fb548b35 100644 --- a/src/Module/Api/Mastodon/FollowRequests.php +++ b/src/Module/Api/Mastodon/FollowRequests.php @@ -33,7 +33,6 @@ use Friendica\Network\HTTPException; class FollowRequests extends BaseApi { /** - * @param array $parameters * @throws HTTPException\BadRequestException * @throws HTTPException\InternalServerErrorException * @throws HTTPException\NotFoundException @@ -43,16 +42,16 @@ class FollowRequests extends BaseApi * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#accept-follow * @see https://docs.joinmastodon.org/methods/accounts/follow_requests#reject-follow */ - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_FOLLOW); $uid = self::getCurrentUserID(); - $introduction = DI::intro()->selectOneById($parameters['id'], $uid); + $introduction = DI::intro()->selectOneById(static::$parameters['id'], $uid); $contactId = $introduction->cid; - switch ($parameters['action']) { + switch (static::$parameters['action']) { case 'authorize': Contact\Introduction::confirm($introduction); $relationship = DI::mstdnRelationship()->createFromContactId($contactId, $uid); @@ -79,12 +78,11 @@ class FollowRequests extends BaseApi } /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException * @throws \ImagickException * @see https://docs.joinmastodon.org/methods/accounts/follow_requests/ */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Instance.php b/src/Module/Api/Mastodon/Instance.php index 2e73a440d..5f3345853 100644 --- a/src/Module/Api/Mastodon/Instance.php +++ b/src/Module/Api/Mastodon/Instance.php @@ -31,10 +31,9 @@ use Friendica\Object\Api\Mastodon\Instance as InstanceEntity; class Instance extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { System::jsonExit(InstanceEntity::get()); } diff --git a/src/Module/Api/Mastodon/Instance/Peers.php b/src/Module/Api/Mastodon/Instance/Peers.php index be18a5aa1..5d4642e0b 100644 --- a/src/Module/Api/Mastodon/Instance/Peers.php +++ b/src/Module/Api/Mastodon/Instance/Peers.php @@ -34,10 +34,9 @@ use Friendica\Util\Network; class Peers extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $return = []; diff --git a/src/Module/Api/Mastodon/Instance/Rules.php b/src/Module/Api/Mastodon/Instance/Rules.php index 9b7d2dc77..bb5822702 100644 --- a/src/Module/Api/Mastodon/Instance/Rules.php +++ b/src/Module/Api/Mastodon/Instance/Rules.php @@ -34,10 +34,9 @@ use Friendica\Network\HTTPException; class Rules extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $rules = []; $id = 0; diff --git a/src/Module/Api/Mastodon/Lists.php b/src/Module/Api/Mastodon/Lists.php index 8be4207ea..f977ce103 100644 --- a/src/Module/Api/Mastodon/Lists.php +++ b/src/Module/Api/Mastodon/Lists.php @@ -31,27 +31,27 @@ use Friendica\Model\Group; */ class Lists extends BaseApi { - public static function delete(array $parameters = []) + public static function delete() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - if (!Group::exists($parameters['id'], $uid)) { + if (!Group::exists(static::$parameters['id'], $uid)) { DI::mstdnError()->RecordNotFound(); } - if (!Group::remove($parameters['id'])) { + if (!Group::remove(static::$parameters['id'])) { DI::mstdnError()->InternalError(); } System::jsonExit([]); } - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -74,30 +74,29 @@ class Lists extends BaseApi System::jsonExit(DI::mstdnList()->createFromGroupId($id)); } - public static function put(array $parameters = []) + public static function put() { $request = self::getRequest([ 'title' => '', // The title of the list to be updated. 'replies_policy' => '', // One of: "followed", "list", or "none". ]); - if (empty($request['title']) || empty($parameters['id'])) { + if (empty($request['title']) || empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - Group::update($parameters['id'], $request['title']); + Group::update(static::$parameters['id'], $request['title']); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { $lists = []; $groups = Group::getByUserId($uid); @@ -106,7 +105,7 @@ class Lists extends BaseApi $lists[] = DI::mstdnList()->createFromGroupId($group['id']); } } else { - $id = $parameters['id']; + $id = static::$parameters['id']; if (!Group::exists($id, $uid)) { DI::mstdnError()->RecordNotFound(); diff --git a/src/Module/Api/Mastodon/Lists/Accounts.php b/src/Module/Api/Mastodon/Lists/Accounts.php index b83f4903a..0e008602d 100644 --- a/src/Module/Api/Mastodon/Lists/Accounts.php +++ b/src/Module/Api/Mastodon/Lists/Accounts.php @@ -35,30 +35,29 @@ use Friendica\Module\BaseApi; */ class Accounts extends BaseApi { - public static function delete(array $parameters = []) + public static function delete() { DI::apiResponse()->unsupported(Router::DELETE); } - public static function post(array $parameters = []) + public static function post() { DI::apiResponse()->unsupported(Router::POST); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!DBA::exists('group', ['id' => $id, 'uid' => $uid])) { DI::mstdnError()->RecordNotFound(); } diff --git a/src/Module/Api/Mastodon/Markers.php b/src/Module/Api/Mastodon/Markers.php index 394d508d7..5843585e2 100644 --- a/src/Module/Api/Mastodon/Markers.php +++ b/src/Module/Api/Mastodon/Markers.php @@ -31,7 +31,7 @@ use Friendica\Module\BaseApi; */ class Markers extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); @@ -39,10 +39,9 @@ class Markers extends BaseApi } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); diff --git a/src/Module/Api/Mastodon/Media.php b/src/Module/Api/Mastodon/Media.php index b93a06288..65aa28139 100644 --- a/src/Module/Api/Mastodon/Media.php +++ b/src/Module/Api/Mastodon/Media.php @@ -32,7 +32,7 @@ use Friendica\Module\BaseApi; */ class Media extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -53,7 +53,7 @@ class Media extends BaseApi System::jsonExit(DI::mstdnAttachment()->createFromPhoto($media['id'])); } - public static function put(array $parameters = []) + public static function put() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -65,34 +65,33 @@ class Media extends BaseApi 'focus' => '', // Two floating points (x,y), comma-delimited ranging from -1.0 to 1.0 ]); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $photo = Photo::selectFirst(['resource-id'], ['id' => $parameters['id'], 'uid' => $uid]); + $photo = Photo::selectFirst(['resource-id'], ['id' => static::$parameters['id'], 'uid' => $uid]); if (empty($photo['resource-id'])) { DI::mstdnError()->RecordNotFound(); } Photo::update(['desc' => $request['description']], ['resource-id' => $photo['resource-id']]); - System::jsonExit(DI::mstdnAttachment()->createFromPhoto($parameters['id'])); + System::jsonExit(DI::mstdnAttachment()->createFromPhoto(static::$parameters['id'])); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!Photo::exists(['id' => $id, 'uid' => $uid])) { DI::mstdnError()->RecordNotFound(); } diff --git a/src/Module/Api/Mastodon/Mutes.php b/src/Module/Api/Mastodon/Mutes.php index 7939da114..da9b75dd9 100644 --- a/src/Module/Api/Mastodon/Mutes.php +++ b/src/Module/Api/Mastodon/Mutes.php @@ -32,19 +32,18 @@ use Friendica\Module\BaseApi; class Mutes extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!DBA::exists('contact', ['id' => $id, 'uid' => 0])) { DI::mstdnError()->RecordNotFound(); } @@ -73,7 +72,7 @@ class Mutes extends BaseApi $params['order'] = ['cid']; } - $followers = DBA::select('user-contact', ['cid'], $condition, $parameters); + $followers = DBA::select('user-contact', ['cid'], $condition, static::$parameters); while ($follower = DBA::fetch($followers)) { self::setBoundaries($follower['cid']); $accounts[] = DI::mstdnAccount()->createFromContactId($follower['cid'], $uid); diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php index a6a024d9b..3c2e0d438 100644 --- a/src/Module/Api/Mastodon/Notifications.php +++ b/src/Module/Api/Mastodon/Notifications.php @@ -38,16 +38,15 @@ use Friendica\Protocol\Activity; class Notifications extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (!empty($parameters['id'])) { - $id = $parameters['id']; + if (!empty(static::$parameters['id'])) { + $id = static::$parameters['id']; try { $notification = DI::notification()->selectOneForUser($uid, ['id' => $id]); System::jsonExit(DI::mstdnNotification()->createFromNotification($notification)); diff --git a/src/Module/Api/Mastodon/Notifications/Clear.php b/src/Module/Api/Mastodon/Notifications/Clear.php index 9dca0bf65..93639d8a6 100644 --- a/src/Module/Api/Mastodon/Notifications/Clear.php +++ b/src/Module/Api/Mastodon/Notifications/Clear.php @@ -30,7 +30,7 @@ use Friendica\Module\BaseApi; */ class Clear extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Notifications/Dismiss.php b/src/Module/Api/Mastodon/Notifications/Dismiss.php index b615c5e89..e3fc3290a 100644 --- a/src/Module/Api/Mastodon/Notifications/Dismiss.php +++ b/src/Module/Api/Mastodon/Notifications/Dismiss.php @@ -32,16 +32,16 @@ use Friendica\Network\HTTPException\ForbiddenException; */ class Dismiss extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $Notification = DI::notification()->selectOneForUser($uid, $parameters['id']); + $Notification = DI::notification()->selectOneForUser($uid, static::$parameters['id']); $Notification->setSeen(); DI::notification()->save($Notification); diff --git a/src/Module/Api/Mastodon/Preferences.php b/src/Module/Api/Mastodon/Preferences.php index d54bd85fa..21361e1f3 100644 --- a/src/Module/Api/Mastodon/Preferences.php +++ b/src/Module/Api/Mastodon/Preferences.php @@ -32,10 +32,9 @@ use Friendica\Module\BaseApi; class Preferences extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Proofs.php b/src/Module/Api/Mastodon/Proofs.php index 1d09a9211..9bdc77f49 100644 --- a/src/Module/Api/Mastodon/Proofs.php +++ b/src/Module/Api/Mastodon/Proofs.php @@ -30,10 +30,9 @@ use Friendica\Module\BaseApi; class Proofs extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { System::jsonError(404, ['error' => 'Record not found']); } diff --git a/src/Module/Api/Mastodon/PushSubscription.php b/src/Module/Api/Mastodon/PushSubscription.php index 3bc77aeb6..715041643 100644 --- a/src/Module/Api/Mastodon/PushSubscription.php +++ b/src/Module/Api/Mastodon/PushSubscription.php @@ -33,7 +33,7 @@ use Friendica\Object\Api\Mastodon\Notification; */ class PushSubscription extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_PUSH); $uid = self::getCurrentUserID(); @@ -66,7 +66,7 @@ class PushSubscription extends BaseApi return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray(); } - public static function put(array $parameters = []) + public static function put() { self::checkAllowedScope(self::SCOPE_PUSH); $uid = self::getCurrentUserID(); @@ -99,7 +99,7 @@ class PushSubscription extends BaseApi return DI::mstdnSubscription()->createForApplicationIdAndUserId($application['id'], $uid)->toArray(); } - public static function delete(array $parameters = []) + public static function delete() { self::checkAllowedScope(self::SCOPE_PUSH); $uid = self::getCurrentUserID(); @@ -112,7 +112,7 @@ class PushSubscription extends BaseApi System::jsonExit([]); } - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_PUSH); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/ScheduledStatuses.php b/src/Module/Api/Mastodon/ScheduledStatuses.php index 82be0d6e7..6a4971860 100644 --- a/src/Module/Api/Mastodon/ScheduledStatuses.php +++ b/src/Module/Api/Mastodon/ScheduledStatuses.php @@ -34,7 +34,7 @@ use Friendica\Module\BaseApi; */ class ScheduledStatuses extends BaseApi { - public static function put(array $parameters = []) + public static function put() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -42,35 +42,34 @@ class ScheduledStatuses extends BaseApi DI::apiResponse()->unsupported(Router::PUT); } - public static function delete(array $parameters = []) + public static function delete() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - if (!DBA::exists('delayed-post', ['id' => $parameters['id'], 'uid' => $uid])) { + if (!DBA::exists('delayed-post', ['id' => static::$parameters['id'], 'uid' => $uid])) { DI::mstdnError()->RecordNotFound(); } - Post\Delayed::deleteById($parameters['id']); + Post\Delayed::deleteById(static::$parameters['id']); System::jsonExit([]); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (isset($parameters['id'])) { - System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId($parameters['id'], $uid)->toArray()); + if (isset(static::$parameters['id'])) { + System::jsonExit(DI::mstdnScheduledStatus()->createFromDelayedPostId(static::$parameters['id'], $uid)->toArray()); } $request = self::getRequest([ diff --git a/src/Module/Api/Mastodon/Search.php b/src/Module/Api/Mastodon/Search.php index 63190151d..d17db271f 100644 --- a/src/Module/Api/Mastodon/Search.php +++ b/src/Module/Api/Mastodon/Search.php @@ -38,10 +38,9 @@ use Friendica\Object\Search\ContactResult; class Search extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); @@ -74,7 +73,7 @@ class Search extends BaseApi $result['statuses'] = self::searchStatuses($uid, $request['q'], $request['account_id'], $request['max_id'], $request['min_id'], $limit, $request['offset']); } if ((empty($request['type']) || ($request['type'] == 'hashtags')) && (strpos($request['q'], '@') == false)) { - $result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], $parameters['version']); + $result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], static::$parameters['version']); } System::jsonExit($result); diff --git a/src/Module/Api/Mastodon/Statuses.php b/src/Module/Api/Mastodon/Statuses.php index ed5abf199..75e22802e 100644 --- a/src/Module/Api/Mastodon/Statuses.php +++ b/src/Module/Api/Mastodon/Statuses.php @@ -41,7 +41,7 @@ use Friendica\Util\Images; */ class Statuses extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); @@ -207,16 +207,16 @@ class Statuses extends BaseApi DI::mstdnError()->InternalError(); } - public static function delete(array $parameters = []) + public static function delete() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $parameters['id'], 'uid' => $uid]); + $item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => $uid]); if (empty($item['id'])) { DI::mstdnError()->RecordNotFound(); } @@ -229,17 +229,16 @@ class Statuses extends BaseApi } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)); } } diff --git a/src/Module/Api/Mastodon/Statuses/Bookmark.php b/src/Module/Api/Mastodon/Statuses/Bookmark.php index 79be11a4a..e12c6ecd2 100644 --- a/src/Module/Api/Mastodon/Statuses/Bookmark.php +++ b/src/Module/Api/Mastodon/Statuses/Bookmark.php @@ -33,16 +33,16 @@ use Friendica\Module\BaseApi; */ class Bookmark extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -53,6 +53,6 @@ class Bookmark extends BaseApi Item::update(['starred' => true], ['id' => $item['id']]); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Card.php b/src/Module/Api/Mastodon/Statuses/Card.php index 2fe482554..3c8cf706e 100644 --- a/src/Module/Api/Mastodon/Statuses/Card.php +++ b/src/Module/Api/Mastodon/Statuses/Card.php @@ -33,18 +33,17 @@ use Friendica\Network\HTTPException; class Card extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) { throw new HTTPException\NotFoundException('Item with URI ID ' . $id . ' not found' . ($uid ? ' for user ' . $uid : '.')); diff --git a/src/Module/Api/Mastodon/Statuses/Context.php b/src/Module/Api/Mastodon/Statuses/Context.php index 62397afdb..b8a800721 100644 --- a/src/Module/Api/Mastodon/Statuses/Context.php +++ b/src/Module/Api/Mastodon/Statuses/Context.php @@ -33,14 +33,13 @@ use Friendica\Module\BaseApi; class Context extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } @@ -48,7 +47,7 @@ class Context extends BaseApi 'limit' => 40, // Maximum number of results to return. Defaults to 40. ]); - $id = $parameters['id']; + $id = static::$parameters['id']; $parents = []; $children = []; diff --git a/src/Module/Api/Mastodon/Statuses/Favourite.php b/src/Module/Api/Mastodon/Statuses/Favourite.php index a30ad0fe7..00844c544 100644 --- a/src/Module/Api/Mastodon/Statuses/Favourite.php +++ b/src/Module/Api/Mastodon/Statuses/Favourite.php @@ -33,22 +33,22 @@ use Friendica\Module\BaseApi; */ class Favourite extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } Item::performActivity($item['id'], 'like', $uid); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php index 67dc4b67f..5a1a6116a 100644 --- a/src/Module/Api/Mastodon/Statuses/FavouritedBy.php +++ b/src/Module/Api/Mastodon/Statuses/FavouritedBy.php @@ -33,18 +33,17 @@ use Friendica\Protocol\Activity; class FavouritedBy extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) { DI::mstdnError()->RecordNotFound(); } diff --git a/src/Module/Api/Mastodon/Statuses/Mute.php b/src/Module/Api/Mastodon/Statuses/Mute.php index 812daff4d..f9200197f 100644 --- a/src/Module/Api/Mastodon/Statuses/Mute.php +++ b/src/Module/Api/Mastodon/Statuses/Mute.php @@ -32,16 +32,16 @@ use Friendica\Module\BaseApi; */ class Mute extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -50,8 +50,8 @@ class Mute extends BaseApi DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be muted')); } - Post\ThreadUser::setIgnored($parameters['id'], $uid, true); + Post\ThreadUser::setIgnored(static::$parameters['id'], $uid, true); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Pin.php b/src/Module/Api/Mastodon/Statuses/Pin.php index 1d5498167..bf6f5bb39 100644 --- a/src/Module/Api/Mastodon/Statuses/Pin.php +++ b/src/Module/Api/Mastodon/Statuses/Pin.php @@ -32,16 +32,16 @@ use Friendica\Module\BaseApi; */ class Pin extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -50,8 +50,8 @@ class Pin extends BaseApi DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be pinned')); } - Post\ThreadUser::setPinned($parameters['id'], $uid, true); + Post\ThreadUser::setPinned(static::$parameters['id'], $uid, true); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Reblog.php b/src/Module/Api/Mastodon/Statuses/Reblog.php index 1af7efb82..0bba905f7 100644 --- a/src/Module/Api/Mastodon/Statuses/Reblog.php +++ b/src/Module/Api/Mastodon/Statuses/Reblog.php @@ -35,16 +35,16 @@ use Friendica\Module\BaseApi; */ class Reblog extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -55,6 +55,6 @@ class Reblog extends BaseApi Item::performActivity($item['id'], 'announce', $uid); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php index 11c15b41e..06431969a 100644 --- a/src/Module/Api/Mastodon/Statuses/RebloggedBy.php +++ b/src/Module/Api/Mastodon/Statuses/RebloggedBy.php @@ -33,18 +33,17 @@ use Friendica\Protocol\Activity; class RebloggedBy extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $id = $parameters['id']; + $id = static::$parameters['id']; if (!Post::exists(['uri-id' => $id, 'uid' => [0, $uid]])) { DI::mstdnError()->RecordNotFound(); } diff --git a/src/Module/Api/Mastodon/Statuses/Unbookmark.php b/src/Module/Api/Mastodon/Statuses/Unbookmark.php index f65b07a34..0ddc5891d 100644 --- a/src/Module/Api/Mastodon/Statuses/Unbookmark.php +++ b/src/Module/Api/Mastodon/Statuses/Unbookmark.php @@ -33,16 +33,16 @@ use Friendica\Module\BaseApi; */ class Unbookmark extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -53,6 +53,6 @@ class Unbookmark extends BaseApi Item::update(['starred' => false], ['id' => $item['id']]); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unfavourite.php b/src/Module/Api/Mastodon/Statuses/Unfavourite.php index b3fee3682..4d6460d44 100644 --- a/src/Module/Api/Mastodon/Statuses/Unfavourite.php +++ b/src/Module/Api/Mastodon/Statuses/Unfavourite.php @@ -33,22 +33,22 @@ use Friendica\Module\BaseApi; */ class Unfavourite extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } Item::performActivity($item['id'], 'unlike', $uid); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unmute.php b/src/Module/Api/Mastodon/Statuses/Unmute.php index ee9b85cc4..715462880 100644 --- a/src/Module/Api/Mastodon/Statuses/Unmute.php +++ b/src/Module/Api/Mastodon/Statuses/Unmute.php @@ -32,16 +32,16 @@ use Friendica\Module\BaseApi; */ class Unmute extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -50,8 +50,8 @@ class Unmute extends BaseApi DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be unmuted')); } - Post\ThreadUser::setIgnored($parameters['id'], $uid, false); + Post\ThreadUser::setIgnored(static::$parameters['id'], $uid, false); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unpin.php b/src/Module/Api/Mastodon/Statuses/Unpin.php index 1f4195cca..80afaf701 100644 --- a/src/Module/Api/Mastodon/Statuses/Unpin.php +++ b/src/Module/Api/Mastodon/Statuses/Unpin.php @@ -32,16 +32,16 @@ use Friendica\Module\BaseApi; */ class Unpin extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id', 'gravity'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -50,8 +50,8 @@ class Unpin extends BaseApi DI::mstdnError()->UnprocessableEntity(DI::l10n()->t('Only starting posts can be pinned')); } - Post\ThreadUser::setPinned($parameters['id'], $uid, false); + Post\ThreadUser::setPinned(static::$parameters['id'], $uid, false); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Statuses/Unreblog.php b/src/Module/Api/Mastodon/Statuses/Unreblog.php index 9450e0f41..f00d76255 100644 --- a/src/Module/Api/Mastodon/Statuses/Unreblog.php +++ b/src/Module/Api/Mastodon/Statuses/Unreblog.php @@ -35,16 +35,16 @@ use Friendica\Module\BaseApi; */ class Unreblog extends BaseApi { - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } - $item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => $parameters['id'], 'uid' => [$uid, 0]]); + $item = Post::selectFirstForUser($uid, ['id', 'network'], ['uri-id' => static::$parameters['id'], 'uid' => [$uid, 0]]); if (!DBA::isResult($item)) { DI::mstdnError()->RecordNotFound(); } @@ -55,6 +55,6 @@ class Unreblog extends BaseApi Item::performActivity($item['id'], 'unannounce', $uid); - System::jsonExit(DI::mstdnStatus()->createFromUriId($parameters['id'], $uid)->toArray()); + System::jsonExit(DI::mstdnStatus()->createFromUriId(static::$parameters['id'], $uid)->toArray()); } } diff --git a/src/Module/Api/Mastodon/Suggestions.php b/src/Module/Api/Mastodon/Suggestions.php index e0bb75b2d..e7999040b 100644 --- a/src/Module/Api/Mastodon/Suggestions.php +++ b/src/Module/Api/Mastodon/Suggestions.php @@ -32,10 +32,9 @@ use Friendica\Module\BaseApi; class Suggestions extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Timelines/Direct.php b/src/Module/Api/Mastodon/Timelines/Direct.php index 3c3b9c052..5f8a2e0d7 100644 --- a/src/Module/Api/Mastodon/Timelines/Direct.php +++ b/src/Module/Api/Mastodon/Timelines/Direct.php @@ -33,10 +33,9 @@ use Friendica\Network\HTTPException; class Direct extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Timelines/Home.php b/src/Module/Api/Mastodon/Timelines/Home.php index 2b556d7ce..7b53171e1 100644 --- a/src/Module/Api/Mastodon/Timelines/Home.php +++ b/src/Module/Api/Mastodon/Timelines/Home.php @@ -34,10 +34,9 @@ use Friendica\Network\HTTPException; class Home extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Timelines/ListTimeline.php b/src/Module/Api/Mastodon/Timelines/ListTimeline.php index 8d4a432c5..9e3219038 100644 --- a/src/Module/Api/Mastodon/Timelines/ListTimeline.php +++ b/src/Module/Api/Mastodon/Timelines/ListTimeline.php @@ -34,15 +34,14 @@ use Friendica\Network\HTTPException; class ListTimeline extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { DI::mstdnError()->UnprocessableEntity(); } @@ -61,7 +60,7 @@ class ListTimeline extends BaseApi $params = ['order' => ['uri-id' => true], 'limit' => $request['limit']]; $condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `contact-id` IN (SELECT `contact-id` FROM `group_member` WHERE `gid` = ?)", - $uid, GRAVITY_PARENT, GRAVITY_COMMENT, $parameters['id']]; + $uid, GRAVITY_PARENT, GRAVITY_COMMENT, static::$parameters['id']]; if (!empty($request['max_id'])) { $condition = DBA::mergeConditions($condition, ["`uri-id` < ?", $request['max_id']]); diff --git a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php index ca0141691..aa55310a7 100644 --- a/src/Module/Api/Mastodon/Timelines/PublicTimeline.php +++ b/src/Module/Api/Mastodon/Timelines/PublicTimeline.php @@ -37,10 +37,9 @@ use Friendica\Network\HTTPException; class PublicTimeline extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $uid = self::getCurrentUserID(); diff --git a/src/Module/Api/Mastodon/Timelines/Tag.php b/src/Module/Api/Mastodon/Timelines/Tag.php index 0437be277..3d87e0094 100644 --- a/src/Module/Api/Mastodon/Timelines/Tag.php +++ b/src/Module/Api/Mastodon/Timelines/Tag.php @@ -35,15 +35,14 @@ use Friendica\Network\HTTPException; class Tag extends BaseApi { /** - * @param array $parameters * @throws HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); - if (empty($parameters['hashtag'])) { + if (empty(static::$parameters['hashtag'])) { DI::mstdnError()->UnprocessableEntity(); } @@ -70,7 +69,7 @@ class Tag extends BaseApi $condition = ["`name` = ? AND (`uid` = ? OR (`uid` = ? AND NOT `global`)) AND (`network` IN (?, ?, ?, ?) OR (`uid` = ? AND `uid` != ?))", - $parameters['hashtag'], 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0]; + static::$parameters['hashtag'], 0, $uid, Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, $uid, 0]; if ($request['local']) { $condition = DBA::mergeConditions($condition, ["`uri-id` IN (SELECT `uri-id` FROM `post-user` WHERE `origin`)"]); diff --git a/src/Module/Api/Mastodon/Trends.php b/src/Module/Api/Mastodon/Trends.php index 505cdbabd..c7bfa0289 100644 --- a/src/Module/Api/Mastodon/Trends.php +++ b/src/Module/Api/Mastodon/Trends.php @@ -32,10 +32,9 @@ use Friendica\Module\BaseApi; class Trends extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $request = self::getRequest([ 'limit' => 20, // Maximum number of results to return. Defaults to 10. diff --git a/src/Module/Api/Mastodon/Unimplemented.php b/src/Module/Api/Mastodon/Unimplemented.php index 6a0a100c3..d346dc757 100644 --- a/src/Module/Api/Mastodon/Unimplemented.php +++ b/src/Module/Api/Mastodon/Unimplemented.php @@ -31,46 +31,41 @@ use Friendica\Module\BaseApi; class Unimplemented extends BaseApi { /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function delete(array $parameters = []) + public static function delete() { DI::apiResponse()->unsupported(Router::DELETE); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function patch(array $parameters = []) + public static function patch() { DI::apiResponse()->unsupported(Router::PATCH); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function post(array $parameters = []) + public static function post() { DI::apiResponse()->unsupported(Router::POST); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function put(array $parameters = []) + public static function put() { DI::apiResponse()->unsupported(Router::PUT); } /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { DI::apiResponse()->unsupported(Router::GET); } diff --git a/src/Module/Api/Twitter/Account/RateLimitStatus.php b/src/Module/Api/Twitter/Account/RateLimitStatus.php index fe422c79f..8dca51c43 100644 --- a/src/Module/Api/Twitter/Account/RateLimitStatus.php +++ b/src/Module/Api/Twitter/Account/RateLimitStatus.php @@ -30,9 +30,9 @@ use Friendica\Util\DateTimeFormat; */ class RateLimitStatus extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { - if (!empty($parameters['extension']) && ($parameters['extension'] == 'xml')) { + if (!empty(static::$parameters['extension']) && (static::$parameters['extension'] == 'xml')) { $hash = [ 'remaining-hits' => '150', '@attributes' => ["type" => "integer"], @@ -52,6 +52,6 @@ class RateLimitStatus extends BaseApi ]; } - DI::apiResponse()->exit('hash', ['hash' => $hash], $parameters['extension'] ?? null); + DI::apiResponse()->exit('hash', ['hash' => $hash], static::$parameters['extension'] ?? null); } } diff --git a/src/Module/Api/Twitter/ContactEndpoint.php b/src/Module/Api/Twitter/ContactEndpoint.php index 7e5f11cc6..ddbbfc027 100644 --- a/src/Module/Api/Twitter/ContactEndpoint.php +++ b/src/Module/Api/Twitter/ContactEndpoint.php @@ -35,9 +35,9 @@ abstract class ContactEndpoint extends BaseApi const DEFAULT_COUNT = 20; const MAX_COUNT = 200; - public static function init(array $parameters = []) + public static function init() { - parent::init($parameters); + parent::init(); self::checkAllowedScope(self::SCOPE_READ); } diff --git a/src/Module/Api/Twitter/FollowersIds.php b/src/Module/Api/Twitter/FollowersIds.php index 01be503de..0318b5a68 100644 --- a/src/Module/Api/Twitter/FollowersIds.php +++ b/src/Module/Api/Twitter/FollowersIds.php @@ -29,7 +29,7 @@ use Friendica\Model\Contact; */ class FollowersIds extends ContactEndpoint { - public static function rawContent(array $parameters = []) + public static function rawContent() { // Expected value for user_id parameter: public/user contact id $contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT); diff --git a/src/Module/Api/Twitter/FollowersList.php b/src/Module/Api/Twitter/FollowersList.php index 8e39f2201..53e56e88e 100644 --- a/src/Module/Api/Twitter/FollowersList.php +++ b/src/Module/Api/Twitter/FollowersList.php @@ -29,7 +29,7 @@ use Friendica\Model\Contact; */ class FollowersList extends ContactEndpoint { - public static function rawContent(array $parameters = []) + public static function rawContent() { // Expected value for user_id parameter: public/user contact id $contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT); diff --git a/src/Module/Api/Twitter/FriendsIds.php b/src/Module/Api/Twitter/FriendsIds.php index 3500a4043..4df2f7068 100644 --- a/src/Module/Api/Twitter/FriendsIds.php +++ b/src/Module/Api/Twitter/FriendsIds.php @@ -29,7 +29,7 @@ use Friendica\Model\Contact; */ class FriendsIds extends ContactEndpoint { - public static function rawContent(array $parameters = []) + public static function rawContent() { // Expected value for user_id parameter: public/user contact id $contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT); diff --git a/src/Module/Api/Twitter/FriendsList.php b/src/Module/Api/Twitter/FriendsList.php index 114e391cc..59ae03601 100644 --- a/src/Module/Api/Twitter/FriendsList.php +++ b/src/Module/Api/Twitter/FriendsList.php @@ -29,7 +29,7 @@ use Friendica\Model\Contact; */ class FriendsList extends ContactEndpoint { - public static function rawContent(array $parameters = []) + public static function rawContent() { // Expected value for user_id parameter: public/user contact id $contact_id = filter_input(INPUT_GET, 'user_id' , FILTER_VALIDATE_INT); diff --git a/src/Module/Api/Twitter/SavedSearches.php b/src/Module/Api/Twitter/SavedSearches.php index b2e2c5f0d..d978af807 100644 --- a/src/Module/Api/Twitter/SavedSearches.php +++ b/src/Module/Api/Twitter/SavedSearches.php @@ -31,7 +31,7 @@ use Friendica\Module\BaseApi; */ class SavedSearches extends BaseApi { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::checkAllowedScope(self::SCOPE_READ); $uid = self::getCurrentUserID(); @@ -45,6 +45,6 @@ class SavedSearches extends BaseApi DBA::close($terms); - DI::apiResponse()->exit('terms', ['terms' => $result], $parameters['extension'] ?? null); + DI::apiResponse()->exit('terms', ['terms' => $result], static::$parameters['extension'] ?? null); } } diff --git a/src/Module/Apps.php b/src/Module/Apps.php index 46dfe41c9..dc3d1d10d 100644 --- a/src/Module/Apps.php +++ b/src/Module/Apps.php @@ -31,7 +31,7 @@ use Friendica\DI; */ class Apps extends BaseModule { - public static function init(array $parameters = []) + public static function init() { $privateaddons = DI::config()->get('config', 'private_addons'); if ($privateaddons === "1" && !local_user()) { @@ -39,7 +39,7 @@ class Apps extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { $apps = Nav::getAppMenu(); diff --git a/src/Module/Attach.php b/src/Module/Attach.php index a4bb9b422..4f9da85c9 100644 --- a/src/Module/Attach.php +++ b/src/Module/Attach.php @@ -34,14 +34,14 @@ class Attach extends BaseModule /** * Return to user an attached file given the id */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $a = DI::app(); - if (empty($parameters['item'])) { + if (empty(static::$parameters['item'])) { throw new \Friendica\Network\HTTPException\BadRequestException(); } - $item_id = intval($parameters['item']); + $item_id = intval(static::$parameters['item']); // Check for existence $item = MAttach::exists(['id' => $item_id]); diff --git a/src/Module/BaseAdmin.php b/src/Module/BaseAdmin.php index 69c2879de..822b6bdf5 100644 --- a/src/Module/BaseAdmin.php +++ b/src/Module/BaseAdmin.php @@ -68,7 +68,7 @@ abstract class BaseAdmin extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { self::checkAdminAccess(true); diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php index a0a94c336..b42e9462d 100644 --- a/src/Module/BaseApi.php +++ b/src/Module/BaseApi.php @@ -53,7 +53,7 @@ class BaseApi extends BaseModule */ protected static $request = []; - public static function delete(array $parameters = []) + public static function delete() { self::checkAllowedScope(self::SCOPE_WRITE); @@ -62,7 +62,7 @@ class BaseApi extends BaseModule } } - public static function patch(array $parameters = []) + public static function patch() { self::checkAllowedScope(self::SCOPE_WRITE); @@ -71,7 +71,7 @@ class BaseApi extends BaseModule } } - public static function post(array $parameters = []) + public static function post() { self::checkAllowedScope(self::SCOPE_WRITE); @@ -80,7 +80,7 @@ class BaseApi extends BaseModule } } - public static function put(array $parameters = []) + public static function put() { self::checkAllowedScope(self::SCOPE_WRITE); @@ -139,7 +139,6 @@ class BaseApi extends BaseModule * Set boundaries for the "link" header * @param array $boundaries * @param int $id - * @return array */ protected static function setBoundaries(int $id) { diff --git a/src/Module/BaseNotifications.php b/src/Module/BaseNotifications.php index e7f9bdabe..3987c9056 100644 --- a/src/Module/BaseNotifications.php +++ b/src/Module/BaseNotifications.php @@ -82,7 +82,7 @@ abstract class BaseNotifications extends BaseModule */ abstract public static function getNotifications(); - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { throw new ForbiddenException(DI::l10n()->t('Permission denied.')); @@ -94,7 +94,7 @@ abstract class BaseNotifications extends BaseModule self::$showAll = ($_REQUEST['show'] ?? '') === 'all'; } - public static function rawContent(array $parameters = []) + public static function rawContent() { // If the last argument of the query is NOT json, return if (DI::args()->get(DI::args()->getArgc() - 1) !== 'json') { diff --git a/src/Module/BaseSettings.php b/src/Module/BaseSettings.php index c2516e134..1a20fc3dc 100644 --- a/src/Module/BaseSettings.php +++ b/src/Module/BaseSettings.php @@ -28,7 +28,7 @@ use Friendica\DI; class BaseSettings extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $a = DI::app(); diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php index 3551cfd17..408fb50b2 100644 --- a/src/Module/Bookmarklet.php +++ b/src/Module/Bookmarklet.php @@ -34,7 +34,7 @@ use Friendica\Util\Strings; */ class Bookmarklet extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $_GET['mode'] = 'minimal'; diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 4f13b2843..d80abe470 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -96,7 +96,7 @@ class Contact extends BaseModule DI::baseUrl()->redirect($redirectUrl); } - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -226,7 +226,7 @@ class Contact extends BaseModule Model\Contact\User::setIgnored($contact_id, local_user(), $ignored); } - public static function content(array $parameters = [], $update = 0) + public static function content($update = 0) { if (!local_user()) { return Login::form($_SERVER['REQUEST_URI']); diff --git a/src/Module/Contact/Advanced.php b/src/Module/Contact/Advanced.php index 29de7bd6f..521e4f469 100644 --- a/src/Module/Contact/Advanced.php +++ b/src/Module/Contact/Advanced.php @@ -38,16 +38,16 @@ use Friendica\Util\Strings; */ class Advanced extends BaseModule { - public static function init(array $parameters = []) + public static function init() { if (!Session::isAuthenticated()) { throw new ForbiddenException(DI::l10n()->t('Permission denied.')); } } - public static function post(array $parameters = []) + public static function post() { - $cid = $parameters['id']; + $cid = static::$parameters['id']; $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]); if (empty($contact)) { @@ -96,9 +96,9 @@ class Advanced extends BaseModule return; } - public static function content(array $parameters = []) + public static function content() { - $cid = $parameters['id']; + $cid = static::$parameters['id']; $contact = Model\Contact::selectFirst([], ['id' => $cid, 'uid' => local_user()]); if (empty($contact)) { diff --git a/src/Module/Contact/Contacts.php b/src/Module/Contact/Contacts.php index b75dea43d..1e3e582c0 100644 --- a/src/Module/Contact/Contacts.php +++ b/src/Module/Contact/Contacts.php @@ -14,7 +14,7 @@ use Friendica\Network\HTTPException; class Contacts extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $app = DI::app(); @@ -22,8 +22,8 @@ class Contacts extends BaseModule throw new HTTPException\ForbiddenException(); } - $cid = $parameters['id']; - $type = $parameters['type'] ?? 'all'; + $cid = static::$parameters['id']; + $type = static::$parameters['type'] ?? 'all'; $accounttype = $_GET['accounttype'] ?? ''; $accounttypeid = User::getAccountTypeByString($accounttype); diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php index 57d4ac6ab..2de1a0f8a 100644 --- a/src/Module/Contact/Hovercard.php +++ b/src/Module/Contact/Hovercard.php @@ -35,7 +35,7 @@ use Friendica\Util\Strings; */ class Hovercard extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $contact_url = $_REQUEST['url'] ?? ''; diff --git a/src/Module/Contact/Media.php b/src/Module/Contact/Media.php index 956c33ac8..d854aa9d6 100644 --- a/src/Module/Contact/Media.php +++ b/src/Module/Contact/Media.php @@ -34,9 +34,9 @@ use Friendica\Network\HTTPException\BadRequestException; */ class Media extends BaseModule { - public static function content(array $parameters = []) + public static function content() { - $cid = $parameters['id']; + $cid = static::$parameters['id']; $contact = Model\Contact::selectFirst([], ['id' => $cid]); if (empty($contact)) { diff --git a/src/Module/Contact/Poke.php b/src/Module/Contact/Poke.php index d9dd7e27a..7f3e596db 100644 --- a/src/Module/Contact/Poke.php +++ b/src/Module/Contact/Poke.php @@ -18,9 +18,9 @@ use Friendica\Util\XML; class Poke extends BaseModule { - public static function post(array $parameters = []) + public static function post() { - if (!local_user() || empty($parameters['id'])) { + if (!local_user() || empty(static::$parameters['id'])) { return self::postReturn(false); } @@ -39,14 +39,14 @@ class Poke extends BaseModule $activity = Activity::POKE . '#' . urlencode($verbs[$verb][0]); - $contact_id = intval($parameters['id']); + $contact_id = intval(static::$parameters['id']); if (!$contact_id) { return self::postReturn(false); } Logger::info('verb ' . $verb . ' contact ' . $contact_id); - $contact = DBA::selectFirst('contact', ['id', 'name', 'url', 'photo'], ['id' => $parameters['id'], 'uid' => local_user()]); + $contact = DBA::selectFirst('contact', ['id', 'name', 'url', 'photo'], ['id' => static::$parameters['id'], 'uid' => local_user()]); if (!DBA::isResult($contact)) { return self::postReturn(false); } @@ -123,17 +123,17 @@ class Poke extends BaseModule return $success; } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.')); } - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { throw new HTTPException\BadRequestException(); } - $contact = DBA::selectFirst('contact', ['id', 'url', 'name'], ['id' => $parameters['id'], 'uid' => local_user()]); + $contact = DBA::selectFirst('contact', ['id', 'url', 'name'], ['id' => static::$parameters['id'], 'uid' => local_user()]); if (!DBA::isResult($contact)) { throw new HTTPException\NotFoundException(); } diff --git a/src/Module/Contact/Revoke.php b/src/Module/Contact/Revoke.php index e9b5a4424..5730d569a 100644 --- a/src/Module/Contact/Revoke.php +++ b/src/Module/Contact/Revoke.php @@ -37,13 +37,13 @@ class Revoke extends BaseModule /** @var array */ private static $contact; - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { return; } - $data = Model\Contact::getPublicAndUserContactID($parameters['id'], local_user()); + $data = Model\Contact::getPublicAndUserContactID(static::$parameters['id'], local_user()); if (!DBA::isResult($data)) { throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown contact.')); } @@ -63,13 +63,13 @@ class Revoke extends BaseModule } } - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { throw new HTTPException\UnauthorizedException(); } - self::checkFormSecurityTokenRedirectOnError('contact/' . $parameters['id'], 'contact_revoke'); + self::checkFormSecurityTokenRedirectOnError('contact/' . static::$parameters['id'], 'contact_revoke'); $result = Model\Contact::revokeFollow(self::$contact); if ($result === true) { @@ -80,10 +80,10 @@ class Revoke extends BaseModule notice(DI::l10n()->t('Unable to revoke follow, please try again later or contact the administrator.')); } - DI::baseUrl()->redirect('contact/' . $parameters['id']); + DI::baseUrl()->redirect('contact/' . static::$parameters['id']); } - public static function content(array $parameters = []): string + public static function content(): string { if (!local_user()) { return Login::form($_SERVER['REQUEST_URI']); diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php index 3a30f3799..9a6e0709f 100644 --- a/src/Module/Conversation/Community.php +++ b/src/Module/Conversation/Community.php @@ -49,9 +49,9 @@ class Community extends BaseModule protected static $max_id; protected static $item_id; - public static function content(array $parameters = []) + public static function content() { - self::parseRequest($parameters); + self::parseRequest(); if (DI::pConfig()->get(local_user(), 'system', 'infinite_scroll')) { $tpl = Renderer::getMarkupTemplate('infinite_scroll_head.tpl'); @@ -94,8 +94,8 @@ class Community extends BaseModule if (local_user() && DI::config()->get('system', 'community_no_sharer')) { $path = self::$content; - if (!empty($parameters['accounttype'])) { - $path .= '/' . $parameters['accounttype']; + if (!empty(static::$parameters['accounttype'])) { + $path .= '/' . static::$parameters['accounttype']; } $query_parameters = []; @@ -166,11 +166,10 @@ class Community extends BaseModule /** * Computes module parameters from the request and local configuration * - * @param array $parameters * @throws HTTPException\BadRequestException * @throws HTTPException\ForbiddenException */ - protected static function parseRequest(array $parameters) + protected static function parseRequest() { if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.')); @@ -182,10 +181,10 @@ class Community extends BaseModule throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); } - self::$accountTypeString = $_GET['accounttype'] ?? $parameters['accounttype'] ?? ''; + self::$accountTypeString = $_GET['accounttype'] ?? static::$parameters['accounttype'] ?? ''; self::$accountType = User::getAccountTypeByString(self::$accountTypeString); - self::$content = $parameters['content'] ?? ''; + self::$content = static::$parameters['content'] ?? ''; if (!self::$content) { if (!empty(DI::config()->get('system', 'singleuser'))) { // On single user systems only the global page does make sense diff --git a/src/Module/Conversation/Network.php b/src/Module/Conversation/Network.php index f2dc1fae1..87bce1030 100644 --- a/src/Module/Conversation/Network.php +++ b/src/Module/Conversation/Network.php @@ -57,13 +57,13 @@ class Network extends BaseModule /** @var string */ protected static $order; - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { return Login::form(); } - self::parseRequest($parameters, $_GET); + self::parseRequest($_GET); $module = 'network'; @@ -272,11 +272,11 @@ class Network extends BaseModule return Renderer::replaceMacros($tpl, ['$tabs' => $arr['tabs']]); } - protected static function parseRequest(array $parameters, array $get) + protected static function parseRequest(array $get) { - self::$groupId = $parameters['group_id'] ?? 0; + self::$groupId = static::$parameters['group_id'] ?? 0; - self::$forumContactId = $parameters['contact_id'] ?? 0; + self::$forumContactId = static::$parameters['contact_id'] ?? 0; self::$selectedTab = Session::get('network-tab', DI::pConfig()->get(local_user(), 'network.view', 'selected_tab', '')); @@ -317,13 +317,13 @@ class Network extends BaseModule Session::set('network-tab', self::$selectedTab); DI::pConfig()->set(local_user(), 'network.view', 'selected_tab', self::$selectedTab); - self::$accountTypeString = $get['accounttype'] ?? $parameters['accounttype'] ?? ''; + self::$accountTypeString = $get['accounttype'] ?? static::$parameters['accounttype'] ?? ''; self::$accountType = User::getAccountTypeByString(self::$accountTypeString); self::$network = $get['nets'] ?? ''; - self::$dateFrom = $parameters['from'] ?? ''; - self::$dateTo = $parameters['to'] ?? ''; + self::$dateFrom = static::$parameters['from'] ?? ''; + self::$dateTo = static::$parameters['to'] ?? ''; if (DI::mode()->isMobile()) { self::$itemsPerPage = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', diff --git a/src/Module/Credits.php b/src/Module/Credits.php index 1a586a808..cf3a4ca34 100644 --- a/src/Module/Credits.php +++ b/src/Module/Credits.php @@ -32,7 +32,7 @@ use Friendica\DI; */ class Credits extends BaseModule { - public static function content(array $parameters = []) + public static function content() { /* fill the page with credits */ $credits_string = file_get_contents('CREDITS.txt'); diff --git a/src/Module/DFRN/Notify.php b/src/Module/DFRN/Notify.php index 6aeb23417..a02913ada 100644 --- a/src/Module/DFRN/Notify.php +++ b/src/Module/DFRN/Notify.php @@ -38,7 +38,7 @@ use Friendica\Network\HTTPException; */ class Notify extends BaseModule { - public static function post(array $parameters = []) + public static function post() { $postdata = Network::postdata(); @@ -47,8 +47,8 @@ class Notify extends BaseModule } $data = json_decode($postdata); - if (is_object($data) && !empty($parameters['nickname'])) { - $user = User::getByNickname($parameters['nickname']); + if (is_object($data) && !empty(static::$parameters['nickname'])) { + $user = User::getByNickname(static::$parameters['nickname']); if (empty($user)) { throw new \Friendica\Network\HTTPException\InternalServerErrorException(); } diff --git a/src/Module/DFRN/Poll.php b/src/Module/DFRN/Poll.php index d9c7884ec..9a2ab4b69 100644 --- a/src/Module/DFRN/Poll.php +++ b/src/Module/DFRN/Poll.php @@ -29,11 +29,11 @@ use Friendica\Protocol\OStatus; */ class Poll extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { header("Content-type: application/atom+xml"); $last_update = $_GET['last_update'] ?? ''; - echo OStatus::feed($parameters['nickname'], $last_update, 10); + echo OStatus::feed(static::$parameters['nickname'], $last_update, 10); exit(); } } diff --git a/src/Module/Debug/ActivityPubConversion.php b/src/Module/Debug/ActivityPubConversion.php index 854f557d0..2a06a672c 100644 --- a/src/Module/Debug/ActivityPubConversion.php +++ b/src/Module/Debug/ActivityPubConversion.php @@ -34,7 +34,7 @@ use Friendica\Util\XML; class ActivityPubConversion extends BaseModule { - public static function content(array $parameters = []) + public static function content() { function visible_whitespace($s) { diff --git a/src/Module/Debug/Babel.php b/src/Module/Debug/Babel.php index ff8bc8741..4901684b6 100644 --- a/src/Module/Debug/Babel.php +++ b/src/Module/Debug/Babel.php @@ -35,7 +35,7 @@ use Friendica\Util\XML; */ class Babel extends BaseModule { - public static function content(array $parameters = []) + public static function content() { function visible_whitespace($s) { diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php index 5ef681668..0c0c0ded4 100644 --- a/src/Module/Debug/Feed.php +++ b/src/Module/Debug/Feed.php @@ -32,7 +32,7 @@ use Friendica\Protocol; */ class Feed extends BaseModule { - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { notice(DI::l10n()->t('You must be logged in to use this module')); @@ -40,7 +40,7 @@ class Feed extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { $result = []; if (!empty($_REQUEST['url'])) { diff --git a/src/Module/Debug/ItemBody.php b/src/Module/Debug/ItemBody.php index 2299b3cb2..703089646 100644 --- a/src/Module/Debug/ItemBody.php +++ b/src/Module/Debug/ItemBody.php @@ -31,17 +31,17 @@ use Friendica\Network\HTTPException; */ class ItemBody extends BaseModule { - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new HTTPException\UnauthorizedException(DI::l10n()->t('Access denied.')); } - if (empty($parameters['item'])) { + if (empty(static::$parameters['item'])) { throw new HTTPException\NotFoundException(DI::l10n()->t('Item not found.')); } - $itemId = intval($parameters['item']); + $itemId = intval(static::$parameters['item']); $item = Post::selectFirst(['body'], ['uid' => [0, local_user()], 'uri-id' => $itemId]); diff --git a/src/Module/Debug/Localtime.php b/src/Module/Debug/Localtime.php index ff1466408..2d784765d 100644 --- a/src/Module/Debug/Localtime.php +++ b/src/Module/Debug/Localtime.php @@ -31,7 +31,7 @@ class Localtime extends BaseModule { static $mod_localtime = ''; - public static function post(array $parameters = []) + public static function post() { $time = ($_REQUEST['time'] ?? '') ?: 'now'; @@ -42,7 +42,7 @@ class Localtime extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { $time = ($_REQUEST['time'] ?? '') ?: 'now'; diff --git a/src/Module/Debug/Probe.php b/src/Module/Debug/Probe.php index 304096b2e..24c8d745c 100644 --- a/src/Module/Debug/Probe.php +++ b/src/Module/Debug/Probe.php @@ -32,7 +32,7 @@ use Friendica\Network\Probe as NetworkProbe; */ class Probe extends BaseModule { - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new HTTPException\ForbiddenException(DI::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 e8a619f0b..f95d7a2b9 100644 --- a/src/Module/Debug/WebFinger.php +++ b/src/Module/Debug/WebFinger.php @@ -31,7 +31,7 @@ use Friendica\Network\Probe; */ class WebFinger extends BaseModule { - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new \Friendica\Network\HTTPException\ForbiddenException(DI::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 12f8c5074..b4845764c 100644 --- a/src/Module/Delegation.php +++ b/src/Module/Delegation.php @@ -37,7 +37,7 @@ use Friendica\Util\Proxy; */ class Delegation extends BaseModule { - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -112,7 +112,7 @@ class Delegation extends BaseModule // NOTREACHED } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new ForbiddenException(DI::l10n()->t('Permission denied.')); diff --git a/src/Module/Diaspora/Fetch.php b/src/Module/Diaspora/Fetch.php index 55eeea9b5..dc3e76b01 100644 --- a/src/Module/Diaspora/Fetch.php +++ b/src/Module/Diaspora/Fetch.php @@ -38,13 +38,13 @@ use Friendica\Util\Strings; */ class Fetch extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - if (empty($parameters['guid'])) { + if (empty(static::$parameters['guid'])) { throw new HTTPException\NotFoundException(); } - $guid = $parameters['guid']; + $guid = static::$parameters['guid']; // Fetch the item $condition = ['origin' => true, 'private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $guid, diff --git a/src/Module/Diaspora/Receive.php b/src/Module/Diaspora/Receive.php index dc6fb716b..2fde1fe3f 100644 --- a/src/Module/Diaspora/Receive.php +++ b/src/Module/Diaspora/Receive.php @@ -38,12 +38,12 @@ class Receive extends BaseModule /** @var LoggerInterface */ private static $logger; - public static function init(array $parameters = []) + public static function init() { self::$logger = DI::logger(); } - public static function post(array $parameters = []) + public static function post() { $enabled = DI::config()->get('system', 'diaspora_enabled', false); if (!$enabled) { @@ -51,10 +51,10 @@ class Receive extends BaseModule throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); } - if ($parameters['type'] === 'public') { + if (static::$parameters['type'] === 'public') { self::receivePublic(); - } else if ($parameters['type'] === 'users') { - self::receiveUser($parameters['guid']); + } else if (static::$parameters['type'] === 'users') { + self::receiveUser(static::$parameters['guid']); } } diff --git a/src/Module/Directory.php b/src/Module/Directory.php index 0172612d5..799b18ea1 100644 --- a/src/Module/Directory.php +++ b/src/Module/Directory.php @@ -38,7 +38,7 @@ use Friendica\Network\HTTPException; */ class Directory extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $app = DI::app(); $config = DI::config(); diff --git a/src/Module/Events/Json.php b/src/Module/Events/Json.php index 50e468a9c..befd8d7aa 100644 --- a/src/Module/Events/Json.php +++ b/src/Module/Events/Json.php @@ -13,7 +13,7 @@ use Friendica\Util\Temporal; class Json extends \Friendica\BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!local_user()) { throw new HTTPException\UnauthorizedException(); diff --git a/src/Module/Feed.php b/src/Module/Feed.php index 788f9da7c..0eca46b1a 100644 --- a/src/Module/Feed.php +++ b/src/Module/Feed.php @@ -41,7 +41,7 @@ use Friendica\Protocol\Feed as ProtocolFeed; */ class Feed extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $a = DI::app(); @@ -68,7 +68,7 @@ class Feed extends BaseModule } header("Content-type: application/atom+xml; charset=utf-8"); - echo ProtocolFeed::atom($parameters['nickname'], $last_update, 10, $type, $nocache, true); + echo ProtocolFeed::atom(static::$parameters['nickname'], $last_update, 10, $type, $nocache, true); exit(); } } diff --git a/src/Module/Filer/RemoveTag.php b/src/Module/Filer/RemoveTag.php index 8c65f4381..e52db81c1 100644 --- a/src/Module/Filer/RemoveTag.php +++ b/src/Module/Filer/RemoveTag.php @@ -33,7 +33,7 @@ use Friendica\Util\XML; */ class RemoveTag extends BaseModule { - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new HTTPException\ForbiddenException(); @@ -41,7 +41,7 @@ class RemoveTag extends BaseModule $logger = DI::logger(); - $item_id = $parameters['id'] ?? 0; + $item_id = static::$parameters['id'] ?? 0; $term = XML::unescape(trim($_GET['term'] ?? '')); $cat = XML::unescape(trim($_GET['cat'] ?? '')); diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php index 50f6c2e9b..363e51c21 100644 --- a/src/Module/Filer/SaveTag.php +++ b/src/Module/Filer/SaveTag.php @@ -34,7 +34,7 @@ use Friendica\Util\XML; */ class SaveTag extends BaseModule { - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { notice(DI::l10n()->t('You must be logged in to use this module')); @@ -42,13 +42,13 @@ class SaveTag extends BaseModule } } - public static function rawContent(array $parameters = []) + public static function rawContent() { $logger = DI::logger(); $term = XML::unescape(trim($_GET['term'] ?? '')); - $item_id = $parameters['id'] ?? 0; + $item_id = static::$parameters['id'] ?? 0; $logger->info('filer', ['tag' => $term, 'item' => $item_id]); diff --git a/src/Module/FollowConfirm.php b/src/Module/FollowConfirm.php index 75153512b..6e6b4da1d 100644 --- a/src/Module/FollowConfirm.php +++ b/src/Module/FollowConfirm.php @@ -10,7 +10,7 @@ use Friendica\Model\Contact; */ class FollowConfirm extends BaseModule { - public static function post(array $parameters = []) + public static function post() { $uid = local_user(); if (!$uid) { diff --git a/src/Module/FriendSuggest.php b/src/Module/FriendSuggest.php index 78e75bc31..3256a04c2 100644 --- a/src/Module/FriendSuggest.php +++ b/src/Module/FriendSuggest.php @@ -38,16 +38,16 @@ use Friendica\Worker\Delivery; */ class FriendSuggest extends BaseModule { - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { throw new ForbiddenException(DI::l10n()->t('Permission denied.')); } } - public static function post(array $parameters = []) + public static function post() { - $cid = intval($parameters['contact']); + $cid = intval(static::$parameters['contact']); // We do query the "uid" as well to ensure that it is our contact if (!DI::dba()->exists('contact', ['id' => $cid, 'uid' => local_user()])) { @@ -83,9 +83,9 @@ class FriendSuggest extends BaseModule info(DI::l10n()->t('Friend suggestion sent.')); } - public static function content(array $parameters = []) + public static function content() { - $cid = intval($parameters['contact']); + $cid = intval(static::$parameters['contact']); $contact = DI::dba()->selectFirst('contact', [], ['id' => $cid, 'uid' => local_user()]); if (empty($contact)) { diff --git a/src/Module/Friendica.php b/src/Module/Friendica.php index 95a319a41..082c5c081 100644 --- a/src/Module/Friendica.php +++ b/src/Module/Friendica.php @@ -38,7 +38,7 @@ use Friendica\Protocol\ActivityPub; */ class Friendica extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $config = DI::config(); @@ -110,7 +110,7 @@ class Friendica extends BaseModule ]); } - public static function rawContent(array $parameters = []) + public static function rawContent() { if (ActivityPub::isRequest()) { try { diff --git a/src/Module/Group.php b/src/Module/Group.php index ee6c7b8c2..69baef9f4 100644 --- a/src/Module/Group.php +++ b/src/Module/Group.php @@ -32,7 +32,7 @@ require_once 'boot.php'; class Group extends BaseModule { - public static function post(array $parameters = []) + public static function post() { $a = DI::app(); @@ -138,7 +138,7 @@ class Group extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { $change = false; diff --git a/src/Module/HCard.php b/src/Module/HCard.php index 079f240ae..269deff06 100644 --- a/src/Module/HCard.php +++ b/src/Module/HCard.php @@ -34,14 +34,14 @@ use Friendica\Network\HTTPException; */ class HCard extends BaseModule { - public static function content(array $parameters = []) + public static function content() { - if ((local_user()) && ($parameters['action'] ?? '') === 'view') { + if ((local_user()) && (static::$parameters['action'] ?? '') === 'view') { // A logged in user views a profile of a user $nickname = DI::app()->getLoggedInUserNickname(); - } elseif (empty($parameters['action'])) { + } elseif (empty(static::$parameters['action'])) { // Show the profile hCard - $nickname = $parameters['profile']; + $nickname = static::$parameters['profile']; } else { throw new HTTPException\NotFoundException(DI::l10n()->t('No profile')); } diff --git a/src/Module/HTTPException/MethodNotAllowed.php b/src/Module/HTTPException/MethodNotAllowed.php index f100bba49..874583246 100644 --- a/src/Module/HTTPException/MethodNotAllowed.php +++ b/src/Module/HTTPException/MethodNotAllowed.php @@ -27,7 +27,7 @@ use Friendica\Network\HTTPException; class MethodNotAllowed extends BaseModule { - public static function content(array $parameters = []) + public static function content() { throw new HTTPException\MethodNotAllowedException(DI::l10n()->t('Method Not Allowed.')); } diff --git a/src/Module/HTTPException/PageNotFound.php b/src/Module/HTTPException/PageNotFound.php index 746773ef1..5ba546624 100644 --- a/src/Module/HTTPException/PageNotFound.php +++ b/src/Module/HTTPException/PageNotFound.php @@ -27,7 +27,7 @@ use Friendica\Network\HTTPException; class PageNotFound extends BaseModule { - public static function content(array $parameters = []) + public static function content() { throw new HTTPException\NotFoundException(DI::l10n()->t('Page not found.')); } diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php index cdf0de6c1..aebe15dd0 100644 --- a/src/Module/Hashtag.php +++ b/src/Module/Hashtag.php @@ -31,7 +31,7 @@ use Friendica\Util\Strings; */ class Hashtag extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $result = []; diff --git a/src/Module/Help.php b/src/Module/Help.php index 219adc797..5440fd97d 100644 --- a/src/Module/Help.php +++ b/src/Module/Help.php @@ -32,7 +32,7 @@ use Friendica\Network\HTTPException; */ class Help extends BaseModule { - public static function content(array $parameters = []) + public static function content() { Nav::setSelected('help'); diff --git a/src/Module/Home.php b/src/Module/Home.php index 9d16e11aa..719d87452 100644 --- a/src/Module/Home.php +++ b/src/Module/Home.php @@ -32,7 +32,7 @@ use Friendica\Module\Security\Login; */ class Home extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $app = DI::app(); $config = DI::config(); diff --git a/src/Module/Install.php b/src/Module/Install.php index 8b6f97f98..72b83ebff 100644 --- a/src/Module/Install.php +++ b/src/Module/Install.php @@ -65,7 +65,7 @@ class Install extends BaseModule */ private static $installer; - public static function init(array $parameters = []) + public static function init() { $a = DI::app(); @@ -94,7 +94,7 @@ class Install extends BaseModule self::$currentWizardStep = ($_POST['pass'] ?? '') ?: self::SYSTEM_CHECK; } - public static function post(array $parameters = []) + public static function post() { $a = DI::app(); $configCache = $a->getConfigCache(); @@ -177,7 +177,7 @@ class Install extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { $a = DI::app(); $configCache = $a->getConfigCache(); diff --git a/src/Module/Invite.php b/src/Module/Invite.php index 65438c151..3c82a26c1 100644 --- a/src/Module/Invite.php +++ b/src/Module/Invite.php @@ -35,7 +35,7 @@ use Friendica\Util\Strings; */ class Invite extends BaseModule { - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); @@ -124,7 +124,7 @@ class Invite extends BaseModule info(DI::l10n()->tt('%d message sent.', '%d messages sent.', $total)); } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); diff --git a/src/Module/Item/Activity.php b/src/Module/Item/Activity.php index 1d44bf995..6006be9c7 100644 --- a/src/Module/Item/Activity.php +++ b/src/Module/Item/Activity.php @@ -38,18 +38,18 @@ use Friendica\Network\HTTPException; */ class Activity extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!Session::isAuthenticated()) { throw new HTTPException\ForbiddenException(); } - if (empty($parameters['id']) || empty($parameters['verb'])) { + if (empty(static::$parameters['id']) || empty(static::$parameters['verb'])) { throw new HTTPException\BadRequestException(); } - $verb = $parameters['verb']; - $itemId = $parameters['id']; + $verb = static::$parameters['verb']; + $itemId = static::$parameters['id']; if (in_array($verb, ['announce', 'unannounce'])) { $item = Post::selectFirst(['network'], ['id' => $itemId]); diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php index f81b0c896..c229fb15a 100644 --- a/src/Module/Item/Compose.php +++ b/src/Module/Item/Compose.php @@ -40,7 +40,7 @@ use Friendica\Util\Temporal; class Compose extends BaseModule { - public static function post(array $parameters = []) + public static function post() { if (!empty($_REQUEST['body'])) { $_REQUEST['return'] = 'network'; @@ -51,7 +51,7 @@ class Compose extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { return Login::form('compose', false); @@ -64,7 +64,7 @@ class Compose extends BaseModule } /// @TODO Retrieve parameter from router - $posttype = $parameters['type'] ?? Item::PT_ARTICLE; + $posttype = static::$parameters['type'] ?? Item::PT_ARTICLE; if (!in_array($posttype, [Item::PT_ARTICLE, Item::PT_PERSONAL_NOTE])) { switch ($posttype) { case 'note': diff --git a/src/Module/Item/Follow.php b/src/Module/Item/Follow.php index d67af70e4..923048447 100644 --- a/src/Module/Item/Follow.php +++ b/src/Module/Item/Follow.php @@ -34,7 +34,7 @@ use Friendica\Network\HTTPException; */ class Follow extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $l10n = DI::l10n(); @@ -42,11 +42,11 @@ class Follow extends BaseModule throw new HttpException\ForbiddenException($l10n->t('Access denied.')); } - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { throw new HTTPException\BadRequestException(); } - $itemId = intval($parameters['id']); + $itemId = intval(static::$parameters['id']); if (!Item::performActivity($itemId, 'follow', local_user())) { throw new HTTPException\BadRequestException($l10n->t('Unable to follow this item.')); diff --git a/src/Module/Item/Ignore.php b/src/Module/Item/Ignore.php index d38c19bb9..19ac90e47 100644 --- a/src/Module/Item/Ignore.php +++ b/src/Module/Item/Ignore.php @@ -33,7 +33,7 @@ use Friendica\Network\HTTPException; */ class Ignore extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $l10n = DI::l10n(); @@ -41,11 +41,11 @@ class Ignore extends BaseModule throw new HttpException\ForbiddenException($l10n->t('Access denied.')); } - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { throw new HTTPException\BadRequestException(); } - $itemId = intval($parameters['id']); + $itemId = intval(static::$parameters['id']); $dba = DI::dba(); diff --git a/src/Module/Item/Pin.php b/src/Module/Item/Pin.php index b8022cf57..c451bae48 100644 --- a/src/Module/Item/Pin.php +++ b/src/Module/Item/Pin.php @@ -34,7 +34,7 @@ use Friendica\Network\HTTPException; */ class Pin extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $l10n = DI::l10n(); @@ -42,11 +42,11 @@ class Pin extends BaseModule throw new HttpException\ForbiddenException($l10n->t('Access denied.')); } - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { throw new HTTPException\BadRequestException(); } - $itemId = intval($parameters['id']); + $itemId = intval(static::$parameters['id']); $item = Post::selectFirst(['uri-id', 'uid'], ['id' => $itemId]); if (!DBA::isResult($item)) { diff --git a/src/Module/Item/Star.php b/src/Module/Item/Star.php index c39b6a11a..d24fb54ac 100644 --- a/src/Module/Item/Star.php +++ b/src/Module/Item/Star.php @@ -35,7 +35,7 @@ use Friendica\Network\HTTPException; */ class Star extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $l10n = DI::l10n(); @@ -43,11 +43,11 @@ class Star extends BaseModule throw new HttpException\ForbiddenException($l10n->t('Access denied.')); } - if (empty($parameters['id'])) { + if (empty(static::$parameters['id'])) { throw new HTTPException\BadRequestException(); } - $itemId = intval($parameters['id']); + $itemId = intval(static::$parameters['id']); $item = Post::selectFirstForUser(local_user(), ['uid', 'uri-id', 'starred'], ['uid' => [0, local_user()], 'id' => $itemId]); diff --git a/src/Module/Magic.php b/src/Module/Magic.php index c51c05844..63f8ee9c1 100644 --- a/src/Module/Magic.php +++ b/src/Module/Magic.php @@ -39,7 +39,7 @@ use Friendica\Util\Strings; */ class Magic extends BaseModule { - public static function init(array $parameters = []) + public static function init() { $a = DI::app(); $ret = ['success' => false, 'url' => '', 'message' => '']; diff --git a/src/Module/Maintenance.php b/src/Module/Maintenance.php index be70e7a5c..d13c5fe02 100644 --- a/src/Module/Maintenance.php +++ b/src/Module/Maintenance.php @@ -34,7 +34,7 @@ use Friendica\Util\Strings; */ class Maintenance extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $reason = DI::config()->get('system', 'maintenance_reason'); diff --git a/src/Module/Manifest.php b/src/Module/Manifest.php index 0f9112d11..4a226ac63 100644 --- a/src/Module/Manifest.php +++ b/src/Module/Manifest.php @@ -27,7 +27,7 @@ use Friendica\DI; class Manifest extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $config = DI::config(); diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php index 253003896..96e4d7658 100644 --- a/src/Module/NoScrape.php +++ b/src/Module/NoScrape.php @@ -35,14 +35,14 @@ use Friendica\Model\User; */ class NoScrape extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $a = DI::app(); - if (isset($parameters['nick'])) { + if (isset(static::$parameters['nick'])) { // Get infos about a specific nick (public) - $which = $parameters['nick']; - } elseif (local_user() && isset($parameters['profile']) && DI::args()->get(2) == 'view') { + $which = static::$parameters['nick']; + } elseif (local_user() && isset(static::$parameters['profile']) && DI::args()->get(2) == 'view') { // view infos about a known profile (needs a login) $which = $a->getLoggedInUserNickname(); } else { diff --git a/src/Module/NodeInfo110.php b/src/Module/NodeInfo110.php index 5248c662b..3923b7e21 100644 --- a/src/Module/NodeInfo110.php +++ b/src/Module/NodeInfo110.php @@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo; */ class NodeInfo110 extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $config = DI::config(); diff --git a/src/Module/NodeInfo120.php b/src/Module/NodeInfo120.php index 0eb6e793f..471f0f212 100644 --- a/src/Module/NodeInfo120.php +++ b/src/Module/NodeInfo120.php @@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo; */ class NodeInfo120 extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $config = DI::config(); diff --git a/src/Module/NodeInfo210.php b/src/Module/NodeInfo210.php index 5ea9c0e68..02324a92b 100644 --- a/src/Module/NodeInfo210.php +++ b/src/Module/NodeInfo210.php @@ -33,7 +33,7 @@ use Friendica\Model\Nodeinfo; */ class NodeInfo210 extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $config = DI::config(); diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 9bc9f40b0..234175dd8 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -55,7 +55,7 @@ class Introductions extends BaseNotifications ]; } - public static function content(array $parameters = []) + public static function content() { Nav::setSelected('introductions'); diff --git a/src/Module/Notifications/Notification.php b/src/Module/Notifications/Notification.php index 64ab459f1..5c27abbbb 100644 --- a/src/Module/Notifications/Notification.php +++ b/src/Module/Notifications/Notification.php @@ -42,13 +42,13 @@ class Notification extends BaseModule * @throws \ImagickException * @throws \Exception */ - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.')); } - $request_id = $parameters['id'] ?? false; + $request_id = static::$parameters['id'] ?? false; if ($request_id) { $intro = DI::intro()->selectOneById($request_id, local_user()); @@ -73,7 +73,7 @@ class Notification extends BaseModule * * @throws HTTPException\UnauthorizedException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!local_user()) { throw new HTTPException\UnauthorizedException(DI::l10n()->t('Permission denied.')); @@ -101,14 +101,14 @@ class Notification extends BaseModule * @throws HTTPException\InternalServerErrorException * @throws \Exception */ - public static function content(array $parameters = []): string + public static function content(): string { if (!local_user()) { notice(DI::l10n()->t('You must be logged in to show this page.')); return Login::form(); } - $request_id = $parameters['id'] ?? false; + $request_id = static::$parameters['id'] ?? false; if ($request_id) { $Notify = DI::notify()->selectOneById($request_id); diff --git a/src/Module/Notifications/Notifications.php b/src/Module/Notifications/Notifications.php index a0e40719c..9b43647e9 100644 --- a/src/Module/Notifications/Notifications.php +++ b/src/Module/Notifications/Notifications.php @@ -82,7 +82,7 @@ class Notifications extends BaseNotifications ]; } - public static function content(array $parameters = []) + public static function content() { Nav::setSelected('notifications'); diff --git a/src/Module/OAuth/Acknowledge.php b/src/Module/OAuth/Acknowledge.php index 6f7ac945b..ffce1caae 100644 --- a/src/Module/OAuth/Acknowledge.php +++ b/src/Module/OAuth/Acknowledge.php @@ -30,13 +30,13 @@ use Friendica\Module\BaseApi; */ class Acknowledge extends BaseApi { - public static function post(array $parameters = []) + public static function post() { DI::session()->set('oauth_acknowledge', true); DI::app()->redirect(DI::session()->get('return_path')); } - public static function content(array $parameters = []) + public static function content() { DI::session()->set('return_path', $_REQUEST['return_path'] ?? ''); diff --git a/src/Module/OAuth/Authorize.php b/src/Module/OAuth/Authorize.php index cf5187d94..ede46720a 100644 --- a/src/Module/OAuth/Authorize.php +++ b/src/Module/OAuth/Authorize.php @@ -35,10 +35,9 @@ class Authorize extends BaseApi private static $oauth_code = ''; /** - * @param array $parameters * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $request = self::getRequest([ 'force_login' => '', // Forces the user to re-login, which is necessary for authorizing with multiple accounts from the same instance. @@ -98,7 +97,7 @@ class Authorize extends BaseApi self::$oauth_code = $token['code']; } - public static function content(array $parameters = []) + public static function content() { if (empty(self::$oauth_code)) { return ''; diff --git a/src/Module/OAuth/Revoke.php b/src/Module/OAuth/Revoke.php index 519e79db0..156ef1c19 100644 --- a/src/Module/OAuth/Revoke.php +++ b/src/Module/OAuth/Revoke.php @@ -32,7 +32,7 @@ use Friendica\Module\BaseApi; */ class Revoke extends BaseApi { - public static function post(array $parameters = []) + public static function post() { $request = self::getRequest([ 'client_id' => '', // Client ID, obtained during app registration diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php index f104e9672..2ef26cbf1 100644 --- a/src/Module/OAuth/Token.php +++ b/src/Module/OAuth/Token.php @@ -34,7 +34,7 @@ use Friendica\Security\OAuth; */ class Token extends BaseApi { - public static function post(array $parameters = []) + public static function post() { $request = self::getRequest([ 'client_id' => '', // Client ID, obtained during app registration diff --git a/src/Module/Oembed.php b/src/Module/Oembed.php index 0d6fb8ee5..5564fdaca 100644 --- a/src/Module/Oembed.php +++ b/src/Module/Oembed.php @@ -37,7 +37,7 @@ use Friendica\Util\Strings; */ class Oembed extends BaseModule { - public static function content(array $parameters = []) + public static function content() { // Unused form: /oembed/b2h?url=... if (DI::args()->getArgv()[1] == 'b2h') { diff --git a/src/Module/OpenSearch.php b/src/Module/OpenSearch.php index df3770687..a6393726d 100644 --- a/src/Module/OpenSearch.php +++ b/src/Module/OpenSearch.php @@ -36,7 +36,7 @@ class OpenSearch extends BaseModule /** * @throws \Exception */ - public static function rawContent(array $parameters = []) + public static function rawContent() { header('Content-type: application/opensearchdescription+xml'); diff --git a/src/Module/Owa.php b/src/Module/Owa.php index 5b87e6a4f..a46734987 100644 --- a/src/Module/Owa.php +++ b/src/Module/Owa.php @@ -44,7 +44,7 @@ use Friendica\Util\Strings; */ class Owa extends BaseModule { - public static function init(array $parameters = []) + public static function init() { $ret = [ 'success' => false ]; diff --git a/src/Module/ParseUrl.php b/src/Module/ParseUrl.php index 0b1548ed5..f8665c535 100644 --- a/src/Module/ParseUrl.php +++ b/src/Module/ParseUrl.php @@ -31,7 +31,7 @@ use Friendica\Util; class ParseUrl extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!Session::isAuthenticated()) { throw new \Friendica\Network\HTTPException\ForbiddenException(); diff --git a/src/Module/PermissionTooltip.php b/src/Module/PermissionTooltip.php index 7599c2f06..89ed260f9 100644 --- a/src/Module/PermissionTooltip.php +++ b/src/Module/PermissionTooltip.php @@ -15,10 +15,10 @@ use Friendica\Network\HTTPException; */ class PermissionTooltip extends \Friendica\BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - $type = $parameters['type']; - $referenceId = $parameters['id']; + $type = static::$parameters['type']; + $referenceId = static::$parameters['id']; $expectedTypes = ['item', 'photo', 'event']; if (!in_array($type, $expectedTypes)) { diff --git a/src/Module/Photo.php b/src/Module/Photo.php index 399313e3f..2a45ef047 100644 --- a/src/Module/Photo.php +++ b/src/Module/Photo.php @@ -51,7 +51,7 @@ class Photo extends BaseModule * Fetch a photo or an avatar, in optional size, check for permissions and * return the image */ - public static function rawContent(array $parameters = []) + public static function rawContent() { $totalstamp = microtime(true); @@ -77,14 +77,14 @@ class Photo extends BaseModule $scale = null; $stamp = microtime(true); // User avatar - if (!empty($parameters['type'])) { - if (!empty($parameters['customsize'])) { - $customsize = intval($parameters['customsize']); - $square_resize = !in_array($parameters['type'], ['media', 'preview']); + if (!empty(static::$parameters['type'])) { + if (!empty(static::$parameters['customsize'])) { + $customsize = intval(static::$parameters['customsize']); + $square_resize = !in_array(static::$parameters['type'], ['media', 'preview']); } - if (!empty($parameters['guid'])) { - $guid = $parameters['guid']; + if (!empty(static::$parameters['guid'])) { + $guid = static::$parameters['guid']; $account = DBA::selectFirst('account-user-view', ['id'], ['guid' => $guid], ['order' => ['uid' => true]]); if (empty($account)) { throw new HTTPException\NotFoundException(); @@ -94,12 +94,12 @@ class Photo extends BaseModule } // Contact Id Fallback, to remove after version 2021.12 - if (isset($parameters['contact_id'])) { - $id = intval($parameters['contact_id']); + if (isset(static::$parameters['contact_id'])) { + $id = intval(static::$parameters['contact_id']); } - if (!empty($parameters['nickname_ext'])) { - $nickname = pathinfo($parameters['nickname_ext'], PATHINFO_FILENAME); + if (!empty(static::$parameters['nickname_ext'])) { + $nickname = pathinfo(static::$parameters['nickname_ext'], PATHINFO_FILENAME); $user = User::getByNickname($nickname, ['uid']); if (empty($user)) { throw new HTTPException\NotFoundException(); @@ -109,23 +109,23 @@ class Photo extends BaseModule } // User Id Fallback, to remove after version 2021.12 - if (!empty($parameters['uid_ext'])) { - $id = intval(pathinfo($parameters['uid_ext'], PATHINFO_FILENAME)); + if (!empty(static::$parameters['uid_ext'])) { + $id = intval(pathinfo(static::$parameters['uid_ext'], PATHINFO_FILENAME)); } // Please refactor this for the love of everything that's good - if (isset($parameters['id'])) { - $id = $parameters['id']; + if (isset(static::$parameters['id'])) { + $id = static::$parameters['id']; } if (empty($id)) { - Logger::notice('No picture id was detected', ['parameters' => $parameters, 'query' => DI::args()->getQueryString()]); + Logger::notice('No picture id was detected', ['parameters' => static::$parameters, 'query' => DI::args()->getQueryString()]); throw new HTTPException\NotFoundException(DI::l10n()->t('The Photo is not available.')); } - $photo = self::getPhotoByid($id, $parameters['type'], $customsize ?: Proxy::PIXEL_SMALL); + $photo = self::getPhotoByid($id, static::$parameters['type'], $customsize ?: Proxy::PIXEL_SMALL); } else { - $photoid = pathinfo($parameters['name'], PATHINFO_FILENAME); + $photoid = pathinfo(static::$parameters['name'], PATHINFO_FILENAME); $scale = 0; if (substr($photoid, -2, 1) == "-") { $scale = intval(substr($photoid, -1, 1)); diff --git a/src/Module/Profile/Common.php b/src/Module/Profile/Common.php index 7138ac73f..a46973967 100644 --- a/src/Module/Profile/Common.php +++ b/src/Module/Profile/Common.php @@ -35,7 +35,7 @@ use Friendica\Network\HTTPException; class Common extends BaseProfile { - public static function content(array $parameters = []) + public static function content() { if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); @@ -45,7 +45,7 @@ class Common extends BaseProfile Nav::setSelected('home'); - $nickname = $parameters['nickname']; + $nickname = static::$parameters['nickname']; $profile = Profile::load($a, $nickname); if (empty($profile)) { diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php index 94f301557..0f28be641 100644 --- a/src/Module/Profile/Contacts.php +++ b/src/Module/Profile/Contacts.php @@ -34,7 +34,7 @@ use Friendica\Network\HTTPException; class Contacts extends Module\BaseProfile { - public static function content(array $parameters = []) + public static function content() { if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); @@ -42,8 +42,8 @@ class Contacts extends Module\BaseProfile $a = DI::app(); - $nickname = $parameters['nickname']; - $type = $parameters['type'] ?? 'all'; + $nickname = static::$parameters['nickname']; + $type = static::$parameters['type'] ?? 'all'; $profile = Model\Profile::load($a, $nickname); if (empty($profile)) { diff --git a/src/Module/Profile/Index.php b/src/Module/Profile/Index.php index 5334ac932..4f46efaa3 100644 --- a/src/Module/Profile/Index.php +++ b/src/Module/Profile/Index.php @@ -34,13 +34,13 @@ use Friendica\BaseModule; */ class Index extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - Profile::rawContent($parameters); + Profile::rawContent(); } - public static function content(array $parameters = []) + public static function content() { - return Status::content($parameters); + return Status::content(); } } diff --git a/src/Module/Profile/Media.php b/src/Module/Profile/Media.php index e10597199..f46097814 100644 --- a/src/Module/Profile/Media.php +++ b/src/Module/Profile/Media.php @@ -29,11 +29,11 @@ use Friendica\Network\HTTPException; class Media extends BaseProfile { - public static function content(array $parameters = []) + public static function content() { $a = DI::app(); - $profile = ProfileModel::load($a, $parameters['nickname']); + $profile = ProfileModel::load($a, static::$parameters['nickname']); if (empty($profile)) { throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); } diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php index 25b6eccc9..c1792ad4e 100644 --- a/src/Module/Profile/Profile.php +++ b/src/Module/Profile/Profile.php @@ -46,10 +46,10 @@ use Friendica\Util\Temporal; class Profile extends BaseProfile { - public static function rawContent(array $parameters = []) + public static function rawContent() { if (ActivityPub::isRequest()) { - $user = DBA::selectFirst('user', ['uid'], ['nickname' => $parameters['nickname']]); + $user = DBA::selectFirst('user', ['uid'], ['nickname' => static::$parameters['nickname']]); if (DBA::isResult($user)) { try { $data = ActivityPub\Transmitter::getProfile($user['uid']); @@ -61,9 +61,9 @@ class Profile extends BaseProfile } } - if (DBA::exists('userd', ['username' => $parameters['nickname']])) { + if (DBA::exists('userd', ['username' => static::$parameters['nickname']])) { // Known deleted user - $data = ActivityPub\Transmitter::getDeletedUser($parameters['nickname']); + $data = ActivityPub\Transmitter::getDeletedUser(static::$parameters['nickname']); System::jsonError(410, $data); } else { @@ -73,11 +73,11 @@ class Profile extends BaseProfile } } - public static function content(array $parameters = []) + public static function content() { $a = DI::app(); - $profile = ProfileModel::load($a, $parameters['nickname']); + $profile = ProfileModel::load($a, static::$parameters['nickname']); if (!$profile) { throw new HTTPException\NotFoundException(DI::l10n()->t('Profile not found.')); } @@ -98,7 +98,7 @@ class Profile extends BaseProfile DI::page()['htmlhead'] .= '' . "\n"; } - DI::page()['htmlhead'] .= self::buildHtmlHead($profile, $parameters['nickname'], $remote_contact_id); + DI::page()['htmlhead'] .= self::buildHtmlHead($profile, static::$parameters['nickname'], $remote_contact_id); Nav::setSelected('home'); @@ -134,7 +134,7 @@ class Profile extends BaseProfile $view_as_contact_alert = DI::l10n()->t( 'You\'re currently viewing your profile as %s Cancel', htmlentities($view_as_contacts[$key]['name'], ENT_COMPAT, 'UTF-8'), - 'profile/' . $parameters['nickname'] . '/profile' + 'profile/' . static::$parameters['nickname'] . '/profile' ); } } diff --git a/src/Module/Profile/Schedule.php b/src/Module/Profile/Schedule.php index e72b1c7a6..eaeeb8540 100644 --- a/src/Module/Profile/Schedule.php +++ b/src/Module/Profile/Schedule.php @@ -33,7 +33,7 @@ use Friendica\Util\DateTimeFormat; class Schedule extends BaseProfile { - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); @@ -50,7 +50,7 @@ class Schedule extends BaseProfile Post\Delayed::deleteById($_REQUEST['delete']); } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); @@ -80,7 +80,7 @@ class Schedule extends BaseProfile '$form_security_token' => BaseModule::getFormSecurityToken("profile_schedule"), '$baseurl' => DI::baseUrl()->get(true), '$title' => DI::l10n()->t('Scheduled Posts'), - '$nickname' => $parameters['nickname'] ?? '', + '$nickname' => static::$parameters['nickname'] ?? '', '$scheduled_at' => DI::l10n()->t('Scheduled'), '$content' => DI::l10n()->t('Content'), '$delete' => DI::l10n()->t('Remove post'), diff --git a/src/Module/Profile/Status.php b/src/Module/Profile/Status.php index e93fc5699..995939ce7 100644 --- a/src/Module/Profile/Status.php +++ b/src/Module/Profile/Status.php @@ -46,13 +46,13 @@ use Friendica\Util\XML; class Status extends BaseProfile { - public static function content(array $parameters = []) + public static function content() { $args = DI::args(); $a = DI::app(); - $profile = ProfileModel::load($a, $parameters['nickname']); + $profile = ProfileModel::load($a, static::$parameters['nickname']); if (empty($profile)) { throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); @@ -62,10 +62,10 @@ class Status extends BaseProfile DI::page()['htmlhead'] .= '' . "\n"; } - DI::page()['htmlhead'] .= '' . "\n"; - DI::page()['htmlhead'] .= '' . "\n"; - DI::page()['htmlhead'] .= '' . "\n"; - DI::page()['htmlhead'] .= '' . "\n"; + DI::page()['htmlhead'] .= '' . "\n"; + DI::page()['htmlhead'] .= '' . "\n"; + DI::page()['htmlhead'] .= '' . "\n"; + DI::page()['htmlhead'] .= '' . "\n"; $category = $datequery = $datequery2 = ''; diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php index 86b8a95cb..a9c8c0b9e 100644 --- a/src/Module/Proxy.php +++ b/src/Module/Proxy.php @@ -44,9 +44,9 @@ class Proxy extends BaseModule /** * Fetch remote image content */ - public static function rawContent(array $parameters = []) + public static function rawContent() { - $request = self::getRequestInfo($parameters); + $request = self::getRequestInfo(); if (!DI::config()->get('system', 'proxify_content')) { Logger::notice('Proxy access is forbidden', ['request' => $request, 'agent' => $_SERVER['HTTP_USER_AGENT'] ?? '', 'accept' => $_SERVER['HTTP_ACCEPT'] ?? '']); @@ -119,13 +119,13 @@ class Proxy extends BaseModule * ] * @throws \Exception */ - private static function getRequestInfo(array $parameters) + private static function getRequestInfo() { $size = ProxyUtils::PIXEL_LARGE; $sizetype = ''; - if (!empty($parameters['url']) && empty($_REQUEST['url'])) { - $url = $parameters['url']; + if (!empty(static::$parameters['url']) && empty($_REQUEST['url'])) { + $url = static::$parameters['url']; // thumb, small, medium and large. if (substr($url, -6) == ':micro') { diff --git a/src/Module/PublicRSAKey.php b/src/Module/PublicRSAKey.php index a13130d1c..22269984a 100644 --- a/src/Module/PublicRSAKey.php +++ b/src/Module/PublicRSAKey.php @@ -33,13 +33,13 @@ use Friendica\Util\Strings; */ class PublicRSAKey extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - if (empty($parameters['nick'])) { + if (empty(static::$parameters['nick'])) { throw new BadRequestException(); } - $nick = $parameters['nick']; + $nick = static::$parameters['nick']; $user = User::getByNickname($nick, ['spubkey']); if (empty($user) || empty($user['spubkey'])) { diff --git a/src/Module/RandomProfile.php b/src/Module/RandomProfile.php index df1a987d2..b50746701 100644 --- a/src/Module/RandomProfile.php +++ b/src/Module/RandomProfile.php @@ -30,7 +30,7 @@ use Friendica\Model\Contact; */ class RandomProfile extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $a = DI::app(); diff --git a/src/Module/ReallySimpleDiscovery.php b/src/Module/ReallySimpleDiscovery.php index 8d6a6ff3c..50b966002 100644 --- a/src/Module/ReallySimpleDiscovery.php +++ b/src/Module/ReallySimpleDiscovery.php @@ -31,7 +31,7 @@ use Friendica\Util\XML; */ class ReallySimpleDiscovery extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { header('Content-Type: text/xml'); diff --git a/src/Module/Register.php b/src/Module/Register.php index 909e61a99..7c0d3f690 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -53,7 +53,7 @@ class Register extends BaseModule * * @return string */ - public static function content(array $parameters = []) + public static function content() { // logged in users can register others (people/pages/groups) // even with closed registrations, unless specifically prohibited by site policy. @@ -129,7 +129,7 @@ class Register extends BaseModule $tpl = $arr['template']; - $tos = new Tos(); + $tos = new Tos(static::$parameters); $o = Renderer::replaceMacros($tpl, [ '$invitations' => DI::config()->get('system', 'invitation_only'), @@ -182,7 +182,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(array $parameters = []) + public static function post() { BaseModule::checkFormSecurityTokenRedirectOnError('/register', 'register'); diff --git a/src/Module/RemoteFollow.php b/src/Module/RemoteFollow.php index f1e653f1c..df67e60c6 100644 --- a/src/Module/RemoteFollow.php +++ b/src/Module/RemoteFollow.php @@ -42,9 +42,9 @@ class RemoteFollow extends BaseModule { static $owner; - public static function init(array $parameters = []) + public static function init() { - self::$owner = User::getOwnerDataByNick($parameters['profile']); + self::$owner = User::getOwnerDataByNick(static::$parameters['profile']); if (!self::$owner) { throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.')); } @@ -52,7 +52,7 @@ class RemoteFollow extends BaseModule DI::page()['aside'] = Widget\VCard::getHTML(self::$owner); } - public static function post(array $parameters = []) + public static function post() { if (!empty($_POST['cancel']) || empty($_POST['dfrn_url'])) { DI::baseUrl()->redirect(); @@ -96,7 +96,7 @@ class RemoteFollow extends BaseModule System::externalRedirect($follow_link); } - public static function content(array $parameters = []) + public static function content() { if (empty(self::$owner)) { return ''; @@ -115,7 +115,7 @@ class RemoteFollow extends BaseModule '$submit' => DI::l10n()->t('Submit Request'), '$cancel' => DI::l10n()->t('Cancel'), - '$request' => 'remote_follow/' . $parameters['profile'], + '$request' => 'remote_follow/' . static::$parameters['profile'], '$name' => self::$owner['name'], '$myaddr' => Profile::getMyURL(), ]); diff --git a/src/Module/RobotsTxt.php b/src/Module/RobotsTxt.php index 63abcf36e..c2b2d624d 100644 --- a/src/Module/RobotsTxt.php +++ b/src/Module/RobotsTxt.php @@ -28,7 +28,7 @@ use Friendica\BaseModule; */ class RobotsTxt extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $allDisalloweds = [ '/settings/', diff --git a/src/Module/Search/Acl.php b/src/Module/Search/Acl.php index 636e09539..8ec8dd9bb 100644 --- a/src/Module/Search/Acl.php +++ b/src/Module/Search/Acl.php @@ -48,7 +48,7 @@ class Acl extends BaseModule const TYPE_PRIVATE_MESSAGE = 'm'; const TYPE_ANY_CONTACT = 'a'; - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!local_user()) { throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this module.')); diff --git a/src/Module/Search/Directory.php b/src/Module/Search/Directory.php index 692122155..5b5a1ba28 100644 --- a/src/Module/Search/Directory.php +++ b/src/Module/Search/Directory.php @@ -31,7 +31,7 @@ use Friendica\Module\Security\Login; */ class Directory extends BaseSearch { - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { notice(DI::l10n()->t('Permission denied.')); diff --git a/src/Module/Search/Filed.php b/src/Module/Search/Filed.php index 7bfc14f6f..f3cad8620 100644 --- a/src/Module/Search/Filed.php +++ b/src/Module/Search/Filed.php @@ -17,7 +17,7 @@ use Friendica\Module\Security\Login; class Filed extends BaseSearch { - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { return Login::form(); diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php index 769d5f90d..941b4c577 100644 --- a/src/Module/Search/Index.php +++ b/src/Module/Search/Index.php @@ -41,7 +41,7 @@ use Friendica\Network\HTTPException; class Index extends BaseSearch { - public static function content(array $parameters = []) + public static function content() { $search = (!empty($_GET['q']) ? trim(rawurldecode($_GET['q'])) : ''); diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php index d5cc15cee..436e3f958 100644 --- a/src/Module/Search/Saved.php +++ b/src/Module/Search/Saved.php @@ -28,7 +28,7 @@ use Friendica\DI; class Saved extends BaseModule { - public static function init(array $parameters = []) + public static function init() { $action = DI::args()->get(2, 'none'); $search = trim(rawurldecode($_GET['term'] ?? '')); diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php index 0e4923480..e157ac089 100644 --- a/src/Module/Security/Login.php +++ b/src/Module/Security/Login.php @@ -33,7 +33,7 @@ use Friendica\Module\Register; */ class Login extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $return_path = $_REQUEST['return_path'] ?? '' ; @@ -46,7 +46,7 @@ class Login extends BaseModule return self::form(Session::get('return_path'), intval(DI::config()->get('config', 'register_policy')) !== \Friendica\Module\Register::CLOSED); } - public static function post(array $parameters = []) + public static function post() { $return_path = Session::get('return_path'); Session::clear(); diff --git a/src/Module/Security/Logout.php b/src/Module/Security/Logout.php index 1724ae297..35658797c 100644 --- a/src/Module/Security/Logout.php +++ b/src/Module/Security/Logout.php @@ -36,7 +36,7 @@ class Logout extends BaseModule /** * Process logout requests */ - public static function init(array $parameters = []) + public static function init() { $visitor_home = null; if (remote_user()) { diff --git a/src/Module/Security/OpenID.php b/src/Module/Security/OpenID.php index 8e8613c4e..4459b2cf8 100644 --- a/src/Module/Security/OpenID.php +++ b/src/Module/Security/OpenID.php @@ -31,7 +31,7 @@ use LightOpenID; */ class OpenID extends BaseModule { - public static function content(array $parameters = []) + public static function content() { if (DI::config()->get('system', 'no_openid')) { DI::baseUrl()->redirect(); diff --git a/src/Module/Security/TwoFactor/Recovery.php b/src/Module/Security/TwoFactor/Recovery.php index d93146cb6..5bcf6add8 100644 --- a/src/Module/Security/TwoFactor/Recovery.php +++ b/src/Module/Security/TwoFactor/Recovery.php @@ -35,14 +35,14 @@ use Friendica\Security\TwoFactor\Model\RecoveryCode; */ class Recovery extends BaseModule { - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { return; } } - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -67,7 +67,7 @@ class Recovery extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { DI::baseUrl()->redirect(); diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php index 22c757b82..3209b3f56 100644 --- a/src/Module/Security/TwoFactor/Verify.php +++ b/src/Module/Security/TwoFactor/Verify.php @@ -38,7 +38,7 @@ class Verify extends BaseModule { private static $errors = []; - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -78,7 +78,7 @@ class Verify extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { DI::baseUrl()->redirect(); diff --git a/src/Module/Settings/Delegation.php b/src/Module/Settings/Delegation.php index 067304ee8..f98583a2a 100644 --- a/src/Module/Settings/Delegation.php +++ b/src/Module/Settings/Delegation.php @@ -36,7 +36,7 @@ use Friendica\Util\Strings; */ class Delegation extends BaseSettings { - public static function post(array $parameters = []) + public static function post() { if (!DI::app()->isLoggedIn()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); @@ -62,9 +62,9 @@ class Delegation extends BaseSettings DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); if (!local_user()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php index 5429a11e2..42632fe0f 100644 --- a/src/Module/Settings/Display.php +++ b/src/Module/Settings/Display.php @@ -36,7 +36,7 @@ use Friendica\Network\HTTPException; */ class Display extends BaseSettings { - public static function post(array $parameters = []) + public static function post() { if (!DI::app()->isLoggedIn()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); @@ -112,9 +112,9 @@ class Display extends BaseSettings DI::baseUrl()->redirect('settings/display'); } - public static function content(array $parameters = []) + public static function content() { - parent::content($parameters); + parent::content(); if (!local_user()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); diff --git a/src/Module/Settings/Profile/Index.php b/src/Module/Settings/Profile/Index.php index 28e8430ea..8b2510050 100644 --- a/src/Module/Settings/Profile/Index.php +++ b/src/Module/Settings/Profile/Index.php @@ -41,7 +41,7 @@ use Friendica\Util\Temporal; class Index extends BaseSettings { - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -135,7 +135,7 @@ class Index extends BaseSettings DI::baseUrl()->redirect('settings/profile'); } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { notice(DI::l10n()->t('You must be logged in to use this module')); diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php index 104b6f653..b98367438 100644 --- a/src/Module/Settings/Profile/Photo/Crop.php +++ b/src/Module/Settings/Profile/Photo/Crop.php @@ -33,13 +33,13 @@ use Friendica\Network\HTTPException; class Crop extends BaseSettings { - public static function post(array $parameters = []) + public static function post() { if (!Session::isAuthenticated()) { return; } - $photo_prefix = $parameters['guid']; + $photo_prefix = static::$parameters['guid']; $resource_id = $photo_prefix; $scale = 0; if (substr($photo_prefix, -2, 1) == '-') { @@ -160,7 +160,7 @@ class Crop extends BaseSettings DI::baseUrl()->redirect($path); } - public static function content(array $parameters = []) + public static function content() { if (!Session::isAuthenticated()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); @@ -168,7 +168,7 @@ class Crop extends BaseSettings parent::content(); - $resource_id = $parameters['guid']; + $resource_id = static::$parameters['guid']; $photos = Photo::selectToArray([], ['resource-id' => $resource_id, 'uid' => local_user()], ['order' => ['scale' => false]]); if (!DBA::isResult($photos)) { diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php index cda71a7c6..423d0971e 100644 --- a/src/Module/Settings/Profile/Photo/Index.php +++ b/src/Module/Settings/Profile/Photo/Index.php @@ -34,7 +34,7 @@ use Friendica\Util\Strings; class Index extends BaseSettings { - public static function post(array $parameters = []) + public static function post() { if (!Session::isAuthenticated()) { return; @@ -106,7 +106,7 @@ class Index extends BaseSettings DI::baseUrl()->redirect('settings/profile/photo/crop/' . $resource_id); } - public static function content(array $parameters = []) + public static function content() { if (!Session::isAuthenticated()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php index 29d6b19c5..21304d10e 100644 --- a/src/Module/Settings/TwoFactor/AppSpecific.php +++ b/src/Module/Settings/TwoFactor/AppSpecific.php @@ -36,7 +36,7 @@ class AppSpecific extends BaseSettings { private static $appSpecificPassword = null; - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { return; @@ -54,7 +54,7 @@ class AppSpecific extends BaseSettings } } - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -97,13 +97,13 @@ class AppSpecific extends BaseSettings } } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { return Login::form('settings/2fa/app_specific'); } - parent::content($parameters); + parent::content(); $appSpecificPasswords = AppSpecificPassword::getListForUser(local_user()); diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php index 3bb3a2aa1..b173a092d 100644 --- a/src/Module/Settings/TwoFactor/Index.php +++ b/src/Module/Settings/TwoFactor/Index.php @@ -33,7 +33,7 @@ use PragmaRX\Google2FA\Google2FA; class Index extends BaseSettings { - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -94,13 +94,13 @@ class Index extends BaseSettings } } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { return Login::form('settings/2fa'); } - parent::content($parameters); + parent::content(); $has_secret = (bool) DI::pConfig()->get(local_user(), '2fa', 'secret'); $verified = DI::pConfig()->get(local_user(), '2fa', 'verified'); diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php index eac3da919..25832d2e6 100644 --- a/src/Module/Settings/TwoFactor/Recovery.php +++ b/src/Module/Settings/TwoFactor/Recovery.php @@ -34,7 +34,7 @@ use Friendica\Module\Security\Login; */ class Recovery extends BaseSettings { - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { return; @@ -52,7 +52,7 @@ class Recovery extends BaseSettings } } - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -69,13 +69,13 @@ class Recovery extends BaseSettings } } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { return Login::form('settings/2fa/recovery'); } - parent::content($parameters); + parent::content(); if (!RecoveryCode::countValidForUser(local_user())) { RecoveryCode::generateForUser(local_user()); diff --git a/src/Module/Settings/TwoFactor/Trusted.php b/src/Module/Settings/TwoFactor/Trusted.php index 753250941..c719dc581 100644 --- a/src/Module/Settings/TwoFactor/Trusted.php +++ b/src/Module/Settings/TwoFactor/Trusted.php @@ -14,7 +14,7 @@ use UAParser\Parser; */ class Trusted extends BaseSettings { - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { return; @@ -32,7 +32,7 @@ class Trusted extends BaseSettings } } - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -64,9 +64,9 @@ class Trusted extends BaseSettings } - public static function content(array $parameters = []): string + public static function content(): string { - parent::content($parameters); + parent::content(); $trustedBrowserRepository = new TwoFactor\Repository\TrustedBrowser(DI::dba(), DI::logger()); $trustedBrowsers = $trustedBrowserRepository->selectAllByUid(local_user()); diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php index a4106c260..27c9631d4 100644 --- a/src/Module/Settings/TwoFactor/Verify.php +++ b/src/Module/Settings/TwoFactor/Verify.php @@ -39,7 +39,7 @@ use PragmaRX\Google2FA\Google2FA; */ class Verify extends BaseSettings { - public static function init(array $parameters = []) + public static function init() { if (!local_user()) { return; @@ -58,7 +58,7 @@ class Verify extends BaseSettings } } - public static function post(array $parameters = []) + public static function post() { if (!local_user()) { return; @@ -84,13 +84,13 @@ class Verify extends BaseSettings } } - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { return Login::form('settings/2fa/verify'); } - parent::content($parameters); + parent::content(); $company = 'Friendica'; $holder = Session::get('my_address'); diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php index aad76c4fb..27e82c4cf 100644 --- a/src/Module/Settings/UserExport.php +++ b/src/Module/Settings/UserExport.php @@ -47,18 +47,17 @@ class UserExport extends BaseSettings * If there is an action required through the URL / path, react * accordingly and export the requested data. * - * @param array $parameters Router-supplied parameters * @return string * @throws HTTPException\ForbiddenException * @throws HTTPException\InternalServerErrorException */ - public static function content(array $parameters = []) + public static function content() { if (!local_user()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); } - parent::content($parameters); + parent::content(); /** * options shown on "Export personal data" page @@ -84,10 +83,9 @@ class UserExport extends BaseSettings * to the browser which then offers a save / open dialog * to the user. * - * @param array $parameters Router-supplied parameters * @throws HTTPException\ForbiddenException */ - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!DI::app()->isLoggedIn()) { throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.')); diff --git a/src/Module/Smilies.php b/src/Module/Smilies.php index 8ee641b5a..1ffff65c0 100644 --- a/src/Module/Smilies.php +++ b/src/Module/Smilies.php @@ -33,7 +33,7 @@ use Friendica\DI; */ class Smilies extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!empty(DI::args()->getArgv()[1]) && (DI::args()->getArgv()[1] === "json")) { $smilies = Content\Smilies::getList(); @@ -45,7 +45,7 @@ class Smilies extends BaseModule } } - public static function content(array $parameters = []) + public static function content() { $smilies = Content\Smilies::getList(); $count = count($smilies['texts'] ?? []); diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php index e9d9eca02..6b6e43165 100644 --- a/src/Module/Statistics.php +++ b/src/Module/Statistics.php @@ -28,14 +28,14 @@ use Friendica\Network\HTTPException\NotFoundException; class Statistics extends BaseModule { - public static function init(array $parameters = []) + public static function init() { if (!DI::config()->get("system", "nodeinfo")) { throw new NotFoundException(); } } - public static function rawContent(array $parameters = []) + public static function rawContent() { $config = DI::config(); $logger = DI::logger(); diff --git a/src/Module/Theme.php b/src/Module/Theme.php index 1282fc783..201558ab7 100644 --- a/src/Module/Theme.php +++ b/src/Module/Theme.php @@ -30,11 +30,11 @@ use Friendica\Util\Strings; */ class Theme extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { header('Content-Type: text/css'); - $theme = Strings::sanitizeFilePathItem($parameters['theme']); + $theme = Strings::sanitizeFilePathItem(static::$parameters['theme']); if (file_exists("view/theme/$theme/theme.php")) { require_once "view/theme/$theme/theme.php"; diff --git a/src/Module/ThemeDetails.php b/src/Module/ThemeDetails.php index 48c417412..0f45af13c 100644 --- a/src/Module/ThemeDetails.php +++ b/src/Module/ThemeDetails.php @@ -29,7 +29,7 @@ use Friendica\Core\Theme; */ class ThemeDetails extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!empty($_REQUEST['theme'])) { $theme = $_REQUEST['theme']; diff --git a/src/Module/ToggleMobile.php b/src/Module/ToggleMobile.php index 11e8259d5..7cf53633a 100644 --- a/src/Module/ToggleMobile.php +++ b/src/Module/ToggleMobile.php @@ -29,7 +29,7 @@ use Friendica\DI; */ class ToggleMobile extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $a = DI::app(); diff --git a/src/Module/Tos.php b/src/Module/Tos.php index 34834d41c..1c91641f5 100644 --- a/src/Module/Tos.php +++ b/src/Module/Tos.php @@ -41,8 +41,10 @@ class Tos extends BaseModule * be properties of the class, however cannot be set directly as the property * cannot depend on a function result when declaring the variable. **/ - public function __construct() + public function __construct(array $parameters = []) { + parent::__construct($parameters); + $this->privacy_operate = DI::l10n()->t('At the time of registration, and for providing communications between the user account and their contacts, the user has to provide a display name (pen name), an username (nickname) and a working email address. The names will be accessible on the profile page of the account by any visitor of the page, even if other profile details are not displayed. The email address will only be used to send the user notifications about interactions, but wont be visibly displayed. The listing of an account in the node\'s user directory or the global user directory is optional and can be controlled in the user settings, it is not necessary for communication.'); $this->privacy_distribute = DI::l10n()->t('This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts.'); $this->privacy_delete = DI::l10n()->t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseUrl()); @@ -58,7 +60,7 @@ class Tos extends BaseModule * dealings with their own node so a TOS is not necessary. * **/ - public static function init(array $parameters = []) + public static function init() { if (strlen(DI::config()->get('system','singleuser'))) { DI::baseUrl()->redirect('profile/' . DI::config()->get('system','singleuser')); @@ -77,7 +79,7 @@ class Tos extends BaseModule * @return string * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function content(array $parameters = []) { + public static function content() { $tpl = Renderer::getMarkupTemplate('tos.tpl'); if (DI::config()->get('system', 'tosdisplay')) { return Renderer::replaceMacros($tpl, [ @@ -90,7 +92,7 @@ class Tos extends BaseModule '$privacy_delete' => DI::l10n()->t('At any point in time a logged in user can export their account data from the account settings. If the user wants to delete their account they can do so at %1$s/removeme. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners.', DI::baseUrl()) ]); } else { - return; + return ''; } } } diff --git a/src/Module/Update/Community.php b/src/Module/Update/Community.php index 78d6f0bd3..84d2b3a9f 100644 --- a/src/Module/Update/Community.php +++ b/src/Module/Update/Community.php @@ -33,9 +33,9 @@ use Friendica\Module\Conversation\Community as CommunityModule; */ class Community extends CommunityModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { - self::parseRequest($parameters); + self::parseRequest(); $o = ''; if (!empty($_GET['force']) || !DI::pConfig()->get(local_user(), 'system', 'no_auto_update')) { diff --git a/src/Module/Update/Network.php b/src/Module/Update/Network.php index df37c82a8..c6e5225d6 100644 --- a/src/Module/Update/Network.php +++ b/src/Module/Update/Network.php @@ -9,13 +9,13 @@ use Friendica\Module\Conversation\Network as NetworkModule; class Network extends NetworkModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { if (!isset($_GET['p']) || !isset($_GET['item'])) { exit(); } - self::parseRequest($parameters, $_GET); + self::parseRequest($_GET); $profile_uid = intval($_GET['p']); diff --git a/src/Module/Update/Profile.php b/src/Module/Update/Profile.php index cc738f501..2e9f676f8 100644 --- a/src/Module/Update/Profile.php +++ b/src/Module/Update/Profile.php @@ -35,7 +35,7 @@ use Friendica\Util\DateTimeFormat; class Profile extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $a = DI::app(); diff --git a/src/Module/Welcome.php b/src/Module/Welcome.php index 1c8209b59..c14df0160 100644 --- a/src/Module/Welcome.php +++ b/src/Module/Welcome.php @@ -30,7 +30,7 @@ use Friendica\DI; */ class Welcome extends BaseModule { - public static function content(array $parameters = []) + public static function content() { $config = DI::config(); diff --git a/src/Module/WellKnown/HostMeta.php b/src/Module/WellKnown/HostMeta.php index 219eb3609..14a3a17fe 100644 --- a/src/Module/WellKnown/HostMeta.php +++ b/src/Module/WellKnown/HostMeta.php @@ -33,7 +33,7 @@ use Friendica\Util\Crypto; */ class HostMeta extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $config = DI::config(); diff --git a/src/Module/WellKnown/NodeInfo.php b/src/Module/WellKnown/NodeInfo.php index a8d076892..f1d8164cb 100644 --- a/src/Module/WellKnown/NodeInfo.php +++ b/src/Module/WellKnown/NodeInfo.php @@ -30,7 +30,7 @@ use Friendica\DI; */ class NodeInfo extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { self::printWellKnown(); } diff --git a/src/Module/WellKnown/SecurityTxt.php b/src/Module/WellKnown/SecurityTxt.php index c0cdc4e51..317db50fe 100644 --- a/src/Module/WellKnown/SecurityTxt.php +++ b/src/Module/WellKnown/SecurityTxt.php @@ -29,7 +29,7 @@ use Friendica\BaseModule; */ class SecurityTxt extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $name = 'security.txt'; $fp = fopen($name, 'rt'); diff --git a/src/Module/WellKnown/XSocialRelay.php b/src/Module/WellKnown/XSocialRelay.php index 96968680d..a66feac03 100644 --- a/src/Module/WellKnown/XSocialRelay.php +++ b/src/Module/WellKnown/XSocialRelay.php @@ -32,7 +32,7 @@ use Friendica\Protocol\Relay; */ class XSocialRelay extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { $config = DI::config(); diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php index 66404f456..459059a55 100644 --- a/src/Module/Xrd.php +++ b/src/Module/Xrd.php @@ -36,7 +36,7 @@ use Friendica\Protocol\Salmon; */ class Xrd extends BaseModule { - public static function rawContent(array $parameters = []) + public static function rawContent() { // @TODO: Replace with parameter from router if (DI::args()->getArgv()[0] == 'xrd') {