jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6792 from MrPetovan/bug/warnings

Browse source 
Fix allow_cid variable type in mod/network
This commit is contained in:
Philipp 2019-03-02 15:51:19 +01:00 committed by GitHub
commit df04bd9dbe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
mod/network.php
View file

@ -539,20 +539,28 @@ function networkThreadedView(App $a, $update, $parent)
$order = Strings::escapeTags(defaults($_GET, 'order', 'comment')); $order = Strings::escapeTags(defaults($_GET, 'order', 'comment'));
$nets = defaults($_GET, 'nets' , ''); $nets = defaults($_GET, 'nets' , '');
$allowedCids = [];
if ($cid) { if ($cid) {
$default_permissions['allow_cid'] = [(int) $cid]; $allowedCids[] = (int) $cid;
} elseif ($nets) {
$condition = [
'uid' => local_user(),
'network' => $nets,
'self' => false,
'blocked' => false,
'pending' => false,
'archive' => false,
'rel' => [Contact::SHARING, Contact::FRIEND],
];
$contactStmt = DBA::select('contact', ['id'], $condition);
while ($contact = DBA::fetch($contactStmt)) {
$allowedCids[] = (int) $contact['id'];
}
DBA::close($contactStmt);
} }
if ($nets) { if (count($allowedCids)) {
$r = DBA::select('contact', ['id'], ['uid' => local_user(), 'network' => $nets], ['self' => false]); $default_permissions['allow_cid'] = $allowedCids;
$str = [];
while ($rr = DBA::fetch($r)) {
$str[] = (int) $rr['id'];
}
if (strlen($str)) {
$default_permissions['allow_cid'] = $str;
}
} }
if (!$update && !$rawmode) { if (!$update && !$rawmode) {