mirror of
https://github.com/friendica/friendica
synced 2024-12-23 06:00:15 +00:00
saved searches on search page, templates: Invalid argument supplied for foreach() on line 167
This commit is contained in:
parent
f03c2b1b79
commit
3f59f63224
3 changed files with 2825 additions and 348 deletions
|
@ -164,9 +164,11 @@
|
||||||
|
|
||||||
$a = get_app();
|
$a = get_app();
|
||||||
$this->lang=array();
|
$this->lang=array();
|
||||||
foreach ($a->strings as $k=>$v){
|
if(is_array($a->strings) && count($a->strings)) {
|
||||||
$k = preg_replace("/[^a-z0-9-]/", "", str_replace(" ","-", strtolower($k)));
|
foreach ($a->strings as $k=>$v){
|
||||||
$this->lang[$k] = $v;
|
$k = preg_replace("/[^a-z0-9-]/", "", str_replace(" ","-", strtolower($k)));
|
||||||
|
$this->lang[$k] = $v;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return $this->lang;
|
return $this->lang;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,59 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
function search_saved_searches() {
|
||||||
|
|
||||||
|
$o = '';
|
||||||
|
|
||||||
|
$r = q("select `term` from `search` WHERE `uid` = %d",
|
||||||
|
intval(local_user())
|
||||||
|
);
|
||||||
|
|
||||||
|
if(count($r)) {
|
||||||
|
$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
|
||||||
|
$o .= '<div id="saved-search-list"><ul id="saved-search-ul">' . "\r\n";
|
||||||
|
foreach($r as $rr) {
|
||||||
|
$o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
|
||||||
|
}
|
||||||
|
$o .= '</ul></div>' . "\r\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
return $o;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function search_init(&$a) {
|
||||||
|
|
||||||
|
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
|
||||||
|
|
||||||
|
if(local_user()) {
|
||||||
|
if(x($_GET,'save') && $search) {
|
||||||
|
$r = q("select * from `search` where `uid` = %d and `term` = '%s' limit 1",
|
||||||
|
intval(local_user()),
|
||||||
|
dbesc($search)
|
||||||
|
);
|
||||||
|
if(! count($r)) {
|
||||||
|
q("insert into `search` ( `uid`,`term` ) values ( %d, '%s') ",
|
||||||
|
intval(local_user()),
|
||||||
|
dbesc($search)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(x($_GET,'remove') && $search) {
|
||||||
|
q("delete from `search` where `uid` = %d and `term` = '%s' limit 1",
|
||||||
|
intval(local_user()),
|
||||||
|
dbesc($search)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
$a->page['aside'] .= search_saved_searches();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function search_post(&$a) {
|
function search_post(&$a) {
|
||||||
if(x($_POST,'search'))
|
if(x($_POST,'search'))
|
||||||
|
@ -30,7 +84,7 @@ function search_content(&$a) {
|
||||||
else
|
else
|
||||||
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
|
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
|
||||||
|
|
||||||
$o .= search($search);
|
$o .= search($search,'search-box','/search',((local_user()) ? true : false));
|
||||||
|
|
||||||
if(! $search)
|
if(! $search)
|
||||||
return $o;
|
return $o;
|
||||||
|
|
3109
view/es/messages.po
3109
view/es/messages.po
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue