From b5d135de90e2c6ae1e1c07e1f6b6fc0bbf03f395 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sun, 10 Jan 2016 22:04:48 +0100
Subject: [PATCH] www: fix more apply vs. translation foo #431

---
 src/www/guiconfig.inc | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc
index f9c4309f1..05bc0e305 100644
--- a/src/www/guiconfig.inc
+++ b/src/www/guiconfig.inc
@@ -216,15 +216,24 @@ EOFnp;
 
 function print_info_box_apply($msg)
 {
-	$value = gettext('Apply changes');
+	$iface = !empty($_POST['if']) ? $_POST['if'] : (!empty($_GET['if']) ? $_GET['if'] : '');
+	$label = gettext('Apply changes');
+	$value = 'Apply changes';
 	$name= 'apply';
 
-	$savebutton = '<form action="' . $_SERVER['REQUEST_URI'] . '" method="post">';
-	$savebutton .= '<input name="' . $name . '" type="submit" class="btn btn-primary pull-right" id="' . $name . '" value="' . $value . '" />';
-	if (!empty($_POST['if'])) {
-		$savebutton .= '<input type="hidden" name="if" value="' . htmlspecialchars($_POST['if']) . '" />';
-	} elseif (!empty($_GET['if'])) {
-		$savebutton .= '<input type="hidden" name="if" value="' . htmlspecialchars($_GET['if']) . '" />';
+	$savebutton = sprintf('<form action="' . $_SERVER['REQUEST_URI'] . '" method="post">', $_SERVER['REQUEST_URI']);
+	$savebutton .= sprintf(
+		'<button type="submit" name="%s" id="%s" class="btn btn-primary pull-right" value="%s">%s</button>',
+		$name,
+		$name,
+		$value,
+		$label
+	);
+	if (!empty($iface)) {
+		$savebutton .= sprintf(
+			'<input type="hidden" name="if" value="%s"/>',
+			htmlspecialchars($iface)
+		);
 	}
 	$savebutton .= '</form>';