Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 22:35:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

some issues with saved search - tags and connection searches weren't being saved.

Browse source
This commit is contained in:
redmatrix 2016-08-31 21:57:08 -07:00
parent 8ba1bf02a4
commit fa8febbb31
5 changed files with 45 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Zotlabs/Module/Network.php
View file

@ -61,6 +61,7 @@ class Network extends \Zotlabs\Web\Controller {
$search = (($_GET['search']) ? $_GET['search'] : '');
if($search) {
$_GET['netsearch'] = escape_tags($search);
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)),

2
include/text.php
View file

@ -936,7 +936,7 @@ function searchbox($s,$id='search-box',$url='/search',$save = false) {
'$action_url' => z_root() . '/' . $url,
'$search_label' => t('Search'),
'$save_label' => t('Save'),
'$savedsearch' => feature_enabled(local_channel(),'savedsearch')
'$savedsearch' => ($save && feature_enabled(local_channel(),'savedsearch'))
));
}

38
include/widgets.php
View file

@ -209,7 +209,9 @@ function widget_savedsearch($arr) {
if((! local_channel()) || (! feature_enabled(local_channel(),'savedsearch')))
return '';
$search = ((x($_GET,'search')) ? $_GET['search'] : '');
$search = ((x($_GET,'netsearch')) ? $_GET['netsearch'] : '');
if(! $search)
$search = ((x($_GET,'search')) ? $_GET['search'] : '');
if(x($_GET,'searchsave') && $search) {
$r = q("select * from `term` where `uid` = %d and `ttype` = %d and `term` = '%s' limit 1",
@ -287,6 +289,40 @@ function widget_savedsearch($arr) {
return $o;
}
function widget_sitesearch($arr) {
$search = ((x($_GET,'search')) ? $_GET['search'] : '');
$srchurl = App::$query_string;
$srchurl = rtrim(preg_replace('/search\=[^\&].*?(\&|$)/is','',$srchurl),'&');
$srchurl = rtrim(preg_replace('/submit\=[^\&].*?(\&|$)/is','',$srchurl),'&');
$srchurl = str_replace(array('?f=','&f='),array('',''),$srchurl);
$hasq = ((strpos($srchurl,'?') !== false) ? true : false);
$hasamp = ((strpos($srchurl,'&') !== false) ? true : false);
if(($hasamp) && (! $hasq))
$srchurl = substr($srchurl,0,strpos($srchurl,'&')) . '?f=&' . substr($srchurl,strpos($srchurl,'&')+1);
$o = '';
$saved = array();
$tpl = get_markup_template("sitesearch.tpl");
$o = replace_macros($tpl, array(
'$title' => t('Search'),
'$searchbox' => searchbox($search, 'netsearch-box', $srchurl . (($hasq) ? '' : '?f='), false),
'$saved' => $saved,
));
return $o;
}
function widget_filer($arr) {
if(! local_channel())

2
view/pdl/mod_search.pdl
View file

@ -1,3 +1,3 @@
[region=aside]
[widget=savedsearch][/widget]
[widget=sitesearch][/widget]
[/region]

5
view/tpl/sitesearch.tpl Normal file
View file

@ -0,0 +1,5 @@
<div class="widget saved-search-widget">
<h3 id="search">{{$title}}</h3>
{{$searchbox}}
<div class="clear"></div>
</div>