From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 17 Oct 2013 15:58:45 +0000 (+0200)
Subject: firewall: Don't show rule activation checkbox when creating a rule.
X-Git-Tag: v2.15-beta1~190^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8d7dd3bd8aa6b849dd191588e63947aa4444007;p=people%2Fms%2Fipfire-2.x.git

firewall: Don't show rule activation checkbox when creating a rule.

Almost certainly, the user wants the new rule to be active when
it is created. We should put as few input elements as possible
on the rule creation page.
---

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index 47bee0189b..ef94db1453 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -1917,9 +1917,34 @@ END
 		}
 
 		print<<END;
-		</table><table width='100%'>
-		<tr><td width='1%'><input type='checkbox' name='ACTIVE' value='ON' $checked{'ACTIVE'}{'ON'}></td><td>$Lang::tr{'fwdfw rule activate'}</td></tr>
-		<tr><td width='1%'><input type='checkbox' name='LOG' value='ON'  $checked{'LOG'}{'ON'}  ></td><td>$Lang::tr{'fwdfw log rule'}</td></tr>
+		</table>
+		<table width='100%'>
+			<tr>
+END
+
+		if ($fwdfwsettings{'updatefwrule'} eq 'on') {
+			print <<END;
+				<td>
+					<input type='checkbox' name='ACTIVE' $checked{'ACTIVE'}{'ON'}>
+				</td>
+				<td>$Lang::tr{'fwdfw rule activate'}</td>
+END
+		} else {
+			print <<END;
+				<td colspan="2">
+					<input type="hidden" name="ACTIVE" value="ON">
+				</td>
+END
+		}
+
+		print <<END;
+			</tr>
+			<tr>
+				<td>
+					<input type='checkbox' name='LOG' value='ON' $checked{'LOG'}{'ON'}>
+				</td>
+				<td>$Lang::tr{'fwdfw log rule'}</td>
+			</tr>
 			<tr>
 				<td width='1%'>
 					<input type='checkbox' name='TIME' id="USE_TIME_CONSTRAINTS" value='ON' $checked{'TIME'}{'ON'}>