X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=64336e3487b0e78e34d304d37a86304e9b7d2630;hb=7c73e8634c954cc2bd0d1138729459d7d5090f62;hp=c42bcacfa007a3d675b0afea56ed8ef0b674f3ca;hpb=13557985844b669f2dbae1294b39044928a1078f;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index c42bcacfa0..64336e3487 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -2,6 +2,7 @@
 /**
  * @file mod/search.php
  */
+
 use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -9,7 +10,7 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
 require_once 'include/security.php';
@@ -21,14 +22,14 @@ function search_saved_searches() {
 	$o = '';
 	$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-	if (! Feature::isEnabled(local_user(),'savedsearch'))
+	if (!Feature::isEnabled(local_user(),'savedsearch'))
 		return $o;
 
 	$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[] = [
@@ -64,14 +65,19 @@ function search_init(App $a) {
 		if (x($_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]);
+			DBA::delete('search', ['uid' => local_user(), 'term' => $search]);
+		}
+
+		/// @todo Check if there is a case at all that "aside" is prefilled here
+		if (!isset($a->page['aside'])) {
+			$a->page['aside'] = '';
 		}
 
 		$a->page['aside'] .= search_saved_searches();
@@ -184,7 +190,7 @@ function search_content(App $a) {
 				break;
 		}
 
-	if (! $search)
+	if (!$search)
 		return $o;
 
 	if (Config::get('system','only_tag_search'))
@@ -203,16 +209,21 @@ function search_content(App $a) {
 			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);
+		$terms = DBA::select('term', ['oid'], $condition, $params);
 
 		$itemids = [];
-		while ($term = dba::fetch($terms)) {
+		while ($term = DBA::fetch($terms)) {
 			$itemids[] = $term['oid'];
 		}
-		dba::close($terms);
-
-		$items = Item::select(local_user(), [], ['id' => array_reverse($itemids)]);
-		$r = dba::inArray($items);
+		DBA::close($terms);
+
+		if (!empty($itemids)) {
+			$params = ['order' => ['id' => true]];
+			$items = Item::selectForUser(local_user(), [], ['id' => $itemids], $params);
+			$r = Item::inArray($items);
+		} else {
+			$r = [];
+		}
 	} else {
 		logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
 
@@ -221,11 +232,11 @@ function search_content(App $a) {
 			local_user(), $search];
 		$params = ['order' => ['id' => true],
 			'limit' => [$a->pager['start'], $a->pager['itemspage']]];
-		$items = Item::select(local_user(), [], $condition, $params);
-		$r = dba::inArray($items);
+		$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;
 	}
@@ -250,4 +261,3 @@ function search_content(App $a) {
 
 	return $o;
 }
-