harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide ability to search webpages (either public or which contain the observer in the acl) in addition to conversations

Browse Source
This commit is contained in:
zotlabs 2017-05-30 17:06:50 -07:00
parent 14229d0dd3
commit a7ecf51915
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Search.php
View File

@ -144,7 +144,7 @@ class Search extends \Zotlabs\Web\Controller {
} }
$item_normal = item_normal(); $item_normal = item_normal_search();
$pub_sql = public_permissions_sql($observer_hash); $pub_sql = public_permissions_sql($observer_hash);
require_once('include/channel.php'); require_once('include/channel.php');

7
include/items.php
View File

@ -175,6 +175,13 @@ function item_normal() {
and item.item_blocked = 0 "; and item.item_blocked = 0 ";
} }
function item_normal_search() {
return " and item.item_hidden = 0 and item.item_type in (0,3) and item.item_deleted = 0
and item.item_unpublished = 0 and item.item_delayed = 0 and item.item_pending_remove = 0
and item.item_blocked = 0 ";
}
/** /**
* @brief * @brief
* *

1
include/security.php
View File

@ -467,7 +467,6 @@ function scopes_sql($uid,$observer) {
*/ */
function public_permissions_sql($observer_hash) { function public_permissions_sql($observer_hash) {
//$observer = App::get_observer();
$groups = init_groups_visitor($observer_hash); $groups = init_groups_visitor($observer_hash);
$gs = '<<>>'; // should be impossible to match $gs = '<<>>'; // should be impossible to match