From: Michael <heluecht@pirati.ca>
Date: Fri, 24 Apr 2020 20:39:14 +0000 (+0000)
Subject: Three more joins replaced with views
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=ee3a724b41701ad4e87278abb69b4ffac6481183;p=friendica.git

Three more joins replaced with views
---

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 4c877a9064..24db78a00a 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -887,30 +887,25 @@ class Profile
 	 */
 	public static function searchProfiles($start = 0, $count = 100, $search = null)
 	{
-		$publish = (DI::config()->get('system', 'publish_all') ? '' : "`publish` = 1");
+		$publish = (DI::config()->get('system', 'publish_all') ? 'true' : "`publish` = 1");
 		$total = 0;
 
 		if (!empty($search)) {
 			$searchTerm = '%' . $search . '%';
-			$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
-				FROM `profile`
-				LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`
-				AND ((`profile`.`name` LIKE ?) OR
-				(`user`.`nickname` LIKE ?) OR
-				(`profile`.`about` LIKE ?) OR
-				(`profile`.`locality` LIKE ?) OR
-				(`profile`.`region` LIKE ?) OR
-				(`profile`.`country-name` LIKE ?) OR
-				(`profile`.`pub_keywords` LIKE ?) OR
-				(`profile`.`prv_keywords` LIKE ?))",
-				$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
-				$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm);
+			$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `owner-view`
+				WHERE $publish AND NOT `blocked` AND NOT `account_removed`
+				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 ?))",
+				$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm);
 		} else {
 			$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total`
-				FROM `profile`
-				LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed`");
+				FROM `owner-view` WHERE $publish AND NOT `blocked` AND NOT `account_removed`");
 		}
 
 		if (DBA::isResult($cnt)) {
@@ -925,35 +920,23 @@ class Profile
 			if (!empty($search)) {
 				$searchTerm = '%' . $search . '%';
 
-				$profiles = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-			`contact`.`addr`, `contact`.`url` AS `profile_url`
-			FROM `profile`
-			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-			LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
-			AND ((`profile`.`name` LIKE ?) OR
-				(`user`.`nickname` LIKE ?) OR
-				(`profile`.`about` LIKE ?) OR
-				(`profile`.`locality` LIKE ?) OR
-				(`profile`.`region` LIKE ?) OR
-				(`profile`.`country-name` LIKE ?) OR
-				(`profile`.`pub_keywords` LIKE ?) OR
-				(`profile`.`prv_keywords` LIKE ?))
-			$order LIMIT ?,?",
+				$profiles = DBA::p("SELECT * FROM `owner-view`
+					WHERE $publish AND NOT `blocked` AND NOT `account_removed`
+					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,
-					$searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm, $searchTerm,
 					$start, $count
 				);
 			} else {
-				$profiles = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-			`contact`.`addr`, `contact`.`url` AS `profile_url`
-			FROM `profile`
-			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-			LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `contact`.`self`
-			$order LIMIT ?,?",
-					$start, $count
-				);
+				$profiles = DBA::p("SELECT * FROM `owner-view`
+					WHERE $publish AND NOT `blocked` AND NOT `account_removed` $order LIMIT ?,?", $start, $count);
 			}
 		}
 
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index fcbb148dc7..cc3a668e6a 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -140,29 +140,26 @@ function vier_community_info()
 
 	// last 9 users
 	if ($show_lastusers) {
-		$publish = (DI::config()->get('system', 'publish_all') ? '' : "`publish` = 1");
-		$order = " ORDER BY `register_date` DESC ";
+		$condition = ['blocked' => false];
+		if (!DI::config()->get('system', 'publish_all')) {
+			$condition['publish'] = true;
+		}
 
 		$tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
 
-		$r = q("SELECT `profile`.*, `user`.`nickname`
-				FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
-			0,
-			9
-		);
+		$profiles = DBA::selectToArray('owner-view', [], $condition, ['order' => ['register_date' => true], 'limit' => [0, 9]]);
 
-		if (DBA::isResult($r)) {
+		if (DBA::isResult($profiles)) {
 			$aside['$lastusers_title'] = DI::l10n()->t('Last users');
 			$aside['$lastusers_items'] = [];
 
-			foreach ($r as $rr) {
-				$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['uid']);
+			foreach ($profiles as $profile) {
+				$profile_link = 'profile/' . ((strlen($profile['nickname'])) ? $profile['nickname'] : $profile['uid']);
 				$entry = Renderer::replaceMacros($tpl, [
-					'$id' => $rr['id'],
+					'$id' => $profile['id'],
 					'$profile_link' => $profile_link,
-					'$photo' => DI::baseUrl()->remove($rr['thumb']),
-					'$alt_text' => $rr['name']]);
+					'$photo' => DI::baseUrl()->remove($profile['thumb']),
+					'$alt_text' => $profile['name']]);
 				$aside['$lastusers_items'][] = $entry;
 			}
 		}