X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=2cdfd6e12826cdbb81e39e0b1871a77d0942ffd0;hb=89eaf508f19be57a07971c5f40b4bb538e36e891;hp=b425464dcc40bb2f31e2c1e9d14fb35fd2683606;hpb=4e44b07dfe07dde78fe8a095fbb43d9ec1ffcb53;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index b425464dcc..2cdfd6e128 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -6,31 +6,30 @@
 use Friendica\App;
 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\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
+use Friendica\Util\Strings;
 
-require_once 'include/security.php';
-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())
 	);
 
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$saved = [];
 		foreach ($r as $rr) {
 			$saved[] = [
@@ -43,9 +42,9 @@ function search_saved_searches() {
 		}
 
 
-		$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'	=> '',
@@ -60,20 +59,20 @@ function search_saved_searches() {
 
 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()),
-				dbesc($search)
+				DBA::escape($search)
 			);
-			if (!DBM::is_result($r)) {
-				dba::insert('search', ['uid' => local_user(), 'term' => $search]);
+			if (!DBA::isResult($r)) {
+				DBA::insert('search', ['uid' => local_user(), 'term' => $search]);
 			}
 		}
-		if (x($_GET,'remove') && $search) {
-			dba::delete('search', ['uid' => local_user(), 'term' => $search]);
+		if (!empty($_GET['remove']) && $search) {
+			DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
 		}
 
 		/// @todo Check if there is a case at all that "aside" is prefilled here
@@ -92,14 +91,6 @@ function search_init(App $a) {
 
 }
 
-
-
-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()) {
@@ -138,31 +129,27 @@ function search_content(App $a) {
 							"description" => L10n::t("Only one search per minute is permitted for not logged in users.")]);
 				killme();
 			}
-			Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), CACHE_HOUR);
+			Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => $resultdata->accesses + 1]), Cache::HOUR);
 		} else
-			Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => 1]), CACHE_HOUR);
+			Cache::set("remote_search:".$remote, json_encode(["time" => time(), "accesses" => 1]), Cache::HOUR);
 	}
 
 	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) {
@@ -176,7 +163,7 @@ function search_content(App $a) {
 		return dirfind_content($a);
 	}
 
-	if (x($_GET,'search-option'))
+	if (!empty($_GET['search-option']))
 		switch($_GET['search-option']) {
 			case 'fulltext':
 				break;
@@ -202,21 +189,23 @@ function search_content(App $a) {
 	// OR your own posts if you are a logged in member
 	// No items will be shown if the member has a blocked profile wall.
 
+	$pager = new Pager($a->query_string);
+
 	if ($tag) {
-		logger("Start tag search for '".$search."'", LOGGER_DEBUG);
+		Logger::log("Start tag search for '".$search."'", Logger::DEBUG);
 
 		$condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`))
 			AND `otype` = ? AND `type` = ? AND `term` = ?",
 			local_user(), TERM_OBJ_POST, TERM_HASHTAG, $search];
 		$params = ['order' => ['created' => true],
-			'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-		$terms = dba::select('term', ['oid'], $condition, $params);
+			'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
+		$terms = DBA::select('term', ['oid'], $condition, $params);
 
 		$itemids = [];
-		while ($term = dba::fetch($terms)) {
+		while ($term = DBA::fetch($terms)) {
 			$itemids[] = $term['oid'];
 		}
-		dba::close($terms);
+		DBA::close($terms);
 
 		if (!empty($itemids)) {
 			$params = ['order' => ['id' => true]];
@@ -226,18 +215,18 @@ function search_content(App $a) {
 			$r = [];
 		}
 	} else {
-		logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
+		Logger::log("Start fulltext search for '".$search."'", Logger::DEBUG);
 
 		$condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`))
 			AND `body` LIKE CONCAT('%',?,'%')",
 			local_user(), $search];
 		$params = ['order' => ['id' => true],
-			'limit' => [$a->pager['start'], $a->pager['itemspage']]];
+			'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
 		$items = Item::selectForUser(local_user(), [], $condition, $params);
 		$r = Item::inArray($items);
 	}
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		info(L10n::t('No results.') . EOL);
 		return $o;
 	}
@@ -249,16 +238,16 @@ function search_content(App $a) {
 		$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
 	]);
 
-	logger("Start Conversation for '".$search."'", LOGGER_DEBUG);
-	$o .= conversation($a, $r, 'search', false, false, 'commented', local_user());
+	Logger::log("Start Conversation for '".$search."'", Logger::DEBUG);
+	$o .= conversation($a, $r, $pager, 'search', false, false, 'commented', local_user());
 
-	$o .= alt_pager($a,count($r));
+	$o .= $pager->renderMinimal(count($r));
 
-	logger("Done '".$search."'", LOGGER_DEBUG);
+	Logger::log("Done '".$search."'", Logger::DEBUG);
 
 	return $o;
 }