From 78fcc20190121d487a2e6cf1fca53b66df67dc3a Mon Sep 17 00:00:00 2001
From: Thomas Lange <code@nerdmind.de>
Date: Mon, 14 Jun 2021 20:03:19 +0200
Subject: Remove more redundant try/catch blocks

Remove all try/catch blocks where the exception handling did not differ
from the exception handler already defined by "set_exception_handler".
---
 core/include/search/main.php | 77 +++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 43 deletions(-)

(limited to 'core/include/search/main.php')

diff --git a/core/include/search/main.php b/core/include/search/main.php
index db9a77a..f1b0693 100644
--- a/core/include/search/main.php
+++ b/core/include/search/main.php
@@ -35,55 +35,46 @@ $search_data = [
 ];
 
 #===============================================================================
-# TRY: Template\Exception
+# Build document
 #===============================================================================
-try {
-	if(isset($postIDs) AND !empty($postIDs)) {
-		foreach($postIDs as $postID) {
-			try {
-				$Post = Post\Factory::build($postID);
-				$User = User\Factory::build($Post->attr('user'));
+if(isset($postIDs) AND !empty($postIDs)) {
+	foreach($postIDs as $postID) {
+		try {
+			$Post = Post\Factory::build($postID);
+			$User = User\Factory::build($Post->attr('user'));
 
-				$posts[] = generatePostItemTemplate($Post, $User);
-			}
-			catch(Post\Exception $Exception){}
-			catch(User\Exception $Exception){}
+			$posts[] = generatePostItemTemplate($Post, $User);
 		}
-
-		$ResultTemplate = Template\Factory::build('search/result');
-		$ResultTemplate->set('FORM', $form_data);
-		$ResultTemplate->set('SEARCH', $search_data);
-		$ResultTemplate->set('RESULT', [
-			'LIST' => $posts ?? []
-		]);
-
-		$MainTemplate = Template\Factory::build('main');
-		$MainTemplate->set('HTML', $ResultTemplate);
-		$MainTemplate->set('HEAD', [
-			'NAME' => $Language->text('title_search_results', escapeHTML($search)),
-			'PERM' => Application::getURL('search/')
-		]);
+		catch(Post\Exception $Exception){}
+		catch(User\Exception $Exception){}
 	}
 
-	else {
-		$SearchTemplate = Template\Factory::build('search/main');
-		$SearchTemplate->set('FORM', $form_data);
-		$SearchTemplate->set('SEARCH', $search_data);
-
-		$MainTemplate = Template\Factory::build('main');
-		$MainTemplate->set('HTML', $SearchTemplate);
-		$MainTemplate->set('HEAD', [
-			'NAME' => $Language->text('title_search_request'),
-			'PERM' => Application::getURL('search/')
-		]);
-	}
+	$ResultTemplate = Template\Factory::build('search/result');
+	$ResultTemplate->set('FORM', $form_data);
+	$ResultTemplate->set('SEARCH', $search_data);
+	$ResultTemplate->set('RESULT', [
+		'LIST' => $posts ?? []
+	]);
 
-	echo $MainTemplate;
+	$MainTemplate = Template\Factory::build('main');
+	$MainTemplate->set('HTML', $ResultTemplate);
+	$MainTemplate->set('HEAD', [
+		'NAME' => $Language->text('title_search_results', escapeHTML($search)),
+		'PERM' => Application::getURL('search/')
+	]);
 }
 
-#===============================================================================
-# CATCH: Template\Exception
-#===============================================================================
-catch(Template\Exception $Exception) {
-	Application::exit($Exception->getMessage());
+else {
+	$SearchTemplate = Template\Factory::build('search/main');
+	$SearchTemplate->set('FORM', $form_data);
+	$SearchTemplate->set('SEARCH', $search_data);
+
+	$MainTemplate = Template\Factory::build('main');
+	$MainTemplate->set('HTML', $SearchTemplate);
+	$MainTemplate->set('HEAD', [
+		'NAME' => $Language->text('title_search_request'),
+		'PERM' => Application::getURL('search/')
+	]);
 }
+
+echo $MainTemplate;
-- 
cgit v1.2.3