clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove Widget::accounts in favor of Widget::accounttypes

This commit is contained in:
Hypolite Petovan 2020-10-13 22:30:40 -04:00
parent 44ae9add4f
commit 5abe069cba
4 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Content/Widget.php
View File

@ -542,26 +542,4 @@ class Widget
return self::filter('accounttype', DI::l10n()->t('Account Types'), '', return self::filter('accounttype', DI::l10n()->t('Account Types'), '',
DI::l10n()->t('All'), $base, $accounts, $accounttype); DI::l10n()->t('All'), $base, $accounts, $accounttype);
} }
/**
* Display the accounts sidebar
* The account type is added to the path
*
* @param string $base Basepath
* @param string $accounttype Acount type (person, organisation, news, community)
* @return string
*/
public static function accounts(string $base, string $accounttype)
{
return Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/accounts.tpl'), [
'$title' => DI::l10n()->t('Account Types'),
'$content' => $base,
'$accounttype' => ($accounttype ?? ''),
'$all' => DI::l10n()->t('All'),
'$person' => DI::l10n()->t('Persons'),
'$organisation' => DI::l10n()->t('Organisations'),
'$news' => DI::l10n()->t('News'),
'$community' => DI::l10n()->t('Forums'),
]);
}
} }

16
src/Module/Conversation/Community.php
View File

@ -42,7 +42,8 @@ class Community extends BaseModule
{ {
protected static $page_style; protected static $page_style;
protected static $content; protected static $content;
protected static $accounttype; protected static $accountTypeString;
protected static $accountType;
protected static $itemsPerPage; protected static $itemsPerPage;
protected static $min_id; protected static $min_id;
protected static $max_id; protected static $max_id;
@ -89,7 +90,7 @@ class Community extends BaseModule
Nav::setSelected('community'); Nav::setSelected('community');
DI::page()['aside'] .= Widget::accounts('community/' . self::$content, $parameters['accounttype'] ?? ''); DI::page()['aside'] .= Widget::accounttypes('community/' . self::$content, self::$accountTypeString);
if (local_user() && DI::config()->get('system', 'community_no_sharer')) { if (local_user() && DI::config()->get('system', 'community_no_sharer')) {
$path = self::$content; $path = self::$content;
@ -192,7 +193,8 @@ class Community extends BaseModule
throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.')); throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
} }
self::$accounttype = User::getAccountTypeByString($parameters['accounttype'] ?? ''); self::$accountTypeString = $_GET['accounttype'] ?? $parameters['accounttype'] ?? '';
self::$accountType = User::getAccountTypeByString(self::$accountTypeString);
self::$content = $parameters['content'] ?? ''; self::$content = $parameters['content'] ?? '';
if (!self::$content) { if (!self::$content) {
@ -311,14 +313,14 @@ class Community extends BaseModule
private static function selectItems($min_id, $max_id, $item_id, $itemspage) private static function selectItems($min_id, $max_id, $item_id, $itemspage)
{ {
if (self::$content == 'local') { if (self::$content == 'local') {
if (!is_null(self::$accounttype)) { if (!is_null(self::$accountType)) {
$condition = ["`wall` AND `origin` AND `private` = ? AND `owner`.`contact-type` = ?", Item::PUBLIC, self::$accounttype]; $condition = ["`wall` AND `origin` AND `private` = ? AND `owner`.`contact-type` = ?", Item::PUBLIC, self::$accountType];
} else { } else {
$condition = ["`wall` AND `origin` AND `private` = ?", Item::PUBLIC]; $condition = ["`wall` AND `origin` AND `private` = ?", Item::PUBLIC];
} }
} elseif (self::$content == 'global') { } elseif (self::$content == 'global') {
if (!is_null(self::$accounttype)) { if (!is_null(self::$accountType)) {
$condition = ["`uid` = ? AND `private` = ? AND `owner`.`contact-type` = ?", 0, Item::PUBLIC, self::$accounttype]; $condition = ["`uid` = ? AND `private` = ? AND `owner`.`contact-type` = ?", 0, Item::PUBLIC, self::$accountType];
} else { } else {
$condition = ["`uid` = ? AND `private` = ?", 0, Item::PUBLIC]; $condition = ["`uid` = ? AND `private` = ?", 0, Item::PUBLIC];
} }

9
src/Module/Conversation/Network.php
View File

@ -34,6 +34,8 @@ class Network extends BaseModule
private static $min_id; private static $min_id;
/** @var mixed */ /** @var mixed */
private static $max_id; private static $max_id;
/** @var string */
private static $accountTypeString;
/** @var int */ /** @var int */
private static $accountType; private static $accountType;
/** @var string */ /** @var string */
@ -61,7 +63,7 @@ class Network extends BaseModule
$module = 'network'; $module = 'network';
DI::page()['aside'] .= Widget::accounts($module . '/accounttype', self::$accountType); DI::page()['aside'] .= Widget::accounttypes($module, self::$accountTypeString);
DI::page()['aside'] .= Group::sidebarWidget($module, $module . '/group', 'standard', self::$groupId); DI::page()['aside'] .= Group::sidebarWidget($module, $module . '/group', 'standard', self::$groupId);
DI::page()['aside'] .= ForumManager::widget($module . '/forum', local_user(), self::$forumContactId); DI::page()['aside'] .= ForumManager::widget($module . '/forum', local_user(), self::$forumContactId);
DI::page()['aside'] .= Widget::postedByYear($module . '/archive', local_user(), false); DI::page()['aside'] .= Widget::postedByYear($module . '/archive', local_user(), false);
@ -300,7 +302,8 @@ class Network extends BaseModule
self::$mention = intval($_GET['mention'] ?? 0); self::$mention = intval($_GET['mention'] ?? 0);
self::$order = in_array(self::$selectedTab, ['received', 'commented', 'created', 'uriid']) ? self::$selectedTab : 'commented'; self::$order = in_array(self::$selectedTab, ['received', 'commented', 'created', 'uriid']) ? self::$selectedTab : 'commented';
self::$accountType = User::getAccountTypeByString($parameters['accounttype'] ?? '') ?? ''; self::$accountTypeString = $_GET['accounttype'] ?? $parameters['accounttype'] ?? '';
self::$accountType = User::getAccountTypeByString(self::$accountTypeString);
self::$network = $get['nets'] ?? ''; self::$network = $get['nets'] ?? '';
@ -339,7 +342,7 @@ class Network extends BaseModule
$conditionFields['uid'] = local_user(); $conditionFields['uid'] = local_user();
$conditionStrings = []; $conditionStrings = [];
if (self::$accountType) { if (!is_null(self::$accountType)) {
$conditionFields['contact-type'] = self::$accountType; $conditionFields['contact-type'] = self::$accountType;
} }

5
static/routes.config.php
View File

@ -117,7 +117,7 @@ return [
'/debug/ap' => [Module\Debug\ActivityPubConversion::class, [R::GET, R::POST]], '/debug/ap' => [Module\Debug\ActivityPubConversion::class, [R::GET, R::POST]],
'/bookmarklet' => [Module\Bookmarklet::class, [R::GET]], '/bookmarklet' => [Module\Bookmarklet::class, [R::GET]],
'/community[/{content}[/{accounttype}]]' => [Module\Conversation\Community::class, [R::GET]], '/community[/{content}]' => [Module\Conversation\Community::class, [R::GET]],
'/compose[/{type}]' => [Module\Item\Compose::class, [R::GET, R::POST]], '/compose[/{type}]' => [Module\Item\Compose::class, [R::GET, R::POST]],
@ -304,7 +304,6 @@ return [
'/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Conversation\Network::class, [R::GET]], '/archive/{from:\d\d\d\d-\d\d-\d\d}[/{to:\d\d\d\d-\d\d-\d\d}]' => [Module\Conversation\Network::class, [R::GET]],
'/forum/{contact_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], '/forum/{contact_id:\d+}' => [Module\Conversation\Network::class, [R::GET]],
'/group/{group_id:\d+}' => [Module\Conversation\Network::class, [R::GET]], '/group/{group_id:\d+}' => [Module\Conversation\Network::class, [R::GET]],
'/accounttype/{accounttype}' => [Module\Conversation\Network::class, [R::GET]],
], ],
'/randprof' => [Module\RandomProfile::class, [R::GET]], '/randprof' => [Module\RandomProfile::class, [R::GET]],
@ -318,7 +317,7 @@ return [
'/toggle_mobile' => [Module\ToggleMobile::class, [R::GET]], '/toggle_mobile' => [Module\ToggleMobile::class, [R::GET]],
'/tos' => [Module\Tos::class, [R::GET]], '/tos' => [Module\Tos::class, [R::GET]],
'/update_community[/{content}[/{accounttype}]]' => [Module\Update\Community::class, [R::GET]], '/update_community[/{content}]' => [Module\Update\Community::class, [R::GET]],
'/update_network' => [Module\Update\Network::class, [R::GET]], '/update_network' => [Module\Update\Network::class, [R::GET]],
'/update_profile' => [Module\Update\Profile::class, [R::GET]], '/update_profile' => [Module\Update\Profile::class, [R::GET]],