From: Michael <heluecht@pirati.ca>
Date: Sun, 26 Apr 2020 06:58:30 +0000 (+0000)
Subject: Queries had been simplified
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d74067b4613d934d297570c1c1bbf2f32f5fc6c2;p=friendica.git

Queries had been simplified
---

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index e534741232..348e16badd 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -887,13 +887,10 @@ class Profile
 	 */
 	public static function searchProfiles($start = 0, $count = 100, $search = null)
 	{
-		$publish = (DI::config()->get('system', 'publish_all') ? '' : "AND `publish` = 1");
-		$total = 0;
-
 		if (!empty($search)) {
+			$publish = (DI::config()->get('system', 'publish_all') ? '' : "AND `publish` ");
 			$searchTerm = '%' . $search . '%';
-			$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `owner-view`
-				WHERE NOT `blocked` AND NOT `account_removed`
+			$condition = ["NOT `blocked` AND NOT `account_removed`
 				$publish
 				AND ((`name` LIKE ?) OR
 				(`nickname` LIKE ?) OR
@@ -903,62 +900,24 @@ class Profile
 				(`country-name` LIKE ?) OR
 				(`pub_keywords` LIKE ?) OR
 				(`prv_keywords` LIKE ?))",
-				$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm);
+				$searchTerm, $searchTerm, $searchTerm, $searchTerm,
+				$searchTerm, $searchTerm, $searchTerm, $searchTerm];
 		} else {
-			$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
-				FROM `owner-view` WHERE NOT `blocked` AND NOT `account_removed` $publish");
-		}
-
-		if (DBA::isResult($cnt)) {
-			$total = $cnt['total'];
+			$condition = ['blocked' => false, 'account_removed' => false];
+			if (!DI::config()->get('system', 'publish_all')) {
+				$condition['publish'] = true;
+			}
 		}
 
-		$order = " ORDER BY `name` ASC ";
-		$profiles = [];
+		$total = DBA::count('owner-view', $condition);
 
 		// If nothing found, don't try to select details
 		if ($total > 0) {
-			if (!empty($search)) {
-				$searchTerm = '%' . $search . '%';
-
-				$profiles = DBA::p("SELECT * FROM `owner-view`
-					WHERE NOT `blocked` AND NOT `account_removed`
-					$publish
-					AND ((`name` LIKE ?) OR
-						(`nickname` LIKE ?) OR
-						(`about` LIKE ?) OR
-						(`locality` LIKE ?) OR
-						(`region` LIKE ?) OR
-						(`country-name` LIKE ?) OR
-						(`pub_keywords` LIKE ?) OR
-						(`prv_keywords` LIKE ?))
-					$order LIMIT ?,?",
-					$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
-					$start, $count
-				);
-			} else {
-				$profiles = DBA::p("SELECT * FROM `owner-view`
-					WHERE NOT `blocked` AND NOT `account_removed`
-					$publish
-					$order
-					LIMIT ?, ?",
-					$start,
-					$count
-				);
-			}
-		}
-
-		if (DBA::isResult($profiles) && $total > 0) {
-			return [
-				'total'   => $total,
-				'entries' => DBA::toArray($profiles),
-			];
-
+			$profiles = DBA::selectToArray('owner-view', [], $condition, ['order' => ['name'], 'limit' => [$start, $count]]);
 		} else {
-			return [
-				'total'   => $total,
-				'entries' => [],
-			];
+			$profiles = [];
 		}
+
+		return ['total' => $total, 'entries' => $profiles];
 	}
 }