aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-06-01 08:19:52 +0200
committerGitHub <noreply@github.com>2017-06-01 08:19:52 +0200
commit56f3b121712edcfa9a33178dccd89fadd0549642 (patch)
tree54afefd21ae000757b5c90abeb67a5a7034f42f3
parent927313968aa2bd60464ef754c64ccaa746a8fed3 (diff)
parenta7ecf519156c1110acbb0eadd13dee63b7adaabd (diff)
downloadvolse-hubzilla-56f3b121712edcfa9a33178dccd89fadd0549642.tar.gz
volse-hubzilla-56f3b121712edcfa9a33178dccd89fadd0549642.tar.bz2
volse-hubzilla-56f3b121712edcfa9a33178dccd89fadd0549642.zip
Merge pull request #802 from zotlabs/searchwebpages
provide ability to search webpages (either public or which contain th…
-rw-r--r--Zotlabs/Module/Search.php4
-rwxr-xr-xinclude/items.php7
-rw-r--r--include/security.php1
3 files changed, 9 insertions, 3 deletions
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index aacdc88e7..a78a023ff 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -15,7 +15,7 @@ class Search extends \Zotlabs\Web\Controller {
if((get_config('system','block_public')) || (get_config('system','block_public_search'))) {
if ((! local_channel()) && (! remote_channel())) {
notice( t('Public access denied.') . EOL);
- return;
+ return;
}
}
@@ -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);
require_once('include/channel.php');
diff --git a/include/items.php b/include/items.php
index 328079b9d..f7fddad33 100755
--- a/include/items.php
+++ b/include/items.php
@@ -175,6 +175,13 @@ function item_normal() {
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
*
diff --git a/include/security.php b/include/security.php
index ddbb3d806..6e7b3dbb2 100644
--- a/include/security.php
+++ b/include/security.php
@@ -467,7 +467,6 @@ function scopes_sql($uid,$observer) {
*/
function public_permissions_sql($observer_hash) {
- //$observer = App::get_observer();
$groups = init_groups_visitor($observer_hash);
$gs = '<<>>'; // should be impossible to match