From ac8bd3d2512dd1bfca43d71ea10202ba9e6a82a6 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 21 Jul 2015 15:31:23 +0200 Subject: Add a max_registrations limit - Allow user to create accounts (not implemented) - Admin only can set this limit See https://github.com/FreshRSS/FreshRSS/issues/679 --- app/Models/ConfigurationSetter.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/Models/ConfigurationSetter.php') diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index 4bd29ecb0..236bf5b0b 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -352,6 +352,9 @@ class FreshRSS_ConfigurationSetter { 'min' => 0, 'max' => $max_small_int, ), + 'max_registrations' => array( + 'min' => 0, + ), ); foreach ($values as $key => $value) { -- cgit v1.2.3 From d6e632fc09ff391da39a42853f0eae87ef4a20f4 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Wed, 22 Jul 2015 23:22:50 +0200 Subject: Fix a bug in ConfigurationSetter --- app/Models/ConfigurationSetter.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Models/ConfigurationSetter.php') diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index 236bf5b0b..d7378d4d8 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -364,8 +364,8 @@ class FreshRSS_ConfigurationSetter { $limits = $limits_keys[$key]; if ( - (!isset($limits['min']) || $value > $limits['min']) && - (!isset($limits['max']) || $value < $limits['max']) + (!isset($limits['min']) || $value >= $limits['min']) && + (!isset($limits['max']) || $value <= $limits['max']) ) { $data['limits'][$key] = $value; } -- cgit v1.2.3 From 9817743cd7fbe10e361873a0a5d6cb591c720c23 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Mon, 27 Jul 2015 14:52:13 +0200 Subject: Cast $limits values in int (config) Fix https://github.com/FreshRSS/FreshRSS/issues/925 --- app/Models/ConfigurationSetter.php | 1 + 1 file changed, 1 insertion(+) (limited to 'app/Models/ConfigurationSetter.php') diff --git a/app/Models/ConfigurationSetter.php b/app/Models/ConfigurationSetter.php index d7378d4d8..992a3a387 100644 --- a/app/Models/ConfigurationSetter.php +++ b/app/Models/ConfigurationSetter.php @@ -362,6 +362,7 @@ class FreshRSS_ConfigurationSetter { continue; } + $value = intval($value); $limits = $limits_keys[$key]; if ( (!isset($limits['min']) || $value >= $limits['min']) && -- cgit v1.2.3