From dfd5cc57c2134067dc6229b8583b5e808f160004 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 3 Oct 2011 14:47:18 -0700 Subject: [PATCH] tagmatch available to anon, add paging variable to query --- boot.php | 2 +- mod/tagmatch.php | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/boot.php b/boot.php index 4712318209..7706671772 100644 --- a/boot.php +++ b/boot.php @@ -8,7 +8,7 @@ require_once("include/pgettext.php"); require_once('include/nav.php'); define ( 'FRIENDIKA_PLATFORM', 'Free Friendika'); -define ( 'FRIENDIKA_VERSION', '2.3.1122' ); +define ( 'FRIENDIKA_VERSION', '2.3.1123' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1094 ); diff --git a/mod/tagmatch.php b/mod/tagmatch.php index b2313694b0..8023fa433b 100644 --- a/mod/tagmatch.php +++ b/mod/tagmatch.php @@ -3,24 +3,22 @@ function tagmatch_content(&$a) { - $search = $_REQUEST['search']; + $search = notags(trim($_REQUEST['search'])); $o = ''; - if(! local_user()) - return; - - $o .= '

' . t('Tag Match') . ' - ' . notags($search) . '

'; + $o .= '

' . t('Tag Match') . ' - ' . $search . '

'; if($search) { - $params['s'] = $search; - if($a->pager['page'] != 1) - $params['p'] = $a->pager['page']; + + $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); if(strlen(get_config('system','directory_submit_url'))) - $x = fetch_url('http://dir.friendika.com/lsearch?f=&search=' . urlencode($search)); + $x = fetch_url('http://dir.friendika.com/lsearch?f=' . $p . '&search=' . urlencode($search)); + +//TODO fallback local search if global dir not available. // else -// $x = post_url($a->get_baseurl() . '/msearch', $params); +// $x = post_url($a->get_baseurl() . '/lsearch', $params); $j = json_decode($x);