From 778168e0c4e143325b8d69a44749d88b6702b217 Mon Sep 17 00:00:00 2001 From: Steffen K9 Date: Fri, 1 Nov 2019 17:15:26 +0100 Subject: [PATCH 1/2] Show also servers with policy 'approve' Changed the queries to show also servers with register policy 'approval'. --- src/classes/Controllers/Web/Servers.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/classes/Controllers/Web/Servers.php b/src/classes/Controllers/Web/Servers.php index b608b91..94e64f5 100644 --- a/src/classes/Controllers/Web/Servers.php +++ b/src/classes/Controllers/Web/Servers.php @@ -62,7 +62,7 @@ class Servers extends BaseController $stmt = 'SELECT * FROM `server` s -WHERE `reg_policy` = "REGISTER_OPEN" +WHERE `reg_policy` != "REGISTER_CLOSED" AND `available` AND NOT `hidden` ORDER BY `health_score` DESC, `ssl_state` DESC, `info` != "" DESC, `last_seen` DESC @@ -81,7 +81,7 @@ LIMIT :start, :limit'; $stmt = 'SELECT COUNT(*) FROM `server` s -WHERE `reg_policy` = "REGISTER_OPEN" +WHERE `reg_policy` != "REGISTER_CLOSED" AND `available` AND NOT `hidden`'; $count = $this->atlas->fetchValue($stmt); From dfd1a14300dfbc29e13370f827ca74a9e58e67f4 Mon Sep 17 00:00:00 2001 From: Steffen K9 Date: Fri, 1 Nov 2019 17:18:15 +0100 Subject: [PATCH 2/2] Change the statistics query as well --- src/classes/Controllers/Web/Statistics.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/classes/Controllers/Web/Statistics.php b/src/classes/Controllers/Web/Statistics.php index 8b48de7..e7fd888 100644 --- a/src/classes/Controllers/Web/Statistics.php +++ b/src/classes/Controllers/Web/Statistics.php @@ -74,7 +74,7 @@ class Statistics extends BaseController COUNT(*) AS `total`, SUM(CASE WHEN `available` THEN 1 ELSE 0 END) AS `available`, SUM(CASE WHEN `available` AND `language` IS NOT NULL THEN 1 ELSE 0 END) AS `language`, - SUM(CASE WHEN `available` AND `reg_policy` = "REGISTER_OPEN" THEN 1 ELSE 0 END) AS `open`, + SUM(CASE WHEN `available` AND `reg_policy` != "REGISTER_CLOSED" THEN 1 ELSE 0 END) AS `open`, SUM(CASE WHEN `available` AND `version` IS NOT NULL THEN 1 ELSE 0 END) AS `version`, SUM(CASE WHEN `available` AND (`version` = :dev_version OR `version` = :rc_version) THEN 1 ELSE 0 END) AS `dev_version`, SUM(CASE WHEN `available` AND `version` = :stable_version THEN 1 ELSE 0 END) AS `stable_version`,