aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-06-16 05:28:49 -0700
committerfriendica <info@friendica.com>2013-06-16 05:28:49 -0700
commitc4c80a2e472173dfed9b982c6705ccfbb6e6cdab (patch)
tree79446bf5004d13a8baa33ebe8ae44f834b5ebf5b
parent2971ee9a4c91aaeb558ddd6127d5baf4c74fefba (diff)
downloadvolse-hubzilla-c4c80a2e472173dfed9b982c6705ccfbb6e6cdab.tar.gz
volse-hubzilla-c4c80a2e472173dfed9b982c6705ccfbb6e6cdab.tar.bz2
volse-hubzilla-c4c80a2e472173dfed9b982c6705ccfbb6e6cdab.zip
directory search by hub
-rw-r--r--mod/dirsearch.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index c7fa8a9d8..5465e11ff 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -23,6 +23,7 @@ function dirsearch_content(&$a) {
}
$name = ((x($_REQUEST,'name')) ? $_REQUEST['name'] : '');
+ $hub = ((x($_REQUEST,'hub')) ? $_REQUEST['hub'] : '');
$address = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : '');
$locale = ((x($_REQUEST,'locale')) ? $_REQUEST['locale'] : '');
$region = ((x($_REQUEST,'region')) ? $_REQUEST['region'] : '');
@@ -38,6 +39,8 @@ function dirsearch_content(&$a) {
if($name)
$sql_extra .= " OR xchan_name like '" . protect_sprintf( '%' . dbesc($name) . '%' ) . "' ";
+ if($hub)
+ $sql_extra .= " OR xchan_hash in (select hubloc_hash from hubloc where hubloc_host = '" . protect_sprintf(dbesc($hub)) . "') ";
if($address)
$sql_extra .= " OR xchan_addr like '" . protect_sprintf( '%' . dbesc($address) . '%' ) . "' ";
if($city)
@@ -96,7 +99,6 @@ function dirsearch_content(&$a) {
$order = " ORDER BY `xchan_name` ASC ";
-
$r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where $logic $sql_extra and not ( xchan_flags & %d ) $order $qlimit ",
intval(XCHAN_FLAGS_HIDDEN)
);