use Friendica\Content\Feature;
use Friendica\Content\Nav;
use Friendica\Content\Pager;
+use Friendica\Content\Text\HTML;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Item;
+use Friendica\Util\Strings;
-require_once 'include/conversation.php';
require_once 'mod/dirfind.php';
function search_saved_searches() {
$o = '';
- $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
-
- if (!Feature::isEnabled(local_user(),'savedsearch'))
- return $o;
+ $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
intval(local_user())
}
- $tpl = get_markup_template("saved_searches_aside.tpl");
+ $tpl = Renderer::getMarkupTemplate("saved_searches_aside.tpl");
- $o .= replace_macros($tpl, [
+ $o .= Renderer::replaceMacros($tpl, [
'$title' => L10n::t('Saved Searches'),
'$add' => '',
'$searchbox' => '',
function search_init(App $a) {
- $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+ $search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
if (local_user()) {
- if (x($_GET,'save') && $search) {
+ if (!empty($_GET['save']) && $search) {
$r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
intval(local_user()),
DBA::escape($search)
DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
}
}
- if (x($_GET,'remove') && $search) {
+ if (!empty($_GET['remove']) && $search) {
DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
}
}
-
-
-function search_post(App $a) {
- if (x($_POST,'search'))
- $a->data['search'] = $_POST['search'];
-}
-
-
function search_content(App $a) {
if (Config::get('system','block_public') && !local_user() && !remote_user()) {
Nav::setSelected('search');
- $search = '';
- if (x($a->data,'search'))
- $search = notags(trim($a->data['search']));
- else
- $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+ $search = (!empty($_REQUEST['search']) ? Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) : '');
$tag = false;
- if (x($_GET,'tag')) {
+ if (!empty($_GET['tag'])) {
$tag = true;
- $search = (x($_GET,'tag') ? '#' . notags(trim(rawurldecode($_GET['tag']))) : '');
+ $search = (!empty($_GET['tag']) ? '#' . Strings::escapeTags(trim(rawurldecode($_GET['tag']))) : '');
}
// contruct a wrapper for the search header
- $o = replace_macros(get_markup_template("content_wrapper.tpl"),[
+ $o = Renderer::replaceMacros(Renderer::getMarkupTemplate("content_wrapper.tpl"),[
'name' => "search-header",
'$title' => L10n::t("Search"),
'$title_size' => 3,
- '$content' => search($search,'search-box','search',((local_user()) ? true : false), false)
+ '$content' => HTML::search($search,'search-box','search', false)
]);
if (strpos($search,'#') === 0) {
return dirfind_content($a);
}
- if (x($_GET,'search-option'))
+ if (!empty($_GET['search-option']))
switch($_GET['search-option']) {
case 'fulltext':
break;
$title = L10n::t('Results for: %s', $search);
}
- $o .= replace_macros(get_markup_template("section_title.tpl"),[
+ $o .= Renderer::replaceMacros(Renderer::getMarkupTemplate("section_title.tpl"),[
'$title' => $title
]);