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".

2 files changed, 48 insertions, 78 deletions

diff --git a/core/include/user/list.php b/core/include/user/list.php
index f715a55..afc8179 100644
--- a/core/include/user/list.php
+++ b/core/include/user/list.php
@@ -30,44 +30,35 @@ if(Application::get('USER.SINGLE_REDIRECT') === TRUE AND $count === '1') {
 	HTTP::redirect($User->getURL());
 }
 
-#===============================================================================
-# TRY: Template\Exception
-#===============================================================================
-try {
-	$execSQL = "SELECT id FROM %s ORDER BY {$site_sort} LIMIT ".(($currentSite-1) * $site_size).", {$site_size}";
-	$userIDs = $Database->query(sprintf($execSQL, User\Attribute::TABLE))->fetchAll($Database::FETCH_COLUMN);
-
-	foreach($userIDs as $userID) {
-		try {
-			$User = User\Factory::build($userID);
-			$ItemTemplate = generateUserItemTemplate($User);
-
-			$users[] = $ItemTemplate;
-		} catch(User\Exception $Exception){}
-	}
+$execSQL = "SELECT id FROM %s ORDER BY {$site_sort} LIMIT ".(($currentSite-1) * $site_size).", {$site_size}";
+$userIDs = $Database->query(sprintf($execSQL, User\Attribute::TABLE))->fetchAll($Database::FETCH_COLUMN);
 
-	$ListTemplate = Template\Factory::build('user/list');
-	$ListTemplate->set('PAGINATION', [
-		'THIS' => $currentSite,
-		'LAST' => $lastSite,
-		'HTML' => generateUserNaviTemplate($currentSite)
-	]);
-	$ListTemplate->set('LIST', [
-		'USERS' => $users ?? []
-	]);
+foreach($userIDs as $userID) {
+	try {
+		$User = User\Factory::build($userID);
+		$ItemTemplate = generateUserItemTemplate($User);
 
-	$MainTemplate = Template\Factory::build('main');
-	$MainTemplate->set('HTML', $ListTemplate);
-	$MainTemplate->set('HEAD', [
-		'NAME' => $Language->text('title_user_overview', $currentSite)
-	]);
-
-	echo $MainTemplate;
+		$users[] = $ItemTemplate;
+	} catch(User\Exception $Exception){}
 }
 
 #===============================================================================
-# CATCH: Template\Exception
+# Build document
 #===============================================================================
-catch(Template\Exception $Exception) {
-	Application::exit($Exception->getMessage());
-}
+$ListTemplate = Template\Factory::build('user/list');
+$ListTemplate->set('PAGINATION', [
+	'THIS' => $currentSite,
+	'LAST' => $lastSite,
+	'HTML' => generateUserNaviTemplate($currentSite)
+]);
+$ListTemplate->set('LIST', [
+	'USERS' => $users ?? []
+]);
+
+$MainTemplate = Template\Factory::build('main');
+$MainTemplate->set('HTML', $ListTemplate);
+$MainTemplate->set('HEAD', [
+	'NAME' => $Language->text('title_user_overview', $currentSite)
+]);
+
+echo $MainTemplate;
diff --git a/core/include/user/main.php b/core/include/user/main.php
index ee1fa76..80969da 100644
--- a/core/include/user/main.php
+++ b/core/include/user/main.php
@@ -32,54 +32,33 @@ try {
 		$user_data['NEXT'] = generateItemTemplateData($NextUser);
 	} catch(User\Exception $Exception){}
 
+	$PostCountStatement = $Database->query(sprintf('SELECT COUNT(*) FROM %s WHERE user = %d', Post\Attribute::TABLE, $User->getID()));
+	$PageCountStatement = $Database->query(sprintf('SELECT COUNT(*) FROM %s WHERE user = %d', Page\Attribute::TABLE, $User->getID()));
+
 	#===============================================================================
-	# TRY: Template\Exception
+	# Build document
 	#===============================================================================
-	try {
-		#===============================================================================
-		# TRY: PDOException
-		#===============================================================================
-		try {
-			$PostCountStatement = $Database->query(sprintf('SELECT COUNT(*) FROM %s WHERE user = %d', Post\Attribute::TABLE, $User->getID()));
-			$PageCountStatement = $Database->query(sprintf('SELECT COUNT(*) FROM %s WHERE user = %d', Page\Attribute::TABLE, $User->getID()));
-		}
-
-		#===============================================================================
-		# CATCH: PDOException
-		#===============================================================================
-		catch(PDOException $Exception) {
-			exit($Exception->getMessage());
-		}
-
-		$UserTemplate = Template\Factory::build('user/main');
-		$UserTemplate->set('USER', $user_data);
-		$UserTemplate->set('COUNT', [
-			'POST' => $PostCountStatement->fetchColumn(),
-			'PAGE' => $PageCountStatement->fetchColumn()
-		]);
+	$UserTemplate = Template\Factory::build('user/main');
+	$UserTemplate->set('USER', $user_data);
+	$UserTemplate->set('COUNT', [
+		'POST' => $PostCountStatement->fetchColumn(),
+		'PAGE' => $PageCountStatement->fetchColumn()
+	]);
 
-		$MainTemplate = Template\Factory::build('main');
-		$MainTemplate->set('HTML', $UserTemplate);
-		$MainTemplate->set('HEAD', [
-			'NAME' => $user_data['ATTR']['FULLNAME'],
-			'DESC' => description($user_data['BODY']['HTML'](), Application::get('USER.DESCRIPTION_SIZE')),
-			'PERM' => $User->getURL(),
-			'OG_IMAGES' => $User->getFiles()
-		]);
+	$MainTemplate = Template\Factory::build('main');
+	$MainTemplate->set('HTML', $UserTemplate);
+	$MainTemplate->set('HEAD', [
+		'NAME' => $user_data['ATTR']['FULLNAME'],
+		'DESC' => description($user_data['BODY']['HTML'](), Application::get('USER.DESCRIPTION_SIZE')),
+		'PERM' => $User->getURL(),
+		'OG_IMAGES' => $User->getFiles()
+	]);
 
-		# Get access to the current item data from main template
-		$MainTemplate->set('TYPE', 'USER');
-		$MainTemplate->set('USER', $user_data);
+	# Get access to the current item data from main template
+	$MainTemplate->set('TYPE', 'USER');
+	$MainTemplate->set('USER', $user_data);
 
-		echo $MainTemplate;
-	}
-
-	#===============================================================================
-	# CATCH: Template\Exception
-	#===============================================================================
-	catch(Template\Exception $Exception) {
-		Application::exit($Exception->getMessage());
-	}
+	echo $MainTemplate;
 }
 
 #===============================================================================