diff options
Diffstat (limited to 'src/usr/local')
| -rw-r--r-- | src/usr/local/www/diag_packet_capture.php | 4 | ||||
| -rw-r--r-- | src/usr/local/www/diag_routes.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/pkg_edit.php | 17 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/usr/local/www/diag_packet_capture.php b/src/usr/local/www/diag_packet_capture.php index f080649..466fcc4 100644 --- a/src/usr/local/www/diag_packet_capture.php +++ b/src/usr/local/www/diag_packet_capture.php @@ -292,7 +292,7 @@ require_once('classes/Form.class.php'); $form = new Form(false); // No button yet. We add those later depending on the required action -$section = new Form_Section('General Logging Options'); +$section = new Form_Section('Packet Capture Options'); $section->addInput(new Form_Select( 'interface', @@ -376,7 +376,7 @@ $section->addInput(new Form_Select( $section->addInput(new Form_Checkbox( 'dnsquery', 'Reverse DNS Lookup', - null, + 'Do reverse DNS lookup', $_POST['dnsquery'] ))->setHelp('This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses.' . '<br />' . 'This option can cause delays for large packet captures.'); diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php index b8049e1..161ad78 100644 --- a/src/usr/local/www/diag_routes.php +++ b/src/usr/local/www/diag_routes.php @@ -112,7 +112,7 @@ $form->addGlobal(new Form_Input( 'hidden', 1 )); -$section = new Form_Section('Traceroute'); +$section = new Form_Section('Routing Table Display Options'); $section->addInput(new Form_Checkbox( 'resolve', diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index 0e9a2dc..71c18e3 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -690,7 +690,11 @@ foreach ($pkg['fields']['field'] as $pkga) { // Create an input element. The format is slightly different depending on whether we are composing a group, // section, or advanced section. This is true for every element type case "input": - if($grouping) { + if (($pkga['encoding'] == 'base64') && !$get_from_post && !empty($value)) { + $value = base64_decode($value); + } + + if ($grouping) { $group->add(new Form_Input( $pkga['fieldname'], $pkga['fielddescr'], @@ -718,8 +722,12 @@ foreach ($pkg['fields']['field'] as $pkga) { break; case "password": + if (($pkga['encoding'] == 'base64') && !$get_from_post && !empty($value)) { + $value = base64_decode($value); + } + // Create a password element - if($grouping) { + if ($grouping) { $group->add(new Form_Input( $pkga['fieldname'], $pkga['fielddescr'], @@ -1325,6 +1333,11 @@ foreach ($pkg['fields']['field'] as $pkga) { } $type = $rowhelper['type']; + if ($type == "input" || $type == "password" || $type == "textarea" ) { + if (($rowhelper['encoding'] == 'base64') && !$get_from_post && !empty($value)) { + $value = base64_decode($value); + } + } $fieldname = $rowhelper['fieldname']; if ($rowhelper['size']) { |
