X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fsearch.php;h=9c82b38e818396c724037dc2f70d38b1bfcf0447;hb=bca1dcf2d6e243ca803e590168305ed5a232d923;hp=db7279fb5609987846fdf34656cf8328deeb15cf;hpb=a0d2747d527221fc517e5d277035d6e5b07ebf93;p=friendica.git
diff --git a/mod/search.php b/mod/search.php
index db7279fb56..9c82b38e81 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -9,6 +9,15 @@ function search_post(&$a) {
function search_content(&$a) {
+ if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ notice( t('Public access denied.') . EOL);
+ return;
+ }
+
+ require_once("include/bbcode.php");
+ require_once('include/security.php');
+ require_once('include/conversation.php');
+
if(x($_SESSION,'theme'))
unset($_SESSION['theme']);
@@ -26,8 +35,6 @@ function search_content(&$a) {
if(! $search)
return $o;
- require_once("include/bbcode.php");
- require_once('include/security.php');
$sql_extra = "
AND `item`.`allow_cid` = ''
@@ -36,12 +43,20 @@ function search_content(&$a) {
AND `item`.`deny_gid` = ''
";
+ $s_bool = "AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )";
+ $s_regx = "AND `item`.`body` REGEXP '%s' ";
+
+ if(mb_strlen($search) >= 3)
+ $search_alg = $s_bool;
+ else
+ $search_alg = $s_regx;
+
$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 OR `contact`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )
+ $search_alg
$sql_extra ",
intval(local_user()),
dbesc($search)
@@ -51,13 +66,13 @@ function search_content(&$a) {
$a->set_pager_total($r[0]['total']);
if(! $r[0]['total']) {
- notice( t('No results.') . EOL);
+ info( t('No results.') . EOL);
return $o;
}
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
- `contact`.`network`, `contact`.`thumb`, `contact`.`self`,
+ `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
`user`.`nickname`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@@ -65,74 +80,16 @@ function search_content(&$a) {
WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0
AND ( `wall` = 1 OR `contact`.`uid` = %d )
AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )
+ $search_alg
$sql_extra
ORDER BY `parent` DESC ",
intval(local_user()),
dbesc($search)
);
- $tpl = load_view_file('view/search_item.tpl');
- $droptpl = load_view_file('view/wall_fake_drop.tpl');
-
- $return_url = $_SESSION['return_url'] = $a->cmd;
-
- if(count($r)) {
-
- foreach($r as $item) {
-
- $total = 0;
- $comment = '';
- $owner_url = '';
- $owner_photo = '';
- $owner_name = '';
- $sparkle = '';
-
- if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE)))
- && ($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']);
-
-
- $location = (($item['location']) ? '' . $item['location'] . '' : '');
- $coord = (($item['coord']) ? '' . $item['coord'] . '' : '');
- if($coord) {
- if($location)
- $location .= '
(' . $coord . ')';
- else
- $location = '' . $coord . '';
- }
-
- $drop = replace_macros($droptpl,array('$id' => $item['id']));
- $lock = '