Merge branch 'master' into 'optimization'optimization

5 files changed, 106 insertions, 156 deletions

diff --git a/admin/page/delete.php b/admin/page/delete.php
index d23089c..1406ece 100644
--- a/admin/page/delete.php
+++ b/admin/page/delete.php
@@ -28,33 +28,24 @@ try {
 	}
 
 	#===============================================================================
-	# TRY: Template\Exception
+	# Build document
 	#===============================================================================
-	try {
-		$FormTemplate = Template\Factory::build('page/form');
-		$FormTemplate->set('HTML', $Page->getHTML());
-		$FormTemplate->set('FORM', [
-			'TYPE' => 'DELETE',
-			'INFO' => $messages ?? [],
-			'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER),
-			'TOKEN' => Application::getSecurityToken()
-		]);
-
-		$DeleteTemplate = Template\Factory::build('page/delete');
-		$DeleteTemplate->set('HTML', $FormTemplate);
-
-		$MainTemplate = Template\Factory::build('main');
-		$MainTemplate->set('NAME', $Language->text('title_page_delete'));
-		$MainTemplate->set('HTML', $DeleteTemplate);
-		echo $MainTemplate;
-	}
-
-	#===============================================================================
-	# CATCH: Template\Exception
-	#===============================================================================
-	catch(Template\Exception $Exception) {
-		Application::exit($Exception->getMessage());
-	}
+	$FormTemplate = Template\Factory::build('page/form');
+	$FormTemplate->set('HTML', $Page->getHTML());
+	$FormTemplate->set('FORM', [
+		'TYPE' => 'DELETE',
+		'INFO' => $messages ?? [],
+		'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER),
+		'TOKEN' => Application::getSecurityToken()
+	]);
+
+	$DeleteTemplate = Template\Factory::build('page/delete');
+	$DeleteTemplate->set('HTML', $FormTemplate);
+
+	$MainTemplate = Template\Factory::build('main');
+	$MainTemplate->set('NAME', $Language->text('title_page_delete'));
+	$MainTemplate->set('HTML', $DeleteTemplate);
+	echo $MainTemplate;
 }
 
 #===============================================================================
@@ -63,4 +54,3 @@ try {
 catch(Page\Exception $Exception) {
 	Application::error404();
 }
-?>
\ No newline at end of file
diff --git a/admin/page/index.php b/admin/page/index.php
index caff257..82ac05f 100644
--- a/admin/page/index.php
+++ b/admin/page/index.php
@@ -13,8 +13,8 @@ require '../../core/application.php';
 #===============================================================================
 # Pagination
 #===============================================================================
-$site_size = Application::get('PAGE.LIST_SIZE');
-$site_sort = Application::get('PAGE.LIST_SORT');
+$site_size = Application::get('ADMIN.PAGE.LIST_SIZE');
+$site_sort = Application::get('ADMIN.PAGE.LIST_SORT');
 
 $lastSite = ceil($Database->query(sprintf('SELECT COUNT(id) FROM %s', Page\Attribute::TABLE))->fetchColumn() / $site_size);
 
@@ -31,49 +31,39 @@ if($currentSite < 1 OR ($currentSite > $lastSite AND $lastSite > 0)) {
 $execSQL = "SELECT * FROM %s ORDER BY {$site_sort} LIMIT ".(($currentSite-1) * $site_size).", {$site_size}";
 $Statement = $Database->query(sprintf($execSQL, Page\Attribute::TABLE));
 
-#===============================================================================
-# TRY: Template\Exception
-#===============================================================================
-try {
-	while($Attribute = $Statement->fetchObject('Page\Attribute')) {
-		try {
-			$Page = Page\Factory::buildByAttribute($Attribute);
-			$User = User\Factory::build($Page->attr('user'));
+while($Attribute = $Statement->fetchObject('Page\Attribute')) {
+	try {
+		$Page = Page\Factory::buildByAttribute($Attribute);
+		$User = User\Factory::build($Page->attr('user'));
 
-			$ItemTemplate = generatePageItemTemplate($Page, $User);
+		$ItemTemplate = generatePageItemTemplate($Page, $User);
 
-			$pages[] = $ItemTemplate;
-		}
-		catch(Page\Exception $Exception){}
-		catch(User\Exception $Exception){}
+		$pages[] = $ItemTemplate;
 	}
-
-	$PaginationTemplate = Template\Factory::build('pagination');
-	$PaginationTemplate->set('THIS', $currentSite);
-	$PaginationTemplate->set('LAST', $lastSite);
-	$PaginationTemplate->set('HREF', Application::getAdminURL('page/?site=%d'));
-
-	$ListTemplate = Template\Factory::build('page/index');
-	$ListTemplate->set('LIST', [
-		'PAGES' => $pages ?? []
-	]);
-
-	$ListTemplate->set('PAGINATION', [
-		'THIS' => $currentSite,
-		'LAST' => $lastSite,
-		'HTML' => $PaginationTemplate
-	]);
-
-	$MainTemplate = Template\Factory::build('main');
-	$MainTemplate->set('NAME', $Language->text('title_page_overview', $currentSite));
-	$MainTemplate->set('HTML', $ListTemplate);
-	echo $MainTemplate;
+	catch(Page\Exception $Exception){}
+	catch(User\Exception $Exception){}
 }
 
 #===============================================================================
-# CATCH: Template\Exception
+# Build document
 #===============================================================================
-catch(Template\Exception $Exception) {
-	Application::exit($Exception->getMessage());
-}
-?>
\ No newline at end of file
+$PaginationTemplate = Template\Factory::build('pagination');
+$PaginationTemplate->set('THIS', $currentSite);
+$PaginationTemplate->set('LAST', $lastSite);
+$PaginationTemplate->set('HREF', Application::getAdminURL('page/?site=%d'));
+
+$ListTemplate = Template\Factory::build('page/index');
+$ListTemplate->set('LIST', [
+	'PAGES' => $pages ?? []
+]);
+
+$ListTemplate->set('PAGINATION', [
+	'THIS' => $currentSite,
+	'LAST' => $lastSite,
+	'HTML' => $PaginationTemplate
+]);
+
+$MainTemplate = Template\Factory::build('main');
+$MainTemplate->set('NAME', $Language->text('title_page_overview', $currentSite));
+$MainTemplate->set('HTML', $ListTemplate);
+echo $MainTemplate;
diff --git a/admin/page/insert.php b/admin/page/insert.php
index d95a33d..ec903e7 100644
--- a/admin/page/insert.php
+++ b/admin/page/insert.php
@@ -37,43 +37,33 @@ if(HTTP::issetPOST('id', 'user', 'slug', 'name', 'body', 'argv', 'time_insert',
 	}
 }
 
-#===============================================================================
-# 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' => 'INSERT',
-		'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));
 
-	$InsertTemplate = Template\Factory::build('page/insert');
-	$InsertTemplate->set('HTML', $FormTemplate);
-
-	$MainTemplate = Template\Factory::build('main');
-	$MainTemplate->set('NAME', $Language->text('title_page_insert'));
-	$MainTemplate->set('HTML', $InsertTemplate);
-	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());
-}
-?>
\ No newline at end of file
+$FormTemplate = Template\Factory::build('page/form');
+$FormTemplate->set('FORM', [
+	'TYPE' => 'INSERT',
+	'INFO' => $messages ?? [],
+	'DATA' => array_change_key_case($Attribute->getAll(), CASE_UPPER),
+	'USER_LIST' => $userAttributes ??  [],
+	'TOKEN' => Application::getSecurityToken()
+]);
+
+$InsertTemplate = Template\Factory::build('page/insert');
+$InsertTemplate->set('HTML', $FormTemplate);
+
+$MainTemplate = Template\Factory::build('main');
+$MainTemplate->set('NAME', $Language->text('title_page_insert'));
+$MainTemplate->set('HTML', $InsertTemplate);
+echo $MainTemplate;
diff --git a/admin/page/search.php b/admin/page/search.php
index 0506a0d..9f68b69 100644
--- a/admin/page/search.php
+++ b/admin/page/search.php
@@ -27,24 +27,14 @@ if($search = HTTP::GET('q')) {
 }
 
 #===============================================================================
-# TRY: Template\Exception
+# Build document
 #===============================================================================
-try {
-	$SearchTemplate = Template\Factory::build('page/search');
-	$SearchTemplate->set('QUERY', $search);
-	$SearchTemplate->set('PAGES', $pages ?? []);
+$SearchTemplate = Template\Factory::build('page/search');
+$SearchTemplate->set('QUERY', $search);
+$SearchTemplate->set('PAGES', $pages ?? []);
 
-	$MainTemplate = Template\Factory::build('main');
-	$MainTemplate->set('NAME', $Language->text('title_page_search'));
-	$MainTemplate->set('HTML', $SearchTemplate);
+$MainTemplate = Template\Factory::build('main');
+$MainTemplate->set('NAME', $Language->text('title_page_search'));
+$MainTemplate->set('HTML', $SearchTemplate);
 
-	echo $MainTemplate;
-}
-
-#===============================================================================
-# CATCH: Template\Exception
-#===============================================================================
-catch(Template\Exception $Exception) {
-	Application::exit($Exception->getMessage());
-}
-?>
\ No newline at end of file
+echo $MainTemplate;
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