Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-23 19:10:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace $parameters argument per method with static::$parameters

Browse source
This commit is contained in:
Philipp 2021-11-14 20:46:25 +01:00
parent 018275919c
commit 714f0febc4
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
249 changed files with 710 additions and 775 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Module/Conversation/Community.php
View file

@ -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

16
src/Module/Conversation/Network.php
View file

@ -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',