From e066fe071750a5901a110989ccac7d9c3d904678 Mon Sep 17 00:00:00 2001 From: Ermal Date: Mon, 26 Apr 2010 19:33:58 +0000 Subject: Fix test to not penalized variable value of 0. --- usr/local/www/firewall_virtual_ip_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index 096fb86..c5b35a2 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -216,7 +216,7 @@ if ($_POST) { mark_subsystem_dirty('vip'); write_config(); - if (!$id) + if (!$id && $id != 0) $id = count($a_vip) - 1; header("Location: firewall_virtual_ip.php?changes=mods&id={$id}"); exit; -- cgit v1.1 From 9f65abbfb6b2f82413fab9c51a3ba834ba72c4e0 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Tue, 27 Apr 2010 00:06:03 -0400 Subject: Allow mapping a select drop down to any area of config.xml --- usr/local/www/pkg_edit.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index 6c2fbde..054ec97 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -440,6 +440,40 @@ if ($pkg['tabs'] <> "") { } print("\n
\n" . fixup_string($pkga['description']) . "\n"); + } else if($pkga['type'] == "select_source") { + $fieldname = $pkga['fieldname']; + if (isset($pkga['multiple'])) { + $multiple = 'multiple="multiple"'; + $items = explode(',', $value); + $fieldname .= "[]"; + } + else { + $multiple = ''; + $items = array($value); + } + $size = (isset($pkga['size']) ? "size=\"{$pkga['size']}\"" : ''); + $onchange = (isset($pkga['onchange']) ? "onchange=\"{$pkga['onchange']}\"" : ''); + + print("\n
\n" . fixup_string($pkga['description']) . "\n"); } else if($pkga['type'] == "vpn_selection") { echo " "; } else if(rowtype[i] == 'select') { td.innerHTML=" "; + } else if(rowtype[i] == 'select_source') { + td.innerHTML=" "; } else { td.innerHTML=" "; } diff --git a/usr/local/www/javascript/row_helper_dynamic.js b/usr/local/www/javascript/row_helper_dynamic.js index 778f182..032874c 100755 --- a/usr/local/www/javascript/row_helper_dynamic.js +++ b/usr/local/www/javascript/row_helper_dynamic.js @@ -31,6 +31,8 @@ var addRowTo = (function() { td.innerHTML=" "; } else if(rowtype[i] == 'select') { td.innerHTML=" "; + } else if(rowtype[i] == 'select_source') { + td.innerHTML=" "; } else if(rowtype[i] == 'checkbox') { td.innerHTML=" "; } else if(rowtype[i] == 'input') { diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index 054ec97..5ac3776 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -690,7 +690,7 @@ if($pkg['note'] != "") * ROW Helpers function */ function display_row($trc, $value, $fieldname, $type, $rowhelper, $size) { - global $text; + global $text, $config; echo "\n"; if($type == "input") { echo "\n"; @@ -712,6 +712,28 @@ function display_row($trc, $value, $fieldname, $type, $rowhelper, $size) { echo "\n"; } echo "\n"; + } else if($type == "select_source") { + echo "\n"; } } -- cgit v1.1 From b7729cee83698e320032c1b58627f4cda97c9b85 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 27 Apr 2010 11:08:57 +0000 Subject: Do not error out when trying to delete an unexisting package. Just display an error message. --- etc/inc/pkg-utils.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index a443c28..03fd780 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -276,11 +276,13 @@ function get_pkg_depends($pkg_name, $filetype = ".xml", $format = "files", $retu function uninstall_package_from_name($pkg_name) { global $config; $id = get_pkg_id($pkg_name); - $pkg_depends =& $config['installedpackages']['package'][$id]['depends_on_package']; - delete_package($pkg_depends[0], $pkg_name); - if (is_array($pkg_depends)) { - foreach ($pkg_depends as $pkg_depend) - remove_freebsd_package($pkg_depend); + if ($id >= 0) + $pkg_depends =& $config['installedpackages']['package'][$id]['depends_on_package']; + delete_package($pkg_depends[0], $pkg_name); + if (is_array($pkg_depends)) { + foreach ($pkg_depends as $pkg_depend) + remove_freebsd_package($pkg_depend); + } } delete_package_xml($pkg_name); } -- cgit v1.1 From df5da531465d7ed8eb5400c10c12a2c40e21c670 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 27 Apr 2010 11:10:40 +0000 Subject: Missed curly. --- etc/inc/pkg-utils.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 03fd780..f8c187c 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -276,7 +276,7 @@ function get_pkg_depends($pkg_name, $filetype = ".xml", $format = "files", $retu function uninstall_package_from_name($pkg_name) { global $config; $id = get_pkg_id($pkg_name); - if ($id >= 0) + if ($id >= 0) { $pkg_depends =& $config['installedpackages']['package'][$id]['depends_on_package']; delete_package($pkg_depends[0], $pkg_name); if (is_array($pkg_depends)) { -- cgit v1.1 From 0648c9688a4f3324c6e90039b5179eb64bde4653 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 27 Apr 2010 11:25:24 +0000 Subject: Silence and correct command that tries to kill a previous running ipfw-classifyd command. --- etc/inc/shaper.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index d366180..9a023eb 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -3443,8 +3443,7 @@ class layer7 { } function delete_l7c() { - $l7pid = `"/bin/pgrep -f 'ipfw-classifyd .* -p ". $l7rules->GetRPort() . "'"`; - mwexec("/bin/kill {$l7pid}"); + mwexec("/bin/pkill -f 'ipfw-classifyd .* -p ". $l7rules->GetRPort() . "'", true); unset_l7_object_by_reference($this->GetRName()); cleanup_l7_from_rules($this->GetRName()); } -- cgit v1.1