Merge branch 'master' into 'optimization'optimization

1 files changed, 25 insertions, 35 deletions

diff --git a/admin/page/update.php b/admin/page/update.php
index f0bef1e..ba34a86 100644
--- a/admin/page/update.php
+++ b/admin/page/update.php
@@ -39,45 +39,36 @@ try {
 		}
 	}
 
-	#===============================================================================
-	# TRY: Template\Exception
-	#===============================================================================
-	try {
-		$userIDs = $Database->query(sprintf('SELECT id FROM %s ORDER BY fullname ASC', User\Attribute::TABLE));
-
-		foreach($userIDs->fetchAll($Database::FETCH_COLUMN) as $userID) {
-			$User = User\Factory::build($userID);
-			$userAttributes[] = [
-				'ID' => $User->attr('id'),
-				'FULLNAME' => $User->attr('fullname'),
-				'USERNAME' => $User->attr('username'),
-			];
-		}
-
-		$FormTemplate = Template\Factory::build('page/form');
-		$FormTemplate->set('FORM', [
-			'TYPE' => 'UPDATE',
-			'INFO' => $messages ?? [],
-			'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER),
-			'USER_LIST' => $userAttributes ??  [],
-			'TOKEN' => Application::getSecurityToken()
-		]);
+	$userIDs = $Database->query(sprintf('SELECT id FROM %s ORDER BY fullname ASC', User\Attribute::TABLE));
 
-		$PageUpdateTemplate = Template\Factory::build('page/update');
-		$PageUpdateTemplate->set('HTML', $FormTemplate);
-
-		$MainTemplate = Template\Factory::build('main');
-		$MainTemplate->set('NAME', $Language->text('title_page_update'));
-		$MainTemplate->set('HTML', $PageUpdateTemplate);
-		echo $MainTemplate;
+	foreach($userIDs->fetchAll($Database::FETCH_COLUMN) as $userID) {
+		$User = User\Factory::build($userID);
+		$userAttributes[] = [
+			'ID' => $User->attr('id'),
+			'FULLNAME' => $User->attr('fullname'),
+			'USERNAME' => $User->attr('username'),
+		];
 	}
 
 	#===============================================================================
-	# CATCH: Template\Exception
+	# Build document
 	#===============================================================================
-	catch(Template\Exception $Exception) {
-		Application::exit($Exception->getMessage());
-	}
+	$FormTemplate = Template\Factory::build('page/form');
+	$FormTemplate->set('FORM', [
+		'TYPE' => 'UPDATE',
+		'INFO' => $messages ?? [],
+		'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER),
+		'USER_LIST' => $userAttributes ??  [],
+		'TOKEN' => Application::getSecurityToken()
+	]);
+
+	$PageUpdateTemplate = Template\Factory::build('page/update');
+	$PageUpdateTemplate->set('HTML', $FormTemplate);
+
+	$MainTemplate = Template\Factory::build('main');
+	$MainTemplate->set('NAME', $Language->text('title_page_update'));
+	$MainTemplate->set('HTML', $PageUpdateTemplate);
+	echo $MainTemplate;
 }
 
 #===============================================================================
@@ -86,4 +77,3 @@ try {
 catch(Page\Exception $Exception) {
 	Application::error404();
 }
-?>
\ No newline at end of file