Merge branch 'master' into 'optimization'optimization

1 files changed, 33 insertions, 34 deletions

diff --git a/core/include/user/list.php b/core/include/user/list.php
index adc28ec..72375a4 100644
--- a/core/include/user/list.php
+++ b/core/include/user/list.php
@@ -30,45 +30,44 @@ if(Application::get('USER.SINGLE_REDIRECT') === TRUE AND $count === '1') {
 	HTTP::redirect($User->getURL());
 }
 
-#===============================================================================
-# TRY: Template\Exception
-#===============================================================================
-try {
-	$execSQL = "SELECT * FROM %s ORDER BY {$site_sort} LIMIT ".(($currentSite-1) * $site_size).", {$site_size}";
-	$Statement = $Database->query(sprintf($execSQL, User\Attribute::TABLE));
+$execSQL = "SELECT * FROM %s ORDER BY {$site_sort} LIMIT ".(($currentSite-1) * $site_size).", {$site_size}";
+$Statement = $Database->query(sprintf($execSQL, User\Attribute::TABLE));
 
-	while($Attribute = $Statement->fetchObject('User\Attribute')) {
-		try {
-			$User = User\Factory::buildByAttribute($Attribute);
-			$ItemTemplate = generateUserItemTemplate($User);
+while($Attribute = $Statement->fetchObject('User\Attribute')) {
+	try {
+		$User = User\Factory::buildByAttribute($Attribute);
+		$ItemTemplate = generateUserItemTemplate($User);
 
-			$users[] = $ItemTemplate;
-		} catch(User\Exception $Exception){}
-	}
-
-	$ListTemplate = Template\Factory::build('user/list');
-	$ListTemplate->set('PAGINATION', [
-		'THIS' => $currentSite,
-		'LAST' => $lastSite,
-		'HTML' => generateUserNaviTemplate($currentSite)
-	]);
-	$ListTemplate->set('LIST', [
-		'USERS' => $users ?? []
-	]);
+		$users[] = $ItemTemplate;
+	} catch(User\Exception $Exception){}
+}
 
-	$MainTemplate = Template\Factory::build('main');
-	$MainTemplate->set('HTML', $ListTemplate);
-	$MainTemplate->set('HEAD', [
-		'NAME' => $Language->text('title_user_overview', $currentSite)
-	]);
+foreach($userIDs as $userID) {
+	try {
+		$User = User\Factory::build($userID);
+		$ItemTemplate = generateUserItemTemplate($User);
 
-	echo $MainTemplate;
+		$users[] = $ItemTemplate;
+	} catch(User\Exception $Exception){}
 }
 
 #===============================================================================
-# CATCH: Template\Exception
+# Build document
 #===============================================================================
-catch(Template\Exception $Exception) {
-	Application::exit($Exception->getMessage());
-}
-?>
\ No newline at end of file
+$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;