mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do some is_array() testing before renaming fields, otherwise empty variables can be accidentally created.

Browse Source
This commit is contained in:
jim-p 2010-10-27 16:55:19 -04:00
parent bacd881efc
commit 6bef05546f
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
etc/inc/upgrade_config.inc
View File

@ -2238,16 +2238,24 @@ function rename_field(& $section, $oldname, $newname) {
function upgrade_071_to_072() {
global $config;
rename_field($config['sysctl']['item'], 'desc', 'descr');
if (is_array($config['sysctl']) && is_array($config['sysctl']['item']))
rename_field($config['sysctl']['item'], 'desc', 'descr');
}
function upgrade_072_to_073() {
global $config;
rename_field($config['load_balancer']['monitor_type'], 'desc', 'descr');
rename_field($config['load_balancer']['lbpool'], 'desc', 'descr');
rename_field($config['load_balancer']['lbaction'], 'desc', 'descr');
rename_field($config['load_balancer']['lbprotocol'], 'desc', 'descr');
rename_field($config['load_balancer']['virtual_server'], 'desc', 'descr');
if (!is_array($config['load_balancer']))
return;
if (is_array($config['load_balancer']['monitor_type']))
rename_field($config['load_balancer']['monitor_type'], 'desc', 'descr');
if (is_array($config['load_balancer']['lbpool']))
rename_field($config['load_balancer']['lbpool'], 'desc', 'descr');
if (is_array($config['load_balancer']['lbaction']))
rename_field($config['load_balancer']['lbaction'], 'desc', 'descr');
if (is_array($config['load_balancer']['lbprotocol']))
rename_field($config['load_balancer']['lbprotocol'], 'desc', 'descr');
if (is_array($config['load_balancer']['virtual_server']))
rename_field($config['load_balancer']['virtual_server'], 'desc', 'descr');
}
function upgrade_073_to_074() {
@ -2257,8 +2265,11 @@ function upgrade_073_to_074() {
function upgrade_074_to_075() {
global $config;
rename_field($config['ca'], 'name', 'descr');
rename_field($config['cert'], 'name', 'descr');
rename_field($config['crl'], 'name', 'descr');
if (is_array($config['ca']))
rename_field($config['ca'], 'name', 'descr');
if (is_array($config['cert']))
rename_field($config['cert'], 'name', 'descr');
if (is_array($config['crl']))
rename_field($config['crl'], 'name', 'descr');
}
?>