From 08f303203418306290d8393f0a77fcba4fab70d5 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Wed, 18 Jun 2014 08:21:27 -0300
Subject: Change the option for webconfig login autocomplete from opt-in to
 opt-out, also bump config version and write a function to keep the current
 status on upgrades

---
 etc/inc/authgui.inc        | 4 ++--
 etc/inc/globals.inc        | 2 +-
 etc/inc/upgrade_config.inc | 9 +++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index 11d4d45..cda6ef3 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -264,9 +264,9 @@ $have_cookies = isset($_COOKIE["cookie_test"]);
 					$nifty_background = "#999";
 					print_info_box(gettext("You are accessing this router by an IP address not configured locally, which may be forwarded by NAT or other means. <br /><br />If you did not setup this forwarding, you may be the target of a man-in-the-middle attack.")); 
 				}
-				$noautocomplete = isset($config['system']['webgui']['noautocomplete']) ? 'autocomplete="off"' : '';
+				$loginautocomplete = isset($config['system']['webgui']['loginautocomplete']) ? '' : 'autocomplete="off"';
 			?>
-			<form id="iform" name="iform" method="post" <?= $noautocomplete ?> action="<?=$_SERVER['SCRIPT_NAME'];?>">
+			<form id="iform" name="iform" method="post" <?= $loginautocomplete ?> action="<?=$_SERVER['SCRIPT_NAME'];?>">
 				<h1>&nbsp;</h1>
 				<div id="inputerrors"><?=$_SESSION['Login_Error'];?></div>
 				<p>
diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc
index 4127050..e34a681 100644
--- a/etc/inc/globals.inc
+++ b/etc/inc/globals.inc
@@ -73,7 +73,7 @@ $g = array(
 	"disablecrashreporter" => false,
 	"crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php",
 	"debug" => false,
-	"latest_config" => "10.7",
+	"latest_config" => "10.8",
 	"nopkg_platforms" => array("cdrom"),
 	"minimum_ram_warning" => "101",
 	"minimum_ram_warning_text" => "128 MB",
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index c33deb1..7bf5505 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3333,4 +3333,13 @@ function upgrade_106_to_107() {
 	}
 }
 
+function upgrade_107_to_108() {
+	global $config;
+
+	if (isset($config['system']['webgui']['noautocomplete']))
+		unset($config['system']['webgui']['noautocomplete']);
+	else
+		$config['system']['webgui']['loginautocomplete'] = true;
+}
+
 ?>
-- 
cgit v1.1