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/post/list.php | 65 ++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 37 deletions(-)

(limited to 'core/include/post/list.php')

diff --git a/core/include/post/list.php b/core/include/post/list.php
index e3b37c3..0f5ef1f 100644
--- a/core/include/post/list.php
+++ b/core/include/post/list.php
@@ -30,48 +30,39 @@ if(Application::get('POST.SINGLE_REDIRECT') === TRUE AND $count === '1') {
 	HTTP::redirect($Post->getURL());
 }
 
-#===============================================================================
-# TRY: Template\Exception
-#===============================================================================
-try {
-	$execSQL = "SELECT id FROM %s ORDER BY {$site_sort} LIMIT ".(($currentSite-1) * $site_size).", {$site_size}";
-	$postIDs = $Database->query(sprintf($execSQL, Post\Attribute::TABLE))->fetchAll($Database::FETCH_COLUMN);
+$execSQL = "SELECT id FROM %s ORDER BY {$site_sort} LIMIT ".(($currentSite-1) * $site_size).", {$site_size}";
+$postIDs = $Database->query(sprintf($execSQL, Post\Attribute::TABLE))->fetchAll($Database::FETCH_COLUMN);
 
-	foreach($postIDs as $postID) {
-		try {
-			$Post = Post\Factory::build($postID);
-			$User = User\Factory::build($Post->attr('user'));
+foreach($postIDs as $postID) {
+	try {
+		$Post = Post\Factory::build($postID);
+		$User = User\Factory::build($Post->attr('user'));
 
-			$ItemTemplate = generatePostItemTemplate($Post, $User);
+		$ItemTemplate = generatePostItemTemplate($Post, $User);
 
-			$posts[] = $ItemTemplate;
-		}
-		catch(Post\Exception $Exception){}
-		catch(User\Exception $Exception){}
+		$posts[] = $ItemTemplate;
 	}
-
-	$ListTemplate = Template\Factory::build('post/list');
-	$ListTemplate->set('PAGINATION', [
-		'THIS' => $currentSite,
-		'LAST' => $lastSite,
-		'HTML' => generatePostNaviTemplate($currentSite)
-	]);
-	$ListTemplate->set('LIST', [
-		'POSTS' => $posts ?? []
-	]);
-
-	$MainTemplate = Template\Factory::build('main');
-	$MainTemplate->set('HTML', $ListTemplate);
-	$MainTemplate->set('HEAD', [
-		'NAME' => $Language->text('title_post_overview', $currentSite)
-	]);
-
-	echo $MainTemplate;
+	catch(Post\Exception $Exception){}
+	catch(User\Exception $Exception){}
 }
 
 #===============================================================================
-# CATCH: Template\Exception
+# Build document
 #===============================================================================
-catch(Template\Exception $Exception) {
-	Application::exit($Exception->getMessage());
-}
+$ListTemplate = Template\Factory::build('post/list');
+$ListTemplate->set('PAGINATION', [
+	'THIS' => $currentSite,
+	'LAST' => $lastSite,
+	'HTML' => generatePostNaviTemplate($currentSite)
+]);
+$ListTemplate->set('LIST', [
+	'POSTS' => $posts ?? []
+]);
+
+$MainTemplate = Template\Factory::build('main');
+$MainTemplate->set('HTML', $ListTemplate);
+$MainTemplate->set('HEAD', [
+	'NAME' => $Language->text('title_post_overview', $currentSite)
+]);
+
+echo $MainTemplate;
-- 
cgit v1.2.3