From 7261a551e908229ea4625b6645d490712570e71c Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 17 Jan 2014 22:47:21 +0100
Subject: Essaye d'éviter les problèmes d'auto-remplissage des champs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Corrige
https://github.com/marienfressinaud/FreshRSS/issues/327#issuecomment-32635516
---
 app/Controllers/feedController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/Controllers/feedController.php')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index 2d7c0ab43..d2117f665 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -30,8 +30,8 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 				$cat = $def_cat->id ();
 			}
 
-			$user = Minz_Request::param ('username');
-			$pass = Minz_Request::param ('password');
+			$user = Minz_Request::param ('http_user');
+			$pass = Minz_Request::param ('http_pass');
 			$params = array ();
 
 			$transactionStarted = false;
-- 
cgit v1.2.3


From fb908d45577cd0f156104eb23b4b9859d40b6da2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 18 Jan 2014 00:34:46 +0100
Subject: Corrige rafraîchissement automatique après mise-à-jour avec Persona
 ou formulaire
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Corrige
https://github.com/marienfressinaud/FreshRSS/issues/327#issuecomment-31958851
---
 app/Controllers/feedController.php      | 1 +
 app/views/helpers/javascript_vars.phtml | 3 ---
 p/i/install.php                         | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/Controllers/feedController.php')

diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php
index d2117f665..c40b3c400 100755
--- a/app/Controllers/feedController.php
+++ b/app/Controllers/feedController.php
@@ -164,6 +164,7 @@ class FreshRSS_feed_Controller extends Minz_ActionController {
 		$feedDAO = new FreshRSS_FeedDAO ();
 		$entryDAO = new FreshRSS_EntryDAO ();
 
+		Minz_Session::_param('actualize_feeds', false);
 		$id = Minz_Request::param ('id');
 		$force = Minz_Request::param ('force', false);
 
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 3fd5580f4..0ecdc1bca 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -42,6 +42,3 @@ echo 'str_confirmation="', Minz_Translate::t('confirm_action'), '"', ",\n";
 
 $autoActualise = Minz_Session::param('actualize_feeds', false);
 echo 'auto_actualize_feeds=', $autoActualise ? 'true' : 'false', ";\n";
-if ($autoActualise) {
-	Minz_Session::_param('actualize_feeds', false);
-}
diff --git a/p/i/install.php b/p/i/install.php
index 294231fc0..18dfc1449 100644
--- a/p/i/install.php
+++ b/p/i/install.php
@@ -817,7 +817,7 @@ function printStep2 () {
 		<div class="form-group">
 			<label class="group-name" for="passwordPlain"><?php echo _t('password_form'); ?></label>
 			<div class="group-controls">
-				<input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" />
+				<input type="password" id="passwordPlain" name="passwordPlain" pattern=".{7,}" autocomplete="off" />
 				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
 		</div>
-- 
cgit v1.2.3