(legacy) refactor system_advanced_sysctl.php

src/www/system_advanced_sysctl.php

 <?php
 
 /*
-	Copyright (C) 2014-2015 Deciso B.V.
-	Copyright (C) 2005-2007 Scott Ullrich
-	Copyright (C) 2008 Shrew Soft Inc
-	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
-	All rights reserved.
-
-	Redistribution and use in source and binary forms, with or without
-	modification, are permitted provided that the following conditions are met:
-
-	1. Redistributions of source code must retain the above copyright notice,
-	   this list of conditions and the following disclaimer.
-
-	2. Redistributions in binary form must reproduce the above copyright
-	   notice, this list of conditions and the following disclaimer in the
-	   documentation and/or other materials provided with the distribution.
-
-	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-	POSSIBILITY OF SUCH DAMAGE.
+  Copyright (C) 2014-2015 Deciso B.V.
+  Copyright (C) 2005-2007 Scott Ullrich
+  Copyright (C) 2008 Shrew Soft Inc
+  Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+  1. Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+
+  2. Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+  INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+  AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+  OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.
 */
 
 require_once("guiconfig.inc");
 require_once("system.inc");
 
-$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_advanced_sysctl.php');
-
-if (!is_array($config['sysctl']['item'])) {
+if (!isset($config['sysctl']['item']) || !is_array($config['sysctl']['item'])) {
     $config['sysctl']['item'] = array();
 }
-
 $a_tunable = &$config['sysctl']['item'];
 
-if (is_numericint($_GET['id'])) {
-    $id = $_GET['id'];
-}
-if (isset($_POST['id']) && is_numericint($_POST['id'])) {
-    $id = $_POST['id'];
-}
-
-$act = $_GET['act'];
-if (isset($_POST['act'])) {
-    $act = $_POST['act'];
-}
-
-if ($act == "edit") {
-    if ($a_tunable[$id]) {
+if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+    if (isset($_GET['id']) && isset($a_tunable[$_GET['id']])) {
+        $id = $_GET['id'];
+    }
+    if (isset($_GET['act'])) {
+        $act = $_GET['act'];
+    } else {
+        $act = null;
+    }
+    $pconfig = array();
+    if (isset($id)) {
         $pconfig['tunable'] = $a_tunable[$id]['tunable'];
         $pconfig['value'] = $a_tunable[$id]['value'];
         $pconfig['descr'] = $a_tunable[$id]['descr'];
+    } else {
+        $pconfig['tunable'] = null;
+        $pconfig['value'] = null;
+        $pconfig['descr'] = null;
     }
-}
-
-if ($act == "del") {
-    if ($a_tunable[$id]) {
-        if (!$input_errors) {
-            unset($a_tunable[$id]);
-            write_config();
-            mark_subsystem_dirty('sysctl');
-            header("Location: system_advanced_sysctl.php");
-            exit;
-        }
+} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    if (isset($_POST['id']) && isset($a_tunable[$_POST['id']])) {
+        $id = $_POST['id'];
+    }
+    if (isset($_POST['act'])) {
+        $act = $_POST['act'];
+    } else {
+        $act = null;
     }
-}
-
-if ($_POST) {
-    unset($input_errors);
     $pconfig = $_POST;
 
-    if ($_POST['apply']) {
-        $retval = 0;
+    if (isset($id) && $act == "del") {
+        unset($a_tunable[$id]);
+        write_config();
+        mark_subsystem_dirty('sysctl');
+        header("Location: system_advanced_sysctl.php");
+        exit;
+    } else if (!empty($pconfig['apply'])) {
         system_setup_sysctl();
-        $savemsg = get_std_save_message();
         clear_subsystem_dirty('sysctl');
-    }
-
-    if ($_POST['Submit'] == gettext("Save")) {
+        header("Location: system_advanced_sysctl.php");
+        exit;
+    } elseif (!empty($pconfig['Submit'])) {
         $tunableent = array();
+        $tunableent['tunable'] = $pconfig['tunable'];
+        $tunableent['value'] = $pconfig['value'];
+        $tunableent['descr'] = $pconfig['descr'];
 
-        $tunableent['tunable'] = $_POST['tunable'];
-        $tunableent['value'] = $_POST['value'];
-        $tunableent['descr'] = $_POST['descr'];
-
-        if (isset($id) && $a_tunable[$id]) {
+        if (isset($id)) {
             $a_tunable[$id] = $tunableent;
         } else {
             $a_tunable[] = $tunableent;
         }
 
         mark_subsystem_dirty('sysctl');
-
         write_config();
-
         header("Location: system_advanced_sysctl.php");
         exit;
     }
+
 }
 
-$pgtitle = array(gettext('System'), gettext('Settings'), gettext('Tunables'));
+legacy_html_escape_form_data($a_tunable);
 if ($act != 'edit') {
-	$main_buttons = array(
-		array('href' => 'system_advanced_sysctl.php?act=edit', 'label' => gettext('Add a new tunable')),
-	);
+    $main_buttons = array(
+        array('href' => 'system_advanced_sysctl.php?act=edit', 'label' => gettext('Add a new tunable')),
+    );
 }
 include("head.inc");
-
 ?>
 
 <body>
+<script type="text/javascript">
+$( document ).ready(function() {
+  // delete entry
+  $(".act_delete").click(function(event){
+    event.preventDefault();
+    var id = $(this).data('id');
+    BootstrapDialog.show({
+      type:BootstrapDialog.TYPE_INFO,
+      title: "<?= gettext("Tunable");?>",
+      message: "<?=gettext("Do you really want to delete this entry?");?>",
+      buttons: [{
+                label: "<?=gettext("No");?>",
+                action: function(dialogRef) {
+                    dialogRef.close();
+                }}, {
+                label: "<?=gettext("Yes");?>",
+                action: function(dialogRef) {
+                  $("#id").val(id);
+                  $("#action").val("del");
+                  $("#iform").submit()
+              }
+            }]
+    });
+  });
+});
+</script>
+
 <?php include("fbegin.inc"); ?>
 
 
 <!-- row -->
 <section class="page-content-main">
-	<div class="container-fluid">
-        <div class="row">
-            <form action="system_advanced_sysctl.php" method="post">
-				<?php
-                if (isset($input_errors) && count($input_errors) > 0) {
-                    print_input_errors($input_errors);
-                }
-                if (isset($savemsg)) {
-                    print_info_box($savemsg);
-                }
-                if (is_subsystem_dirty('sysctl') && ($act != "edit" )) {
-                    print_info_box_apply(gettext("The firewall tunables have changed.  You must apply the configuration to take affect."));
-                }
-                ?>
-			</form>
-
-            <section class="col-xs-12">
-                <div class="table-responsive content-box tab-content" style="overflow: auto;">
-                    <?php if ($act != "edit") :
-?>
-						<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="main area" class="table table-striped">
-							<thead>
-							<tr>
-								<th width="20%"><?=gettext("Tunable Name"); ?></th>
-								<th width="60%"><?=gettext("Description"); ?></th>
-								<th width="20%" colspan="2"><?=gettext("Value"); ?></th>
-							</tr>
-							</thead>
-
-							<tbody>
-							<?php $i = 0; foreach ($config['sysctl']['item'] as $tunable) :
+  <div class="container-fluid">
+    <div class="row">
+<?php
+        if (isset($savemsg)) {
+            print_info_box($savemsg);
+        }
+        if (is_subsystem_dirty('sysctl') && ($act != "edit" )) {
+            print_info_box_apply(gettext("The firewall tunables have changed.  You must apply the configuration to take affect."));
+        }
 ?>
+      <form action="system_advanced_sysctl.php" method="post" id="iform">
+        <input type="hidden" id="id" name="id" value="" />
+        <input type="hidden" id="action" name="act" value="" />
+      </form>
+      <section class="col-xs-12">
+        <div class="table-responsive content-box tab-content" style="overflow: auto;">
+<?php
+        if ($act != "edit") :?>
+          <table class="table table-striped">
+            <thead>
+              <tr>
+                <th><?=gettext("Tunable Name"); ?></th>
+                <th><?=gettext("Description"); ?></th>
+                <th><?=gettext("Value"); ?></th>
+                <th></th>
+              </tr>
+              </thead>
+              <tbody>
+<?php
+                $i = 0;
+                foreach ($a_tunable as $tunable) :?>
+                <tr>
+                  <td><?=$tunable['tunable']; ?></td>
+                  <td><?=$tunable['descr']; ?></td>
+                  <td>
+                    <?=$tunable['value']; ?>
+                    <?=$tunable['value'] == "default" ? "(" . get_default_sysctl_value($tunable['tunable']) . ")" : "";?>
+                  </td>
+                  <td>
+                    <a href="system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs">
+                        <span data-toggle="tooltip" data-placement="left" title="<?=gettext("Edit Tunable"); ?>" class="glyphicon glyphicon-pencil"></span>
+                    </a>
+                    <a id="del_<?=$i;?>" data-id="<?=$i;?>" title="<?=gettext("Delete Tunable"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
+                      <span class="glyphicon glyphicon-remove"></span>
+                    </a>
+                  </td>
+                </tr>
+<?php
+                $i++; endforeach; ?>
+              </tbody>
+            </table>
+<?php
+            else : ?>
+            <form action="system_advanced_sysctl.php" method="post">
+              <table class="table table-striped">
+                <thead>
+                  <tr>
+                    <th colspan="2" valign="top" class="listtopic"><?=gettext("Edit system tunable"); ?></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr>
+                    <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Tunable"); ?></td>
+                    <td>
+                      <input type="text" name="tunable" value="<?=$pconfig['tunable']; ?>" />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Description"); ?></td>
+                    <td>
+                      <textarea name="descr"><?=$pconfig['descr']; ?></textarea>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("Value"); ?></td>
+                    <td>
+                      <input name="value" type="text" value="<?=$pconfig['value']; ?>" />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>&nbsp;</td>
+                    <td>
+                      <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
+                      <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/system_advanced_sysctl.php');?>'" />
 
-							<tr>
-								<td class="listlr" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
-									<?php echo $tunable['tunable']; ?>
-								</td>
-								<td class="listr" align="left" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
-									<?php echo $tunable['descr']; ?>
-								</td>
-								<td class="listr" align="left" ondblclick="document.location='system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>';">
-									<?php echo $tunable['value']; ?>
-									<?php
-                                    if ($tunable['value'] == "default") {
-                                        echo "(" . get_default_sysctl_value($tunable['tunable']) . ")";
-                                    }
-                                    ?>
-								</td>
-								<td class="list nowrap">
-									<table border="0" cellspacing="0" cellpadding="1" summary="edit delete">
-										<tr>
-											<td valign="middle">
-												<a href="system_advanced_sysctl.php?act=edit&amp;id=<?=$i;?>" class="btn btn-default btn-xs">
-												    <span data-toggle="tooltip" data-placement="left" title="<?=gettext("Edit Tunable"); ?>" class="glyphicon glyphicon-pencil"></span>
-												</a>
-											</td>
-											<td valign="middle">
-												<a href="system_advanced_sysctl.php?act=del&amp;id=<?=$i;
-?>" onclick="return confirm('<?=gettext("Do you really want to delete this entry?"); ?>')" class="btn btn-default btn-xs">
-													<span data-toggle="tooltip" data-placement="left" title="<?=gettext("Delete Tunable"); ?>" class="glyphicon glyphicon-remove"></span>
-												</a>
-											</td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-							<?php $i++; endforeach; ?>
-							</tbody>
-						</table>
-			        <?php else : ?>
-						<form action="system_advanced_sysctl.php" method="post" name="iform" id="iform">
-							<table width="100%" border="0" cellpadding="6" cellspacing="0" summary="edit system tunable" class="table table-striped">
-								<thead>
-									<tr>
-										<th colspan="2" valign="top" class="listtopic"><?=gettext("Edit system tunable"); ?></th>
-									</tr>
-								</thead>
-								<tbody>
-									<tr>
-										<td width="22%" valign="top" class="vncellreq"><?=gettext("Tunable"); ?></td>
-										<td width="78%" class="vtable">
-											<input size="65" name="tunable" type="text" value="<?php echo $pconfig['tunable']; ?>" />
-										</td>
-									</tr>
-									<tr>
-										<td width="22%" valign="top" class="vncellreq"><?=gettext("Description"); ?></td>
-										<td width="78%" class="vtable">
-											<textarea name="descr"><?php echo $pconfig['descr']; ?></textarea>
-										</td>
-									</tr>
-									<tr>
-										<td width="22%" valign="top" class="vncellreq"><?=gettext("Value"); ?></td>
-										<td width="78%" class="vtable">
-											<input size="65" name="value" type="text" value="<?php echo $pconfig['value']; ?>" />
-										</td>
-									</tr>
-									<tr>
-										<td width="22%" valign="top">&nbsp;</td>
-										<td width="78%">
-											<input id="submit" name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save"); ?>" />
-											<input type="button" class="btn btn-default" value="<?=gettext("Cancel");
-?>" onclick="window.location.href='<?=$referer;?>'" />
-
-											<?php if (isset($id) && $a_tunable[$id]) :
-?>
-											<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
-											<?php
-endif; ?>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</form>
-					<?php
-endif; ?>
-                </div>
-            </section>
-        </div>
-    </div>
+<?php
+                      if (isset($id)) :?>
+                      <input name="id" type="hidden" value="<?=$id;?>" />
+<?php
+                      endif; ?>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </form>
+<?php
+            endif; ?>
+          </div>
+        </section>
+      </div>
+  </div>
 </section>
-
 <?php include("foot.inc");