add sys channel (discover) posts to "anonymous" search. They will by default be public.

2 files changed, 18 insertions, 9 deletions

diff --git a/mod/display.php b/mod/display.php
index efc3265c8..8eb271b9c 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -150,6 +150,9 @@ function display_content(&$a, $update = 0, $load = false) {
 		if($load || ($_COOKIE['jsAvailable'] != 1)) {
 			$r = null;
 
+			require_once('include/identity.php');
+			$sys = get_sys_channel();
+
 			if(local_user()) {
 				$r = q("SELECT * from item
 					WHERE item_restrict = 0
@@ -169,12 +172,14 @@ function display_content(&$a, $update = 0, $load = false) {
 				$r = q("SELECT * from item
 					WHERE item_restrict = 0
 					and mid = '%s'
-					AND ((( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' 
+					AND (((( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' 
 					AND `item`.`deny_gid`  = '' AND item_private = 0 ) 
 					and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " ))
+					OR owner_xchan = '%s')
 					$sql_extra )
 					group by mid limit 1",
-					dbesc($target_item['parent_mid'])
+					dbesc($target_item['parent_mid']),
+					dbesc($sys['xchan_hash'])
 				);
 
 			}
diff --git a/mod/search.php b/mod/search.php
index 82990913b..16837a107 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -114,6 +114,10 @@ function search_content(&$a,$update = 0, $load = false) {
 
 	$pub_sql = public_permissions_sql(get_observer_hash());
 
+	require_once('include/identity.php');
+
+	$sys = get_sys_channel();
+
 	if(($update) && ($load)) {
 		$itemspage = get_pconfig(local_user(),'system','itemspage');
 		$a->set_pager_itemspage(((intval($itemspage)) ? $itemspage : 20));
@@ -125,24 +129,24 @@ function search_content(&$a,$update = 0, $load = false) {
 			if(local_user()) {
 				$r = q("SELECT distinct mid, item.id as item_id, item.* from item
 					WHERE item_restrict = 0
-					AND (( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND item_private = 0 ) 
-					OR ( `item`.`uid` = %d ))
+					AND ((( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' AND item_private = 0 ) 
+					OR ( `item`.`uid` = %d )) OR item.owner_xchan = '%s' )
 					$sql_extra
 					group by mid ORDER BY created DESC $pager_sql ",
 					intval(local_user()),
-					intval(ABOOK_FLAG_BLOCKED)
-
+					dbesc($sys['xchan_hash'])
 				);
 			}
 			if($r === null) {
                $r = q("SELECT distinct mid, item.id as item_id, item.* from item
                     WHERE item_restrict = 0
-                    AND ((( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = ''
+                    AND (((( `item`.`allow_cid` = ''  AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = ''
                     AND `item`.`deny_gid`  = '' AND item_private = 0 )
                     and owner_xchan in ( " . stream_perms_xchans(($observer) ? PERMS_NETWORK : PERMS_PUBLIC) . " ))
-					$pub_sql )
+					$pub_sql ) OR owner_xchan = '%s')
                     $sql_extra 
-                    group by mid ORDER BY created DESC $pager_sql"
+                    group by mid ORDER BY created DESC $pager_sql",
+					dbesc($sys['xchan_hash'])
                 );
 			}
 		}