aboutsummaryrefslogtreecommitdiffstats
path: root/mod/directory.php
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2014-03-09 04:15:11 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2014-03-09 04:15:11 +0100
commit76ab9403af3b562531a7eb0831e5a7ecc9aedb38 (patch)
treec4d74f0cc8aac0fcd5a52520170a64c8d4b01395 /mod/directory.php
parente8e980c8175be6dae7d642d9707493c465b7137b (diff)
parent80e381176e1e301782bc56cbb7c6037825eddf2d (diff)
downloadvolse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.tar.gz
volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.tar.bz2
volse-hubzilla-76ab9403af3b562531a7eb0831e5a7ecc9aedb38.zip
merge
Diffstat (limited to 'mod/directory.php')
-rw-r--r--mod/directory.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/directory.php b/mod/directory.php
index 8fc62e95b..6e0e2e7dc 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -42,12 +42,13 @@ function directory_content(&$a) {
else
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+ $advanced = ((x($_REQUEST,'query')) ? notags(trim($_REQUEST['query'])) : '');
+
$keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');
$tpl = get_markup_template('directory_header.tpl');
-
$dirmode = intval(get_config('system','directory_mode'));
if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
@@ -81,6 +82,7 @@ function directory_content(&$a) {
if($url) {
// We might want to make the tagadelic count (&kw=) configurable or turn it off completely.
+
$numtags = get_config('system','directorytags');
$kw = ((intval($numtags)) ? $numtags : 24);
@@ -92,7 +94,9 @@ function directory_content(&$a) {
$query .= '&address=' . urlencode($search);
if($keywords)
$query .= '&keywords=' . urlencode($keywords);
-
+ if($advanced)
+ $query .= '&query=' . urlencode($advanced);
+
$sort_order = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : '');
if($sort_order)
$query .= '&order=' . urlencode($sort_order);