friendica/friendica
6
2
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-09-04 20:09:55 +02:00
Code Issues Projects Releases 3 Packages Wiki Activity

Merge pull request #7381 from MrPetovan/task/7309-frio-compose

Browse source 
[frio] New Compose page
This commit is contained in:
Michael Vogel 2019-08-01 08:15:02 +02:00 • committed by GitHub
commit e8459cce34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 1730 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

26
mod/lockview.php
View file

@ -6,6 +6,7 @@ use Friendica\App;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Database\DBA;
use Friendica\Model\Group;
use Friendica\Model\Item;
function lockview_content(App $a)
@ -67,6 +68,19 @@ function lockview_content(App $a)
$l = [];
if (count($allowed_groups)) {
$key = array_search(Group::FOLLOWERS, $allowed_groups);
if ($key !== false) {
$l[] = '<b>' . L10n::t('Followers') . '</b>';
unset($allowed_groups[$key]);
}
$key = array_search(Group::MUTUALS, $allowed_groups);
if ($key !== false) {
$l[] = '<b>' . L10n::t('Mutuals') . '</b>';
unset($allowed_groups[$key]);
}
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
DBA::escape(implode(', ', $allowed_groups))
);
@ -89,6 +103,18 @@ function lockview_content(App $a)
}
if (count($deny_groups)) {
$key = array_search(Group::FOLLOWERS, $deny_groups);
if ($key !== false) {
$l[] = '<b><strike>' . L10n::t('Followers') . '</strike></b>';
unset($deny_groups[$key]);
}
$key = array_search(Group::MUTUALS, $deny_groups);
if ($key !== false) {
$l[] = '<b><strike>' . L10n::t('Mutuals') . '</strike></b>';
unset($deny_groups[$key]);
}
$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
DBA::escape(implode(', ', $deny_groups))
);

2
mod/network.php
View file

@ -643,7 +643,7 @@ function networkThreadedView(App $a, $update, $parent)
// NOTREACHED
}
$contacts = Group::expand([$gid]);
$contacts = Group::expand(local_user(), [$gid]);
if ((is_array($contacts)) && count($contacts)) {
$contact_str_self = '';