From 0831bc8616b85859751d9c30f35030dd35cb3a22 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sun, 15 Jan 2006 03:11:31 +0000 Subject: Fix bugs found by eclipse --- etc/inc/filter.inc | 3 +++ etc/inc/interfaces.inc | 2 +- etc/inc/pfsense-utils.inc | 2 +- etc/inc/pkg-utils.inc | 8 ++++---- usr/local/www/edit.php | 2 +- usr/local/www/fbegin.inc | 6 +++--- usr/local/www/interfaces_wlan.inc | 2 +- usr/local/www/progress.php | 1 - usr/local/www/system_advanced.php | 2 +- usr/local/www/system_routes.php | 2 +- 10 files changed, 16 insertions(+), 14 deletions(-) diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index c5592d3..aed35b4 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2021,6 +2021,9 @@ function create_firewall_outgoing_rules_to_itself() { function process_carp_nat_rules() { global $g, $config; + + $wan_interface = get_real_wan_interface(); + if(isset($config['system']['developerspew'])) { $mt = microtime(); echo "process_carp_nat_rules() being called $mt\n"; diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 2dbd4cc..4c97418 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -721,7 +721,7 @@ function find_dhclient_process($interface) { } function interfaces_wan_configure() { - global $config, $g; + global $config, $g, $bridges_total; $wancfg = $config['interfaces']['wan']; diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 0328298..2c6f0e3 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -896,7 +896,7 @@ function backup_config_section($section) { */ function backup_config_ts_scheduler() { global $config; - $new_section = &$config['syste']['schedulertype']; + $new_section = &$config['system']['schedulertype']; /* generate configuration XML */ $xmlconfig = dump_xml_config($new_section, $section); $xmlconfig = str_replace("", "", $xmlconfig); diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 9464edd..15b305e 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -156,9 +156,9 @@ function is_freebsd_pkg_installed($pkg) { * */ function get_pkg_depends($pkg_name, $filetype = ".xml", $format = "files", $return_nosync = 1) { - global $config; + global $config; + $pkg_id = get_pkg_id($pkg_name); if(!is_numeric($pkg_name)) { - $pkg_id = get_pkg_id($pkg_name); if($pkg_id == -1) return -1; // This package doesn't really exist - exit the function. } else { if(!isset($config['installedpackages']['package'][$pkg_id])) return; // No package belongs to the pkg_id passed to this function. @@ -236,8 +236,8 @@ function sync_package($pkg_name, $sync_depends = true, $show_message = false) { * The code is obviously wrong, but I'm not sure what it's supposed to do? */ if(isset($pkg_config['nosync'])) continue; - if($pkg['custom_php_global_functions'] <> "") - eval($pkg['custom_php_global_functions']); + if($pkg_config['custom_php_global_functions'] <> "") + eval($pkg_config['custom_php_global_functions']); if($pkg_config['custom_php_resync_config_command'] <> "") eval($pkg_config['custom_php_resync_config_command']); if($sync_depends == true) { diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php index e6c0265..8ba9e2c 100755 --- a/usr/local/www/edit.php +++ b/usr/local/www/edit.php @@ -136,7 +136,7 @@ function sf() { document.forms[0].savetopath.focus(); } Rows: Cols: - + | Highlighting: >Enabled diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 084234d..5c2827f 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -101,7 +101,7 @@ require_once("notices.inc");
  • General Setup
  • Packages
    • - +
  • Setup wizard
  • Static routes
    • @@ -169,7 +169,7 @@ require_once("notices.inc");
  • IPsec
  • Package logs
    • - +
  • Queues
  • Services
  • System
    • @@ -211,7 +211,7 @@ require_once("notices.inc");
  • Restart HTTPD
    • - + diff --git a/usr/local/www/interfaces_wlan.inc b/usr/local/www/interfaces_wlan.inc index 45a90dd..56ca5cf 100755 --- a/usr/local/www/interfaces_wlan.inc +++ b/usr/local/www/interfaces_wlan.inc @@ -281,7 +281,7 @@ function wireless_config_print() { SSID - + diff --git a/usr/local/www/progress.php b/usr/local/www/progress.php index b677874..2325c03 100755 --- a/usr/local/www/progress.php +++ b/usr/local/www/progress.php @@ -107,6 +107,5 @@ if (!$X) { - diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index 92bb650..30b37fd 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -315,7 +315,7 @@ include("head.inc"); - + Secure Shell diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php index 86e24a9..2edde7a 100755 --- a/usr/local/www/system_routes.php +++ b/usr/local/www/system_routes.php @@ -109,7 +109,7 @@ include("head.inc");

    - + -- cgit v1.1