diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-03-07 02:26:10 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-03-07 02:26:10 +0000 |
| commit | 9c0ad35cba22ddb9fb730d1322a2acb90e18369b (patch) | |
| tree | 5b5dae78f5a396ddf08a0ede9188651db5100344 /etc/inc | |
| parent | 122a9c398530ace5b8f43a7dc934805650176b9e (diff) | |
| download | pfsense-9c0ad35cba22ddb9fb730d1322a2acb90e18369b.zip pfsense-9c0ad35cba22ddb9fb730d1322a2acb90e18369b.tar.gz | |
* If style cleanups
* Break comment into multiple lines
* Full path to sleep and killall
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index bb8f595..55b4f7d 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -547,8 +547,10 @@ function resync_all_package_configs_bootup($show_message) { system("/usr/bin/fetch -o /usr/local/pkg/" . $package['configurationfile'] . " http://www.pfsense.com/packages/config/" . $package['configurationfile']); } $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui"); - if($pkg_config['custom_php_command_before_form'] <> "") eval($pkg_config['custom_php_command_before_form']); - if($pkg_config['custom_php_resync_config_command'] <> "") eval($pkg_config['custom_php_resync_config_command']); + if($pkg_config['custom_php_command_before_form'] <> "") + eval($pkg_config['custom_php_command_before_form']); + if($pkg_config['custom_php_resync_config_command'] <> "") + eval($pkg_config['custom_php_resync_config_command']); if($show_message == true) print "Synced " . $package['name'] . ".\n"; if($pkg_config['additional_files_needed'] != "") { foreach($pkg_config['additional_files_needed']['item'] as $item) { @@ -561,8 +563,10 @@ function resync_all_package_configs_bootup($show_message) { } $item_config = parse_xml_config_pkg("/usr/local/pkg" . $pkg_name, "packagegui"); if($show_message == true) print "Syncing " . $item_config['name'] . ".\n"; - if($item_config['custom_php_command_before_form'] <> "") eval($item_config['custom_php_command_before_form']); - if($item_config['custom_php_resync_config_command'] <> "") eval($item_config['custom_php_resync_config_command']); + if($item_config['custom_php_command_before_form'] <> "") + eval($item_config['custom_php_command_before_form']); + if($item_config['custom_php_resync_config_command'] <> "") + eval($item_config['custom_php_resync_config_command']); if($show_message == true) print "Synced " . $item_config['name'] . ".\n"; } } @@ -591,7 +595,7 @@ function sweep_package_processes() { */ function gather_altq_queue_stats($dont_return_root_queues) { mwexec("/usr/bin/killall -9 pfctl"); - $stats = `/sbin/pfctl -vvsq & sleep 5;killall pfctl 2>/dev/null`; + $stats = `/sbin/pfctl -vvsq & /bin/sleep 5;/usr/bin/killall pfctl 2>/dev/null`; $stats_array = split("\n", $stats); $queue_stats = array(); foreach ($stats_array as $stats_line) { |
