harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve network search

Browse Source
This commit is contained in:
Mario Vavti 2018-09-29 18:00:14 +02:00
parent 8265dac9c0
commit 5906d6cce3
1 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Zotlabs/Module/Network.php
View File

@ -84,18 +84,7 @@ class Network extends \Zotlabs\Web\Controller {
$search = (($_GET['search']) ? $_GET['search'] : ''); $search = (($_GET['search']) ? $_GET['search'] : '');
if($search) { if($search) {
$_GET['netsearch'] = escape_tags($search); if(strpos($search,'#') === 0) {
if(strpos($search,'@') === 0) {
$r = q("select abook_id from abook left join xchan on abook_xchan = xchan_hash where xchan_name = '%s' and abook_channel = %d limit 1",
dbesc(substr($search,1)),
intval(local_channel())
);
if($r) {
$_GET['cid'] = $r[0]['abook_id'];
$search = $_GET['search'] = '';
}
}
elseif(strpos($search,'#') === 0) {
$hashtags = substr($search,1); $hashtags = substr($search,1);
$search = $_GET['search'] = ''; $search = $_GET['search'] = '';
} }
@ -143,7 +132,7 @@ class Network extends \Zotlabs\Web\Controller {
$deftag = ''; $deftag = '';
if(x($_GET,'search') || $file || (!$pf && $cid)) if(x($_GET,'search') || $file || (!$pf && $cid) || $hashtags || $verb || $category)
$nouveau = true; $nouveau = true;
if($cid) { if($cid) {
@ -169,9 +158,9 @@ class Network extends \Zotlabs\Web\Controller {
if(! $update) { if(! $update) {
// search terms header // search terms header
if($search) { if($search || $hashtags) {
$o .= replace_macros(get_markup_template("section_title.tpl"),array( $o .= replace_macros(get_markup_template("section_title.tpl"),array(
'$title' => t('Search Results For:') . ' ' . htmlspecialchars($search, ENT_COMPAT,'UTF-8') '$title' => t('Search Results For:') . ' ' . (($search) ? htmlspecialchars($search, ENT_COMPAT,'UTF-8') : '#' . htmlspecialchars($hashtags, ENT_COMPAT,'UTF-8'))
)); ));
} }