Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 07:42:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8320 from annando/hidewall

Browse source 
Replace "hidewall" with "net-publish" / other "hidewall" stuff
This commit is contained in:
Hypolite Petovan 2020-02-20 12:29:00 -05:00 committed by GitHub
commit c3f1da23a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/msearch.php
View file

@ -45,7 +45,7 @@ function msearch_post(App $a)
"SELECT COUNT(*) AS `total`
FROM `profile`
JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `user`.`hidewall` = 0
WHERE `profile`.`net-publish`
AND MATCH(`pub_keywords`) AGAINST (?)",
$search
);
@ -60,7 +60,7 @@ function msearch_post(App $a)
"SELECT `pub_keywords`, `username`, `nickname`, `user`.`uid`
FROM `user`
JOIN `profile` ON `user`.`uid` = `profile`.`uid`
WHERE `user`.`hidewall` = 0
WHERE `profile`.`net-publish`
AND MATCH(`pub_keywords`) AGAINST (?)
LIMIT ?, ?",
$search,

14
mod/poco.php
View file

@ -80,16 +80,14 @@ function poco_init(App $a) {
$cid = intval($a->argv[4]);
}
if (! $system_mode && ! $global) {
$users = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
where `user`.`nickname` = '%s' limit 1",
DBA::escape($nickname)
);
if (! DBA::isResult($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
if (!$system_mode && !$global) {
$user = DBA::fetchFirst("SELECT `user`.`uid`, `user`.`nickname` FROM `user`
INNER JOIN `profile` ON `user`.`uid` = `profile`.`uid`
WHERE `user`.`nickname` = ? AND NOT `profile`.`hide-friends`",
$nickname);
if (!DBA::isResult($user)) {
throw new \Friendica\Network\HTTPException\NotFoundException();
}
$user = $users[0];
}
if ($justme) {

2
src/Model/Contact.php
View file

@ -704,7 +704,7 @@ class Contact
return;
}
$fields = ['nickname', 'page-flags', 'account-type', 'hidewall'];
$fields = ['nickname', 'page-flags', 'account-type'];
$user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
if (!DBA::isResult($user)) {
return;