From 50c41d9bb2b1766feac984685bb2a954ab4799f3 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Wed, 1 Jan 2014 13:48:32 +0100
Subject: Détails multi-utilisateur
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/marienfressinaud/FreshRSS/issues/126
---
 app/views/configure/archiving.phtml | 4 ++--
 app/views/configure/feed.phtml      | 4 ++--
 app/views/configure/users.phtml     | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'app/views/configure')

diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index cbe3b086c..6e26ca81e 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -17,8 +17,8 @@
 		<div class="form-group">
 			<label class="group-name" for="keep_history_default"><?php echo Minz_Translate::t('keep_history'), ' ', Minz_Translate::t('by_feed'); ?></label>
 			<div class="group-controls">
-				<select class="number" name="keep_history_default" id="keep_history_default"><?php
-					foreach (array(-3 => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
+				<select class="number" name="keep_history_default" id="keep_history_default" required="required"><?php
+					foreach (array('' => '', 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . ($this->conf->keep_history_default == $v ? '" selected="selected' : '') . '">' . $t . ' </option>';
 					}
 				?></select> (<?php echo Minz_Translate::t('by_default'); ?>)
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index e738ab64f..a0fe39f8a 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -87,8 +87,8 @@
 		<div class="form-group">
 			<label class="group-name" for="keep_history"><?php echo Minz_Translate::t ('keep_history'); ?></label>
 			<div class="group-controls">
-				<select class="number" name="keep_history" id="keep_history"><?php
-					foreach (array(-3 => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
+				<select class="number" name="keep_history" id="keep_history" required="required"><?php
+					foreach (array('' => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
 						echo '<option value="' . $v . ($this->flux->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
 					}
 				?></select>
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 223f81e8d..d40a3ad5b 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -3,7 +3,7 @@
 <div class="post">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo Minz_Translate::t('back_to_rss_feeds'); ?></a>
 
-	<form method="post" action="<?php echo _url('users', 'id'); ?>">
+	<form method="post" action="<?php echo _url('users', 'auth'); ?>">
 		<legend><?php echo Minz_Translate::t('login_configuration'); ?></legend>
 
 		<div class="form-group">
@@ -34,20 +34,19 @@
 			</div>
 		</div>
 		<?php } ?>
-	</form>
 
 	<?php if (Minz_Configuration::isAdmin(Minz_Session::param('currentUser', '_'))) { ?>
 
-	<form method="post" action="<?php echo _url('users', 'auth'); ?>">
 		<legend><?php echo Minz_Translate::t('auth_type'); ?></legend>
 
 		<div class="form-group">
 			<label class="group-name" for="auth_type"><?php echo Minz_Translate::t('auth_type'); ?></label>
 			<div class="group-controls">
-				<select id="auth_type" name="auth_type">
+				<select id="auth_type" name="auth_type" required="required">
+					<option value=""></option>
 					<option value="none"<?php echo Minz_Configuration::authType() === 'none' ? ' selected="selected"' : ''; ?>><?php echo Minz_Translate::t('auth_none'); ?></option>
 					<option value="http_auth"<?php echo Minz_Configuration::authType() === 'http_auth' ? ' selected="selected"' : '', httpAuthUser() == '' ? ' disabled="disabled"' : ''; ?>>HTTP Auth</option>
-					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : ''; ?>>Mozilla Persona</option>
+					<option value="persona"<?php echo Minz_Configuration::authType() === 'persona' ? ' selected="selected"' : '', $this->conf->mail_login == '' ? ' disabled="disabled"' : ''; ?>>Mozilla Persona</option>
 				</select>
 				<code>$_SERVER['REMOTE_USER'] = `<?php echo httpAuthUser(); ?>`</code>
 			</div>
-- 
cgit v1.2.3