diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-08-31 16:14:24 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-08-31 16:14:24 +0000 |
commit | 278aa4f4a298ce4d17daa7a6a39a85a1302aeacc (patch) | |
tree | 0ef8498ec82a44c048a1366909be63249b5aecbb /etc | |
parent | e53c01b2b79e03441443eb993d5728b64949b7dc (diff) | |
download | pfsense-278aa4f4a298ce4d17daa7a6a39a85a1302aeacc.zip pfsense-278aa4f4a298ce4d17daa7a6a39a85a1302aeacc.tar.gz |
Check if items are an array before treating them as such.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/config.inc | 5 | ||||
-rw-r--r-- | etc/inc/pfsense-utils.inc | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index c789f87..13e4df9 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -2614,8 +2614,9 @@ function system_start_ftp_helpers() { } } /* support bridged interfaces. even they need ftp mojo */ - foreach($config['bridges']['bridged'] as $bridge) - mwexec("/usr/local/sbin/ftpsesame {$shaper_queue} -i {$bridge['bridgeif']}"); + if (is_array($config['bridges']['bridged'])) + foreach($config['bridges']['bridged'] as $bridge) + mwexec("/usr/local/sbin/ftpsesame {$shaper_queue} -i {$bridge['bridgeif']}"); } function cleanup_backupcache($revisions = 30) { diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index be4645e..784cd08 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -1234,10 +1234,11 @@ function find_number_of_created_carp_interfaces($flush = false) { ******/ function link_int_to_bridge_interface($int) { global $config; - - foreach ($config['bridges']['bridged'] as $bridge) - if(stristr($bridge['members'], "{$int}")) - return "{$bridge['bridgeif']}"; + + if (is_array($config['bridges']['bridged'])) + foreach ($config['bridges']['bridged'] as $bridge) + if(stristr($bridge['members'], "{$int}")) + return "{$bridge['bridgeif']}"; } function link_carp_interface_to_parent($interface) { |