diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/network.php | 10 | ||||
| -rw-r--r-- | mod/search.php | 17 | ||||
| -rw-r--r-- | mod/tagger.php | 195 |
3 files changed, 211 insertions, 11 deletions
diff --git a/mod/network.php b/mod/network.php index 04c2a1782..491603f35 100644 --- a/mod/network.php +++ b/mod/network.php @@ -333,10 +333,14 @@ function network_content(&$a, $update = 0) { $sql_extra2 = (($nouveau) ? '' : " AND `item`.`parent` = `item`.`id` "); - if(x($_GET,'search')) - $sql_extra .= " AND `item`.`body` REGEXP '" . dbesc(escape_tags($_GET['search'])) . "' "; + if(x($_GET,'search')) { + $search = escape_tags($_GET['search']); + $sql_extra .= sprintf(" AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' ) ", + dbesc($search), + dbesc('\\]' . $search . '\\[') + ); + } - $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 diff --git a/mod/search.php b/mod/search.php index 2a8bf1484..e2c365fd3 100644 --- a/mod/search.php +++ b/mod/search.php @@ -96,12 +96,15 @@ function search_content(&$a) { // Only public wall posts can be shown // OR your own posts if you are a logged in member - $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 +// $s_bool = sprintf("AND MATCH (`item`.`body`) AGAINST ( '%s' IN BOOLEAN MODE )", dbesc($search)); + $s_regx = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", + dbesc($search), dbesc('\\]' . $search . '\\[')); + +// if(mb_strlen($search) >= 3) +// $search_alg = $s_bool; +// else + $search_alg = $s_regx; $r = q("SELECT COUNT(*) AS `total` @@ -111,8 +114,7 @@ function search_content(&$a) { OR `item`.`uid` = %d ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $search_alg ", - intval(local_user()), - dbesc($search) + intval(local_user()) ); if(count($r)) @@ -137,7 +139,6 @@ function search_content(&$a) { $search_alg ORDER BY `received` DESC LIMIT %d , %d ", intval(local_user()), - dbesc($search), intval($a->pager['start']), intval($a->pager['itemspage']) diff --git a/mod/tagger.php b/mod/tagger.php new file mode 100644 index 000000000..dd4b8ffea --- /dev/null +++ b/mod/tagger.php @@ -0,0 +1,195 @@ +<?php + +require_once('include/security.php'); +require_once('include/bbcode.php'); +require_once('include/items.php'); + + +function tagger_content(&$a) { + + if(! local_user() && ! remote_user()) { + return; + } + + $term= notags(trim($_GET['term'])); + + if(! $term) + return; + + $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0); + + logger('tagger: tag ' . $term . ' item ' . $item_id); + + + $r = q("SELECT * FROM `item` WHERE `id` = '%s' LIMIT 1", + dbesc($item_id), + dbesc($item_id) + ); + + if(! $item_id || (! count($r))) { + logger('tagger: no item ' . $item_id); + return; + } + + $item = $r[0]; + + $owner_uid = $item['uid']; + + $r = q("select `nickname`,`blocktags` from user where uid = %d limit 1", + intval($owner_uid) + ); + if(count($r)) { + $owner_nick = $r[0]['nickname']; + $blocktags = $r[0]['blocktags']; + } + +// if(local_user() != $owner_uid) +// return; + + if(remote_user()) { + $r = q("select * from contact where id = %d AND `uid` = %d limit 1", + intval(remote_user()), + intval($item['uid']) + ); + } + else { + $r = q("select * from contact where self = 1 and uid = %d limit 1", + intval(local_user()) + ); + } + if(count($r)) + $contact = $r[0]; + else { + logger('tagger: no contact_id'); + return; + } + + $uri = item_new_uri($a->get_hostname(),$owner_uid); + + $post_type = (($item['resource-id']) ? t('photo') : t('status')); + $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); + + $link = xmlify('<link rel="alternate" type="text/html" href="' + . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ; + + $body = $item['body']; + + $target = <<< EOT + <target> + <type>$targettype</type> + <local>1</local> + <id>{$item['uri']}</id> + <link>$link</link> + <title></title> + <content>$body</content> + </target> +EOT; + + $tagid = $a->get_baseurl() . '/search?search=' . $term; + $objtype = ACTIVITY_OBJ_TAGTERM; + + $obj = <<< EOT + <object> + <type>$objtype</type> + <local>1</local> + <id>$tagid</id> + <link>$tagid</link> + <title>$term</title> + <content>$term</content> + </object> +EOT; + + $bodyverb = t('%1$s tagged %2$s\'s %3$s with %4$s'); + + if(! isset($bodyverb)) + return; + + $termlink = '#[url=' . $a->get_baseurl() . '/search?search=' . urlencode($term) . ']'. $term . '[/url]'; + + $arr = array(); + + $arr['uri'] = $uri; + $arr['uid'] = $owner_uid; + $arr['contact-id'] = $contact['id']; + $arr['type'] = 'activity'; + $arr['wall'] = $item['wall']; + $arr['gravity'] = GRAVITY_COMMENT; + $arr['parent'] = $item['id']; + $arr['parent-uri'] = $item['uri']; + $arr['owner-name'] = $item['author-name']; + $arr['owner-link'] = $item['author-link']; + $arr['owner-avatar'] = $item['author-avatar']; + $arr['author-name'] = $contact['name']; + $arr['author-link'] = $contact['url']; + $arr['author-avatar'] = $contact['thumb']; + + $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; + $alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]'; + $plink = '[url=' . $item['plink'] . ']' . $post_type . '[/url]'; + $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink, $termlink ); + + $arr['verb'] = ACTIVITY_TAG; + $arr['target-type'] = $targettype; + $arr['target'] = $target; + $arr['object-type'] = $objtype; + $arr['object'] = $obj; + $arr['allow_cid'] = $item['allow_cid']; + $arr['allow_gid'] = $item['allow_gid']; + $arr['deny_cid'] = $item['deny_cid']; + $arr['deny_gid'] = $item['deny_gid']; + $arr['visible'] = 1; + $arr['unseen'] = 1; + $arr['last-child'] = 1; + $arr['origin'] = 1; + + $post_id = item_store($arr); + + q("UPDATE `item` set plink = '%s' where id = %d limit 1", + dbesc($a->get_baseurl() . '/display/' . $owner_nick . '/' . $post_id), + intval($post_id) + ); + + + if(! $item['visible']) { + $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d LIMIT 1", + intval($item['id']), + intval($owner_uid) + ); + } + + if((! $blocktags) && (! stristr($item['tag'], ']' . $term . '[' ))) { + q("update item set tag = '%s' where id = %d limit 1", + dbesc($item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?search=' . $term . ']'. $term . '[/url]'), + intval($item['id']) + ); + } + + // if the original post is on this site, update it. + + $r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1", + dbesc($item['uri']) + ); + if(count($r)) { + $x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1", + intval($r[0]['uid']) + ); + if(count($x) && !$x[0]['blocktags'] && (! stristr($r[0]['tag'], ']' . $term . '['))) { + q("update item set tag = '%s' where id = %d limit 1", + dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . '#[url=' . $a->get_baseurl() . '/search?search=' . $term . ']'. $term . '[/url]'), + intval($r[0]['id']) + ); + } + + } + + + $arr['id'] = $post_id; + + call_hooks('post_local_end', $arr); + + proc_run('php',"include/notifier.php","tag","$post_id"); + + return; // NOTREACHED + + +}
\ No newline at end of file |