(legacy) refactor services_dnsmasq_edit.php

(cherry picked from commit 674fa982)

src/www/services_dnsmasq_edit.php

 <?php
 
 /*
-	Copyright (C) 2014-2015 Deciso B.V.
+    Copyright (C) 2014-2016 Deciso B.V.
     Copyright (C) 2003-2004 Bob Zoller <bob@kludgebox.com> and Manuel Kasper <mk@neon1.net>.
     All rights reserved.
 
@@ -36,267 +36,258 @@ function hostcmp($a, $b)
     return strcasecmp($a['host'], $b['host']);
 }
 
-function hosts_sort()
-{
-        global $config;
-
-        if (!isset($config['dnsmasq']['hosts'])) {
-                return;
-	}
-
-        usort($config['dnsmasq']['hosts'], "hostcmp");
-}
-
-$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
-
-if (!is_array($config['dnsmasq']['hosts']))
+if (empty($config['dnsmasq']['hosts']) || !is_array($config['dnsmasq']['hosts'])) {
     $config['dnsmasq']['hosts'] = array();
+}
 
 $a_hosts = &$config['dnsmasq']['hosts'];
 
-if (is_numericint($_GET['id']))
+if ($_SERVER['REQUEST_METHOD'] === 'GET') {
+    if (isset($_GET['id']) && !empty($a_hosts[$_GET['id']])) {
         $id = $_GET['id'];
-if (isset($_POST['id']) && is_numericint($_POST['id']))
-	$id = $_POST['id'];
-
-if (isset($id) && $a_hosts[$id]) {
-	$pconfig['host'] = $a_hosts[$id]['host'];
-	$pconfig['domain'] = $a_hosts[$id]['domain'];
-	$pconfig['ip'] = $a_hosts[$id]['ip'];
-	$pconfig['descr'] = $a_hosts[$id]['descr'];
-	$pconfig['aliases'] = $a_hosts[$id]['aliases'];
-}
-
-if ($_POST) {
+    }
+    $config_copy_fieldnames = array('host', 'domain', 'ip', 'descr', 'aliases');
+    foreach ($config_copy_fieldnames as $fieldname) {
+        if (isset($id) && isset($a_hosts[$id][$fieldname])) {
+            $pconfig[$fieldname] = $a_hosts[$id][$fieldname];
+        } else {
+            $pconfig[$fieldname] = null;
+        }
+    }
 
-	unset($input_errors);
+} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    if (isset($_POST['id']) && !empty($a_hosts[$_POST['id']])) {
+        $id = $_POST['id'];
+    }
+    $input_errors = array();
     $pconfig = $_POST;
 
+    $pconfig['aliases'] =  array();
+    if (isset($pconfig['aliases_host'])) {
+        $pconfig['aliases']['item'] = array();
+        foreach ($pconfig['aliases_host'] as $opt_seq => $opt_host) {
+            if (!empty($opt_host)) {
+                $pconfig['aliases']['item'][] = array('host' => $opt_host,
+                                                      'domain' => $pconfig['aliases_domain'][$opt_seq],
+                                                      'description' => $pconfig['aliases_description'][$opt_seq]
+                                                      );
+            }
+        }
+    }
+
     /* input validation */
     $reqdfields = explode(" ", "domain ip");
     $reqdfieldsn = array(gettext("Domain"),gettext("IP address"));
 
-	do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
+    do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
 
-	if (($_POST['host'] && !is_hostname($_POST['host'])))
+    if (!empty($pconfig['host']) && !is_hostname($pconfig['host'])) {
         $input_errors[] = gettext("The hostname can only contain the characters A-Z, 0-9 and '-'.");
-
-	if (($_POST['domain'] && !is_domain($_POST['domain'])))
+    }
+    if (!empty($pconfig['domain']) && !is_domain($pconfig['domain'])) {
         $input_errors[] = gettext("A valid domain must be specified.");
+    }
 
-	if (($_POST['ip'] && !is_ipaddr($_POST['ip'])))
+    if (!empty($pconfig['ip']) && !is_ipaddr($pconfig['ip'])) {
         $input_errors[] = gettext("A valid IP address must be specified.");
-
-	/* collect aliases */
-	$aliases = array();
-	foreach ($_POST as $key => $value) {
-		$entry = '';
-		if (!substr_compare('aliashost', $key, 0, 9)) {
-			$entry = substr($key, 9);
-			$field = 'host';
-		}
-		elseif (!substr_compare('aliasdomain', $key, 0, 11)) {
-			$entry = substr($key, 11);
-			$field = 'domain';
     }
-		elseif (!substr_compare('aliasdescription', $key, 0, 16)) {
-			$entry = substr($key, 16);
-			$field = 'description';
-		}
-		if (ctype_digit($entry)) {
-			$aliases[$entry][$field] = $value;
-		}
-	}
-	$pconfig['aliases']['item'] = $aliases;
+
 
     /* validate aliases */
-	foreach ($aliases as $idx => $alias) {
-		$aliasreqdfields = array('aliasdomain' . $idx);
+    foreach ($pconfig['aliases']['item'] as $idx => $alias) {
+        $aliasreqdfields = array('domain');
         $aliasreqdfieldsn = array(gettext("Alias Domain"));
 
-		//var_dump(array('fields' => $aliasreqdfields, 'names' => $aliasreqdfieldsn, 'alias' => $alias));
-		do_input_validation($_POST, $aliasreqdfields, $aliasreqdfieldsn, $input_errors);
-		if (($alias['host'] && !is_hostname($alias['host']))) {
+        do_input_validation($alias, $aliasreqdfields, $aliasreqdfieldsn, $input_errors);
+        if (!empty($alias['host']) && !is_hostname($alias['host'])) {
             $input_errors[] = gettext("Hostnames in alias list can only contain the characters A-Z, 0-9 and '-'.");
         }
-		if (($alias['domain'] && !is_domain($alias['domain']))) {
+        if (!empty($alias['domain']) && !is_domain($alias['domain'])) {
             $input_errors[] = gettext("A valid domain must be specified in alias list.");
         }
     }
 
     /* check for overlaps */
     foreach ($a_hosts as $hostent) {
-		if (isset($id) && ($a_hosts[$id]) && ($a_hosts[$id] === $hostent))
+        if (isset($id) && $a_hosts[$id] === $hostent) {
             continue;
-
-		if (($hostent['host'] == $_POST['host']) && ($hostent['domain'] == $_POST['domain'])
-			&& ((is_ipaddrv4($hostent['ip']) && is_ipaddrv4($_POST['ip'])) || (is_ipaddrv6($hostent['ip']) && is_ipaddrv6($_POST['ip'])))) {
+        }
+        if (($hostent['host'] == $pconfig['host']) && ($hostent['domain'] == $pconfig['domain'])
+          && ((is_ipaddrv4($hostent['ip']) && is_ipaddrv4($pconfig['ip'])) || (is_ipaddrv6($hostent['ip']) && is_ipaddrv6($pconfig['ip'])))) {
             $input_errors[] = gettext("This host/domain already exists.");
             break;
         }
     }
 
-	if (!$input_errors) {
+    if (count($input_errors) == 0) {
         $hostent = array();
-		$hostent['host'] = $_POST['host'];
-		$hostent['domain'] = $_POST['domain'];
-		$hostent['ip'] = $_POST['ip'];
-		$hostent['descr'] = $_POST['descr'];
-		$hostent['aliases']['item'] = $aliases;
+        $hostent['host'] = $pconfig['host'];
+        $hostent['domain'] = $pconfig['domain'];
+        $hostent['ip'] = $pconfig['ip'];
+        $hostent['descr'] = $pconfig['descr'];
+        $hostent['aliases'] = $pconfig['aliases'];
 
-		if (isset($id) && $a_hosts[$id])
+        if (isset($id)) {
             $a_hosts[$id] = $hostent;
-		else
+        } else {
             $a_hosts[] = $hostent;
-		hosts_sort();
-
+        }
+        usort($config['dnsmasq']['hosts'], "hostcmp");
         mark_subsystem_dirty('hosts');
-
         write_config();
-
         header("Location: services_dnsmasq.php");
         exit;
     }
 }
 
-$service_hook = 'dnsmasq';
 
-include("head.inc");
 
+$service_hook = 'dnsmasq';
+legacy_html_escape_form_data($pconfig);
+include("head.inc");
 ?>
 
 <body>
 <?php include("fbegin.inc"); ?>
-
-<script type="text/javascript" src="/javascript/row_helper.js"></script>
-
 <script type="text/javascript">
-//<![CDATA[
-	rowname[0] = "aliashost";
-	rowtype[0] = "textbox";
-	rowsize[0] = "20";
-	rowname[1] = "aliasdomain";
-	rowtype[1] = "textbox";
-	rowsize[1] = "20";
-	rowname[2] = "aliasdescription";
-	rowtype[2] = "textbox";
-	rowsize[2] = "20";
-//]]>
+  $( document ).ready(function() {
+    /**
+     *  Aliases
+     */
+    function removeRow() {
+        if ( $('#aliases_table > tbody > tr').length == 1 ) {
+            $('#aliases_table > tbody > tr:last > td > input').each(function(){
+              $(this).val("");
+            });
+        } else {
+            $(this).parent().parent().remove();
+        }
+    }
+    // add new detail record
+    $("#addNew").click(function(){
+        // copy last row and reset values
+        $('#aliases_table > tbody').append('<tr>'+$('#aliases_table > tbody > tr:last').html()+'</tr>');
+        $('#aliases_table > tbody > tr:last > td > input').each(function(){
+          $(this).val("");
+        });
+        $(".act-removerow").click(removeRow);
+    });
+    $(".act-removerow").click(removeRow);
+  });
 </script>
 
-
-	<section class="page-content-main">
-
+<section class="page-content-main">
   <div class="container-fluid">
-
     <div class="row">
       <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
-
       <section class="col-xs-12">
-
         <div class="content-box">
-
-                        <form action="services_dnsmasq_edit.php" method="post" name="iform" id="iform">
-
+          <form method="post" name="iform" id="iform">
             <div class="table-responsive">
-					<table class="table table-striped table-sort">
-									<tr>
-										<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit DNS Forwarder entry");?></td>
-									</tr>
+              <table class="table table-striped">
                 <tr>
-					                  <td width="22%" valign="top" class="vncell"><?=gettext("Host");?></td>
-					                  <td width="78%" class="vtable">
-					                    <input name="host" type="text" class="formfld" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>" />
-					                    <br /> <span class="vexpl"><?=gettext("Name of the host, without".
-					                   " domain part"); ?><br />
-					                   <?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em></span></td>
+                  <td width="22%"><strong><?=gettext("Edit DNS Forwarder entry");?></strong></td>
+                  <td width="78%" align="right">
+                    <small><?=gettext("full help"); ?> </small>
+                    <i class="fa fa-toggle-off text-danger"  style="cursor: pointer;" id="show_all_help_page" type="button"></i></a>
+                  </td>
                 </tr>
                 <tr>
-					                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Domain");?></td>
-					                  <td width="78%" class="vtable">
-					                    <input name="domain" type="text" class="formfld" id="domain" size="40" value="<?=htmlspecialchars($pconfig['domain']);?>" />
-					                    <br /> <span class="vexpl"><?=gettext("Domain of the host"); ?><br />
-					                   <?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em></span></td>
+                  <td><a id="help_for_host" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Host");?></td>
+                  <td>
+                    <input name="host" type="text" id="host" value="<?=$pconfig['host'];?>" />
+                    <div class="hidden" for="help_for_host">
+                      <?=gettext("Name of the host, without"." domain part"); ?><br />
+                      <?=gettext("e.g."); ?> <em><?=gettext("myhost"); ?></em>
+                    </div>
+                  </td>
                 </tr>
                 <tr>
-					                  <td width="22%" valign="top" class="vncellreq"><?=gettext("IP address");?></td>
-					                  <td width="78%" class="vtable">
-					                    <input name="ip" type="text" class="formfld" id="ip" size="40" value="<?=htmlspecialchars($pconfig['ip']);?>" />
-					                    <br /> <span class="vexpl"><?=gettext("IP address of the host"); ?><br />
-					                   <?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em></span></td>
+                  <td><a id="help_for_domain" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Domain");?></td>
+                  <td>
+                    <input name="domain" type="text" id="domain" value="<?=$pconfig['domain'];?>" />
+                    <div class="hidden" for="help_for_domain">
+                      <?=gettext("Domain of the host"); ?><br />
+                      <?=gettext("e.g."); ?> <em><?=gettext("example.com"); ?></em>
+                    </div>
+                  </td>
                 </tr>
                 <tr>
-					                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
-					                  <td width="78%" class="vtable">
-					                    <input name="descr" type="text" class="formfld" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" />
-					                    <br /> <span class="vexpl"><?=gettext("You may enter a description here".
-					                   " for your reference (not parsed).");?></span></td>
+                  <td><a id="help_for_ip" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("IP address");?></td>
+                  <td>
+                    <input name="ip" type="text" id="ip" value="<?=$pconfig['ip'];?>" />
+                    <div class="hidden" for="help_for_ip">
+                      <?=gettext("IP address of the host"); ?><br />
+                      <?=gettext("e.g."); ?> <em>192.168.100.100</em> <?=gettext("or"); ?> <em>fd00:abcd::1</em><
+                    </div>
+                  </td>
                 </tr>
                 <tr>
-					                  <td width="22%" valign="top" class="vncell"><div id="addressnetworkport"><?=gettext("Aliases"); ?></div></td>
-					                  <td width="78%" class="vtable">
-					                    <table id="maintable" summary="aliases">
-					                      <tbody>
-					                        <tr>
-					                          <td colspan="4">
-					                            <div style="padding:5px; margin-top: 16px; margin-bottom: 16px; border:1px dashed #000066; background-color: #ffffff; color: #000000; font-size: 8pt;" id="itemhelp">
-					                              <?=gettext("Enter additional names for this host."); ?>
+                  <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
+                  <td>
+                    <input name="descr" type="text" id="descr" value="<?=$pconfig['descr'];?>" />
+                    <div class="hidden" for="help_for_descr">
+                      <?=gettext("You may enter a description here"." for your reference (not parsed).");?>
                     </div>
                   </td>
                 </tr>
                 <tr>
-					                          <td><div id="onecolumn"><?=gettext("Host");?></div></td>
-					                          <td><div id="twocolumn"><?=gettext("Domain");?></div></td>
-					                          <td><div id="threecolumn"><?=gettext("Description");?></div></td>
+                  <td><a id="help_for_alias" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Aliases"); ?></td>
+                  <td>
+                    <table class="table table-striped table-condensed" id="aliases_table">
+                      <thead>
+                        <tr>
+                          <th></th>
+                          <th id="detailsHeading1"><?=gettext("Host"); ?></th>
+                          <th id="detailsHeading3"><?=gettext("Domain"); ?></th>
+                          <th id="updatefreqHeader" ><?=gettext("Description");?></th>
                         </tr>
-					                        <?php
-					                          $counter = 0;
-					                          if (isset($pconfig['aliases']['item'])):
-					                            foreach($pconfig['aliases']['item'] as $item):
-					                              $host = $item['host'];
-					                              $domain = $item['domain'];
-					                              $description = $item['description'];
-					                        ?>
+                      </thead>
+                      <tbody>
+<?php
+                      if (empty($pconfig['aliases']['item'])) {
+                          $aliases = array();
+                          $aliases[] = array('number' => null, 'value' => null, 'type' => null);
+                      } else {
+                          $aliases = $pconfig['aliases']['item'];
+                      }
+                      foreach($aliases as $item):?>
                         <tr>
                           <td>
-					                            <input autocomplete="off" name="aliashost<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliashost<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($host);?>" />
+                            <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
                           </td>
                           <td>
-					                            <input autocomplete="off" name="aliasdomain<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdomain<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($domain);?>" />
+                            <input name="aliases_host[]" type="text" value="<?=$item['host'];?>" />
                           </td>
                           <td>
-					                            <input name="aliasdescription<?php echo $counter; ?>" type="text" class="formfld unknown" id="aliasdescription<?php echo $counter; ?>" size="20" value="<?=htmlspecialchars($description);?>" />
+                            <input name="aliases_domain[]" type="text" value="<?=$item['domain'];?>" />
                           </td>
                           <td>
-					                            <a onclick="removeRow(this); return false;" href="#" title="<?=gettext("remove this entry"); ?>">
-					                            <div style="cursor:pointer;" class="act-removerow btn btn-default btn-xs" alt="remove"><span class="glyphicon glyphicon-minus"></span></div>
-					                            </a>
+                            <input name="aliases_description[]" type="text" value="<?=$item['description'];?>" />
                           </td>
                         </tr>
-					                        <?php
-					                              $counter++;
-					                            endforeach;
-					                          endif;
-					                        ?>
+<?php
+                      endforeach;?>
                       </tbody>
+                      <tfoot>
+                        <tr>
+                          <td colspan="4">
+                            <div id="addNew" style="cursor:pointer;" class="btn btn-default btn-xs" alt="add"><span class="glyphicon glyphicon-plus"></span></div>
+                          </td>
+                        </tr>
+                      </tfoot>
                     </table>
-					                    <a onclick="javascript:addRowTo('maintable', 'formfldalias'); return false;" href="#" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-plus"></span></a>
-					                    <script type="text/javascript">
-					                    //<![CDATA[
-					                      field_counter_js = 3;
-					                      rows = 1;
-					                      totalrows = <?php echo $counter; ?>;
-					                      loaded = <?php echo $counter; ?>;
-					                    //]]>
-					                    </script>
+                    <div class="hidden" for="help_for_alias">
+                      <?=gettext("Enter additional names for this host."); ?>
+                    </div>
                   </td>
                 </tr>
                 <tr>
-					                  <td width="22%" valign="top">&nbsp;</td>
-					                  <td width="78%">
+                  <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='<?=$referer;?>'" />
-					                    <?php if (isset($id) && $a_hosts[$id]): ?>
+                    <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');?>'" />
+                    <?php if (isset($id)): ?>
                     <input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
                     <?php endif; ?>
                   </td>
@@ -308,6 +299,6 @@ include("head.inc");
       </section>
     </div>
   </div>
-	</section>
+</section>
 
 <?php include("foot.inc"); ?>