diff options
| -rw-r--r-- | src/usr/local/www/js/pfSenseHelpers.js | 2 | ||||
| -rw-r--r-- | src/usr/local/www/services_ntpd_acls.php | 56 |
2 files changed, 33 insertions, 25 deletions
diff --git a/src/usr/local/www/js/pfSenseHelpers.js b/src/usr/local/www/js/pfSenseHelpers.js index 83cfd22..5e80fce 100644 --- a/src/usr/local/www/js/pfSenseHelpers.js +++ b/src/usr/local/www/js/pfSenseHelpers.js @@ -290,7 +290,7 @@ function delete_row(rowDelBtn) { var rowLabel; // If we are deleting row zero, we need to save/restore the label - if (rowDelBtn == "deleterow0") { + if ( (rowDelBtn == "deleterow0") && ((typeof retainhelp) == "undefined")) { rowLabel = $('#' + rowDelBtn).parent('div').parent('div').find('label').text(); } diff --git a/src/usr/local/www/services_ntpd_acls.php b/src/usr/local/www/services_ntpd_acls.php index bff2a94..5eb55f3 100644 --- a/src/usr/local/www/services_ntpd_acls.php +++ b/src/usr/local/www/services_ntpd_acls.php @@ -67,13 +67,15 @@ require_once("shaper.inc"); if (!is_array($config['ntpd'])) { $config['ntpd'] = array(); } + if (is_array($config['ntpd']['restrictions']) && is_array($config['ntpd']['restrictions']['row'])) { $networkacl = $config['ntpd']['restrictions']['row']; -} else { +} else { $networkacl = array('0' => array('acl_network' => '', 'mask' => '')); } if ($_POST) { + print_r($_POST); unset($input_errors); $pconfig = $_POST; @@ -116,21 +118,24 @@ if ($_POST) { } /* End ACL Flags */ - if (!is_ipaddr($networkacl[$x]['acl_network'])) { - $input_errors[] = gettext("A valid IP address must be entered for each row under Networks."); - } - if (is_ipaddr($networkacl[$x]['acl_network'])) { - if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { - $input_errors[] = gettext("A valid IPv4 netmask must be entered for each IPv4 row under Networks."); - } - } else if (function_exists("is_ipaddrv6")) { - if (!is_ipaddrv6($networkacl[$x]['acl_network'])) { - $input_errors[] = gettext("A valid IPv6 address must be entered for {$networkacl[$x]['acl_network']}."); - } else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { - $input_errors[] = gettext("A valid IPv6 netmask must be entered for each IPv6 row under Networks."); + if (isset($networkacl[$x]['notrap']) || isset($networkacl[$x]['kod']) || isset($networkacl[$x]['nomodify']) + || isset($networkacl[$x]['noquery']) || isset($networkacl[$x]['nopeer']) || isset($networkacl[$x]['noserve'])) { + if (!is_ipaddr($networkacl[$x]['acl_network'])) { + $input_errors[] = gettext("A valid IP address must be entered for each row under Networks."); + } else { + + if (is_ipaddr($networkacl[$x]['acl_network'])) { + if (!is_subnet($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { + $input_errors[] = gettext("A valid IPv4 netmask must be entered for each IPv4 row under Networks."); + } + } else if (function_exists("is_ipaddrv6")) { + if (!is_ipaddrv6($networkacl[$x]['acl_network'])) { + $input_errors[] = gettext("A valid IPv6 address must be entered for {$networkacl[$x]['acl_network']}."); + } else if (!is_subnetv6($networkacl[$x]['acl_network']."/".$networkacl[$x]['mask'])) { + $input_errors[] = gettext("A valid IPv6 netmask must be entered for each IPv6 row under Networks."); + } + } } - } else { - $input_errors[] = gettext("A valid IP address must be entered for each row under Networks."); } } else if (isset($networkacl[$x])) { unset($networkacl[$x]); @@ -277,35 +282,35 @@ foreach ($networkacl as $item) { null, $item['kod'] ))->setHelp('KOD'); - + $group->add(new Form_Checkbox( 'nomodify' . $counter, null, null, $item['nomodify'] ))->setHelp('nomodify'); - + $group->add(new Form_Checkbox( 'noquery' . $counter, null, null, $item['noquery'] ))->setHelp('noquery'); - + $group->add(new Form_Checkbox( 'noserve' . $counter, null, null, $item['noserve'] ))->setHelp('noserve'); - + $group->add(new Form_Checkbox( 'nopeer' . $counter, null, null, $item['nopeer'] ))->setHelp('nopeer'); - + $group->add(new Form_Checkbox( 'notrap' . $counter, null, @@ -318,9 +323,10 @@ foreach ($networkacl as $item) { 'Delete', null, 'fa-trash' - ))->addClass('btn-warning'); + ))->addClass('btn-warning btn-xs'); $group->addClass('repeatable'); + $section->add($group); $counter++; @@ -341,9 +347,11 @@ print($form); <script type="text/javascript"> //<![CDATA[ - // If this variable is declared, any help text will not be deleted when rows are added - // IOW the help text will appear on every row - retainhelp = true; +events.push(function(){ + retainhelp = false; + checkLastRow(); +}); +//]]> </script> <?php include("foot.inc"); |
