diff options
author | jim-p <jimp@pfsense.org> | 2010-10-19 13:03:09 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2010-10-19 13:03:09 -0400 |
commit | 6751b3e7863196ab865f8fb76a2ad6e9f8556788 (patch) | |
tree | 2b533a1b31a9a52208c392ca6690bbc32696ac1c /etc | |
parent | 9ff73b79e46be2022c861ef332f22b73d6dbe973 (diff) | |
download | pfsense-6751b3e7863196ab865f8fb76a2ad6e9f8556788.zip pfsense-6751b3e7863196ab865f8fb76a2ad6e9f8556788.tar.gz |
Generalize this function and use it in more places to reduce duplicated code.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/upgrade_config.inc | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 71644fa..ca4ec2a 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2213,49 +2213,33 @@ function upgrade_070_to_071() { } } -function upgrade_071_to_072() { - global $config; - - if (is_array($config['sysctl']['item'])) { - foreach($config['sysctl']['item'] as & $sysctl) { - if (!empty($sysctl['desc'])) { - $sysctl['descr'] = $sysctl['desc']; - unset($sysctl['desc']); - } - } - } -} - -function desc_to_descr(& $section) { +function rename_field(& $section, $oldname, $newname) { if (is_array($section)) { foreach($section as & $item) { - if (!empty($item['desc'])) { - $item['descr'] = $item['desc']; - unset($item['desc']); + if (!empty($item[$oldname])) { + $item[$newname] = $item[$oldname]; + unset($item[$oldname]); } } } } +function upgrade_071_to_072() { + global $config; + rename_field($config['sysctl']['item'], 'desc', 'descr'); +} + function upgrade_072_to_073() { global $config; - desc_to_descr($config['load_balancer']['monitor_type']); - desc_to_descr($config['load_balancer']['lbpool']); - desc_to_descr($config['load_balancer']['lbaction']); - desc_to_descr($config['load_balancer']['lbprotocol']); - desc_to_descr($config['load_balancer']['virtual_server']); + 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'); } function upgrade_073_to_074() { global $config; - - if (is_array($config['system']['user'])) { - foreach($config['system']['user'] as & $userent) { - if (!empty($userent['fullname'])) { - $userent['descr'] = $userent['fullname']; - unset($userent['fullname']); - } - } - } + rename_field($config['system']['user'], 'fullname', 'descr'); } ?> |