diff options
author | Phil Lavin <phil@propcom.co.uk> | 2013-02-05 14:31:10 +0000 |
---|---|---|
committer | Phil Lavin <phil@propcom.co.uk> | 2013-02-05 14:31:10 +0000 |
commit | 80d5bd413f60637a5a168b622962b92bb3aca357 (patch) | |
tree | 4a44202f79c91e7532aa49f0c67409639bd589e7 /usr/local/www | |
parent | d2b2872afa2e7d36c6cb7c30b8885cff8147985e (diff) | |
download | pfsense-80d5bd413f60637a5a168b622962b92bb3aca357.zip pfsense-80d5bd413f60637a5a168b622962b92bb3aca357.tar.gz |
Fix PHP errors relating to using string offset as an array
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/pkg_edit.php | 4 | ||||
-rw-r--r-- | usr/local/www/status_upnp.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php index fe1778d..3123a9a 100755 --- a/usr/local/www/pkg_edit.php +++ b/usr/local/www/pkg_edit.php @@ -106,11 +106,11 @@ if($pkg['custom_php_global_functions'] <> "") eval($pkg['custom_php_global_functions']); // grab the installedpackages->package_name section. -if(!is_array($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'])) +if($config['installedpackages'] && !is_array($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'])) $config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'] = array(); // If the first entry in the array is an empty <config/> tag, kill it. -if ((count($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']) > 0) +if ($config['installedpackages'] && (count($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']) > 0) && ($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config'][0] == "")) array_shift($config['installedpackages'][xml_safe_fieldname($pkg['name'])]['config']); diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php index 50386b1..0f0c66b 100644 --- a/usr/local/www/status_upnp.php +++ b/usr/local/www/status_upnp.php @@ -63,7 +63,7 @@ include("head.inc"); <?php include("fbegin.inc"); ?> <?php if ($savemsg) print_info_box($savemsg); ?> <?php -if(!$config['installedpackages']['miniupnpd']['config'][0]['iface_array'] || +if(!$config['installedpackages'] || !$config['installedpackages']['miniupnpd']['config'][0]['iface_array'] || !$config['installedpackages']['miniupnpd']['config'][0]['enable']) { echo gettext("UPnP is currently disabled."); include("fend.inc"); |