Sorting function for servers #228

tltneon · Feb 27, 2025 · bf37db8 · bf37db8
1 parent a875379
commit bf37db8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/install.php b/install.php
@@ -363,6 +363,7 @@ function check($name, $bool, $hint = '') {
 			$output .= check('CURL', LGSL::isEnabled("curl"), 'optional: for some games');
 			$output .= check('BZ2', function_exists("bzdecompress"), 'optional: for some games');
 			$output .= check('GD', LGSL::isEnabled("gd"), 'optional: for charts & userbars');
+			$output .= check('SQLite', extension_loaded('sqlite3'), 'optional: alt db');
 		}
 
 	$output .= "	
@@ -480,6 +481,7 @@ function check($name, $bool, $hint = '') {
 				<l k='sorts'></l>:
 				<select type='text' name='sort_servers_by' onChange='changeValue(event)' />
 					<option value='id'>ID</option>
+					<option value='ip'>IP</option>
 					<option value='type'>Type</option>
 					<option value='zone'>Zone</option>
 					<option value='players'>Players</option>

diff --git a/src/lgsl_class.php b/src/lgsl_class.php
@@ -369,7 +369,7 @@ public function loadServer(Server &$server): void {
     }
 
     static function getServersGroup($options = []) {
-      global $lgsl_config;
+      $lgsl_config = new Config();
       $db = LGSL::db();
 
       $ip           = isset($options['ip'])           ? $options['ip']                   : (int) $lgsl_config['pagination_lim'];
@@ -385,7 +385,7 @@ static function getServersGroup($options = []) {
       $page         = empty($options['page'])         ? ""                               : "LIMIT {$limit} OFFSET " . strval($limit*((int)$options['page'] - 1));
       $status       = empty($options['status'])       ? ""                               : 1;
       $order        = empty($options['order'])        ? ""                               : $options['order'];
-      $sort         = empty($options['sort'])         ? ""                               : (in_array($options['sort'], ['ip', 'name', 'map', 'players']) ? $options['sort'] : "");
+      $sort         = empty($options['sort'])         ? $lgsl_config['sort']['servers']  : (in_array($options['sort'], ['ip', 'name', 'map', 'players']) ? $options['sort'] : "");
       $server_limit = empty($options['limit'])        ? ""                               : $lgsl_config['pagination_lim'];
       $server_limit = empty($random)                  ? $server_limit                    : $random;