From ba1259bb2100a776ced28b3e068f17d97f3fd4fb Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Sat, 5 Feb 2022 13:50:33 +0100
Subject: Improvement: config registration form settings (#3932)

* wip

* wip

* i18n en-us

* phpcs fixes

* wip i18n

* wip i18n

* i18n ignore en-us

* delete registration.help

* i18n de

* JS Syntax fixed for config.js

* JavaScript lint fixes config.js

* fix typo in i18n/de

* improve the JS

* improve HTML

* phpcs fixes

* update main.js from edge

* fix i18n comments

* Update app/i18n/fr/admin.php

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
---
 app/views/configure/system.phtml | 71 ++++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 29 deletions(-)

(limited to 'app/views/configure')

diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml
index 7f355d156..6f094e06b 100644
--- a/app/views/configure/system.phtml
+++ b/app/views/configure/system.phtml
@@ -30,61 +30,72 @@
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="max-registrations"><?= _t('admin.system.registration.number') ?></label>
+			<label class="group-name" for="max-feeds"><?= _t('admin.system.max-feeds') ?></label>
 			<div class="group-controls">
-				<input type="number" id="max-registrations" name="max-registrations" value="<?= FreshRSS_Context::$system_conf->limits['max_registrations'] ?>" min="0"
-					data-leave-validation="<?= FreshRSS_Context::$system_conf->limits['max_registrations'] ?>"/>
-				<p class="help"><?= _i('help') ?> <?= _t('admin.system.registration.help') ?></p>
+				<input type="number" id="max-feeds" name="max-feeds" value="<?= FreshRSS_Context::$system_conf->limits['max_feeds'] ?>" min="1"
+					data-leave-validation="<?= FreshRSS_Context::$system_conf->limits['max_feeds'] ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
+			<label class="group-name" for="max-categories"><?= _t('admin.system.max-categories') ?></label>
 			<div class="group-controls">
-				<?php
-					$number = count(listUsers());
-					echo ($number > 1 ? _t('admin.user.numbers', $number) : _t('admin.user.number', $number));
-				?>
+				<input type="number" id="max-categories" name="max-categories" value="<?= FreshRSS_Context::$system_conf->limits['max_categories'] ?>" min="1"
+					data-leave-validation="<?= FreshRSS_Context::$system_conf->limits['max_categories'] ?>"/>
 			</div>
 		</div>
 
 		<div class="form-group">
+			<label class="group-name" for="cookie-duration"><?= _t('admin.system.cookie-duration.number') ?></label>
 			<div class="group-controls">
-				<label class="checkbox" for="force-email-validation">
-					<input
-						type="checkbox"
-						name="force-email-validation"
-						id="force-email-validation"
-						value="1"
-						<?= FreshRSS_Context::$system_conf->force_email_validation ? 'checked="checked"' : '' ?>
-						data-leave-validation="<?= FreshRSS_Context::$system_conf->force_email_validation ?>"
-					/>
-					<?= _t('admin.system.force_email_validation') ?>
-				</label>
+				<input type="number" id="cookie-duration" name="cookie-duration" value="<?= FreshRSS_Context::$system_conf->limits['cookie_duration'] ?>" min="0"
+					data-leave-validation="<?= FreshRSS_Context::$system_conf->limits['cookie_duration'] ?>"/>
+				<p class="help"><?= _i('help') ?> <?= _t('admin.system.cookie-duration.help') ?></p>
 			</div>
 		</div>
 
+		<legend><?= _t('admin.system.registration.title') ?></legend>
+
 		<div class="form-group">
-			<label class="group-name" for="max-feeds"><?= _t('admin.system.max-feeds') ?></label>
+			<label class="group-name" for="max-registrations-select"><?= _t('admin.system.registration.select.label') ?></label>	
 			<div class="group-controls">
-				<input type="number" id="max-feeds" name="max-feeds" value="<?= FreshRSS_Context::$system_conf->limits['max_feeds'] ?>" min="1"
-					data-leave-validation="<?= FreshRSS_Context::$system_conf->limits['max_feeds'] ?>"/>
+				<select class="select-input-changer" name="" data-name="max-registrations">
+					<option value="1" <?= FreshRSS_Context::$system_conf->limits['max_registrations'] == 1 ? 'selected = "selected"' : ''; ?> data-input-visible="false"><?= _t('admin.system.registration.select.option.noform') ?></option>
+					<option value="0" <?= FreshRSS_Context::$system_conf->limits['max_registrations'] == 0 ? 'selected = "selected"' : ''; ?> data-input-visible="false"><?= _t('admin.system.registration.select.option.nolimit') ?></option>
+					<option value="2" <?= FreshRSS_Context::$system_conf->limits['max_registrations'] > 1 ? 'selected = "selected"' : ''; ?> data-input-visible="true"><?= _t('admin.system.registration.select.option.setaccountsnumber') ?></option>
+				</select>
+			</div>
+		</div>
+
+		<div class="form-group" id="max-registrations-block">
+			<label class="group-name" for="max-registrations"><?= _t('admin.system.registration.number') ?></label>
+			<div class="group-controls">
+				<?php $number = count(listUsers()); ?>
+				<input type="number" id="max-registrations-input" name="" value="<?= FreshRSS_Context::$system_conf->limits['max_registrations'] > 1 ? FreshRSS_Context::$system_conf->limits['max_registrations'] : $number + 1; ?>" min="2"
+					data-leave-validation="<?= FreshRSS_Context::$system_conf->limits['max_registrations'] ?>" data-number="<?= $number ?>"/>
+				<span id="max-registrations-status-disabled">(= <?= _t('admin.system.registration.status.disabled') ?>)</span><span id="max-registrations-status-enabled">(= <?= _t('admin.system.registration.status.enabled') ?>)</span>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="max-categories"><?= _t('admin.system.max-categories') ?></label>
 			<div class="group-controls">
-				<input type="number" id="max-categories" name="max-categories" value="<?= FreshRSS_Context::$system_conf->limits['max_categories'] ?>" min="1"
-					data-leave-validation="<?= FreshRSS_Context::$system_conf->limits['max_categories'] ?>"/>
+				<?= ($number > 1 ? _t('admin.user.numbers', $number) : _t('admin.user.number', $number)); ?>
 			</div>
 		</div>
 
 		<div class="form-group">
-			<label class="group-name" for="cookie-duration"><?= _t('admin.system.cookie-duration.number') ?></label>
 			<div class="group-controls">
-				<input type="number" id="cookie-duration" name="cookie-duration" value="<?= FreshRSS_Context::$system_conf->limits['cookie_duration'] ?>" min="0"
-					data-leave-validation="<?= FreshRSS_Context::$system_conf->limits['cookie_duration'] ?>"/>
-				<p class="help"><?= _i('help') ?> <?= _t('admin.system.cookie-duration.help') ?></p>
+				<label class="checkbox" for="force-email-validation">
+					<input
+						type="checkbox"
+						name="force-email-validation"
+						id="force-email-validation"
+						value="1"
+						<?= FreshRSS_Context::$system_conf->force_email_validation ? 'checked="checked"' : '' ?>
+						data-leave-validation="<?= FreshRSS_Context::$system_conf->force_email_validation ?>"
+					/>
+					<?= _t('admin.system.force_email_validation') ?>
+				</label>
 			</div>
 		</div>
 
@@ -96,3 +107,5 @@
 		</div>
 	</form>
 </main>
+
+<script src="../scripts/config.js?<?= @filemtime(PUBLIC_PATH . '/scripts/config.js') ?>"></script>
-- 
cgit v1.2.3