diff options
| author | Phil Davis <phil.davis@inf.org> | 2017-03-19 12:08:53 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2017-03-19 12:08:53 +0545 |
| commit | 6e8777f2f181d8814a49e787c65b285fdc9e15eb (patch) | |
| tree | 8b0574de68175d5a31147520c55d55fb26781298 /src | |
| parent | 41c9f57eb6053647fe3f05df13f629a177395068 (diff) | |
| download | pfsense-6e8777f2f181d8814a49e787c65b285fdc9e15eb.zip pfsense-6e8777f2f181d8814a49e787c65b285fdc9e15eb.tar.gz | |
Upgrade code to convert old Traffic Graphs Widget settings
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/inc/globals.inc | 3 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 3a55902..b49b424 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -37,6 +37,7 @@ define('DMYPWD', "********"); global $g; $g = array( + "base_packages" => "siproxd", "event_address" => "unix:///var/run/check_reload_status", "factory_shipped_username" => "admin", "factory_shipped_password" => "pfsense", @@ -70,7 +71,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "16.2", + "latest_config" => "16.3", "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", "wan_interface_name" => "wan", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index b350497..951ff85 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -5157,4 +5157,39 @@ function upgrade_161_to_162() { $config['system']['crypto_hardware'] = "cryptodev"; } } + +/* Traffic graphs widget settings are now stored in a layout similar + * to other widgets. Migrate any old settings. + */ +function upgrade_162_to_163() { + require_once("ipsec.inc"); + global $config; + + foreach (array('refreshinterval', 'invert', 'size', 'backgroundupdate') as $setting) { + if (isset($config['widgets']['trafficgraphs'][$setting])) { + $config['widgets']['traffic_graphs'][$setting] = $config['widgets']['trafficgraphs'][$setting]; + unset($config['widgets']['trafficgraphs'][$setting]); + } + } + + if (isset($config['widgets']['trafficgraphs']['shown'])) { + if (is_array($config['widgets']['trafficgraphs']['shown']['item'])) { + $ifdescrs = get_configured_interface_with_descr(); + + if (ipsec_enabled()) { + $ifdescrs['enc0'] = "IPsec"; + } + + $validNames = array(); + + foreach ($ifdescrs as $ifdescr => $ifname) { + array_push($validNames, $ifdescr); + } + + $config['widgets']['traffic_graphs']['filter'] = implode(',', array_diff($validNames, $config['widgets']['trafficgraphs']['shown']['item'])); + } + + unset($config['widgets']['trafficgraphs']['shown']); + } +} ?> |
