X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=a6a4b613fcb5b87a3cff55dce47f24e2f5ddc516;hb=9e746b504fd0f1367cce6353ac51f71327d8fb75;hp=d05b3d4e28681f1f501c0ff3f51f3d0605db033f;hpb=45149271285ea3515c3c1a7ea189609969c76748;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index d05b3d4e28..a6a4b613fc 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -1,13 +1,25 @@
 <?php
 
 
+function search_post(&$a) {
+	if(x($_POST,'search'))
+		$a->data['search'] = $_POST['search'];
+}
+
+
 function search_content(&$a) {
 
+	if(x($_SESSION,'theme'))
+		unset($_SESSION['theme']);
+
 	$o = '<div id="live-search"></div>' . "\r\n";
 
 	$o .= '<h3>' . t('Search') . '</h3>';
 
-	$search = ((x($_GET,'search')) ? $_GET['search'] : '');
+	if(x($a->data,'search'))
+		$search = notags(trim($a->data['search']));
+	else
+		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
 	$o .= search($search);
 
@@ -27,10 +39,11 @@ function search_content(&$a) {
 	$r = q("SELECT COUNT(*) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND `wall` = 1
+		AND ( `wall` = 1 OR `contact`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )
 		$sql_extra ",
+		intval(local_user()),
 		dbesc($search)
 	);
 
@@ -50,11 +63,12 @@ function search_content(&$a) {
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` 
 		WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
-		AND `wall` = 1
+		AND ( `wall` = 1 OR `contact`.`uid` = %d )
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
 		AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )
 		$sql_extra
 		ORDER BY `parent` DESC ",
+		intval(local_user()),
 		dbesc($search)
 	);
 
@@ -67,6 +81,7 @@ function search_content(&$a) {
 
 		foreach($r as $item) {
 
+			$total       = 0;
 			$comment     = '';
 			$owner_url   = '';
 			$owner_photo = '';
@@ -77,6 +92,8 @@ function search_content(&$a) {
 				&& ($item['id'] != $item['parent']))
 				continue;
 
+			$total ++;
+
 			$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
 			$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
 			$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
@@ -92,18 +109,20 @@ function search_content(&$a) {
 			}
 
 			$drop = replace_macros($droptpl,array('$id' => $item['id']));
+			$lock = '<div class="wall-item-lock"></div>';
 
 			$o .= replace_macros($tpl,array(
 				'$id' => $item['item_id'],
 				'$profile_url' => $profile_link,
 				'$name' => $profile_name,
 				'$sparkle' => $sparkle,
+				'$lock' => $lock,
 				'$thumb' => $profile_avatar,
 				'$title' => $item['title'],
 				'$body' => bbcode($item['body']),
 				'$ago' => relative_date($item['created']),
 				'$location' => $location,
-				'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
+				'$indent' => '',
 				'$owner_url' => $owner_url,
 				'$owner_photo' => $owner_photo,
 				'$owner_name' => $owner_name,
@@ -113,6 +132,16 @@ function search_content(&$a) {
 
 		}
 	}
+
+
+	if(! $r[0]['total']) {
+		notice('No results.');
+		return $o;
+	}
+
+
+	$o .= paginate($a);
+
 	return $o;
 }