cleanup diag_resetstate.php

src/www/diag_resetstate.php

 <?php
 
 /*
-	Copyright (C) 2014 Deciso B.V.
+    Copyright (C) 2014-2016 Deciso B.V.
     Copyright (C) 2004-2009 Scott Ullrich
     Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
     All rights reserved.
@@ -31,24 +31,17 @@
 
 require_once("guiconfig.inc");
 
-function filter_flush_state_table()
-{
-	return mwexec('/sbin/pfctl -F state');
-}
-
-
 if ($_POST) {
     $savemsg = "";
     if ($_POST['statetable']) {
-		filter_flush_state_table();
-		if (isset($savemsg))
-			$savemsg .= " ";
-		$savemsg .= gettext("The state table has been flushed successfully.");
+        mwexec('/sbin/pfctl -F state');
+        $savemsg = gettext("The state table has been flushed successfully.");
     }
     if ($_POST['sourcetracking']) {
         mwexec("/sbin/pfctl -F Sources");
-		if (isset($savemsg))
+        if (isset($savemsg)) {
             $savemsg .= " <br />";
+        }
         $savemsg .= gettext("The source tracking table has been flushed successfully.");
     }
 }
@@ -68,12 +61,12 @@ include("head.inc");
         <div class="tab-content content-box col-xs-12">
           <div class="container-fluid tab-content">
             <div class="tab-pane active" id="system">
-								<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
               <?php if (isset($savemsg)) print_info_box($savemsg); ?>
               <form action="<?=$_SERVER['REQUEST_URI'];?>" method="post">
+                <br/>
                 <input name="statetable" type="checkbox" id="statetable" value="yes" checked="checked" />
                 <strong><?= gettext("Firewall state table"); ?></strong><br />
-			                      <span class="vexpl"><br />
+                <br />
                 <?=gettext("Resetting the state tables will remove all entries from " .
                 "the corresponding tables. This means that all open connections " .
                 "will be broken and will have to be re-established. This " .
@@ -81,15 +74,16 @@ include("head.inc");
                 "firewall and/or NAT rules, especially if there are IP protocol " .
                 "mappings (e.g. for PPTP or IPv6) with open connections."); ?><br />
                 <br />
-			                      </span><span class="vexpl"><?=gettext("The firewall will normally leave " .
+                <?=gettext("The firewall will normally leave " .
                 "the state tables intact when changing rules."); ?><br />
                 <br />
                 <?=gettext('Note: If you reset the firewall state table, the browser ' .
                 'session may appear to be hung after clicking "Reset". ' .
-			                      'Simply refresh the page to continue.'); ?></span></p>
+                'Simply refresh the page to continue.'); ?>
+                <br/><br/>
 
-									<?php if (isset($config['system']['lb_use_sticky'])): ?>
-									<p>
+<?php
+              if (isset($config['system']['lb_use_sticky'])): ?>
                 <input name="sourcetracking" type="checkbox" id="sourcetracking" value="yes" checked="checked" />
                 <strong><?= gettext("Firewall Source Tracking"); ?></strong><br />
                 <span class="vexpl"><br />
@@ -98,9 +92,11 @@ include("head.inc");
                 "will be cleared for all clients."); ?><br />
                 <br />
                 </span><span class="vexpl"><?=gettext("This does not clear active connection states, only source tracking."); ?><br />
-									</p>
-									<?php endif; ?>
+<?php
+              endif; ?>
+                <br/><br/>
                 <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Reset"); ?>" />
+                <br/><br/>
               </form>
             </div>
           </div>