diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/conf.default/config.xml | 2 | ||||
| -rw-r--r-- | src/etc/inc/config.lib.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/globals.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 13 | ||||
| -rw-r--r-- | src/usr/local/share/pfSense/pre_upgrade_command | 7 | ||||
| -rwxr-xr-x | src/usr/local/www/firewall_aliases_edit.php | 4 | ||||
| -rw-r--r-- | src/usr/local/www/js/pfSenseHelpers.js | 4 |
7 files changed, 15 insertions, 19 deletions
diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 98afef1..f9fcdbd 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>15.4</version> + <version>15.3</version> <lastchange/> <system> <optimization>normal</optimization> diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 9620841..4285d3d 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -138,7 +138,7 @@ function parse_config($parse = false) { if (!$parse) { if (file_exists($g['tmp_path'] . '/config.cache')) { $config = unserialize(file_get_contents($g['tmp_path'] . '/config.cache')); - if (is_null($config)) { + if (!is_array($config)) { $parse = true; } } else { diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 221df9e..fa4d5dc 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "15.4", + "latest_config" => "15.3", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index cf29079..f270959 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4982,17 +4982,4 @@ function upgrade_152_to_153() { } } } -function upgrade_153_to_154() { - global $config; - - // rename packages from 2.1.x - $rename_arr = array("Quagga OSPF" => "Quagga_OSPF", "System Patches" => "System_Patches"); - if (is_array($config['installedpackages']['package'])) { - foreach ($config['installedpackages']['package'] as $idx => $pkg) { - if (key_exists($pkg['name'], $rename_arr)) { - $config['installedpackages']['package'][$idx]['name'] == $rename_arr[$pkg['name']]; - } - } - } -} ?> diff --git a/src/usr/local/share/pfSense/pre_upgrade_command b/src/usr/local/share/pfSense/pre_upgrade_command index abbe941..e36a2e8 100644 --- a/src/usr/local/share/pfSense/pre_upgrade_command +++ b/src/usr/local/share/pfSense/pre_upgrade_command @@ -43,7 +43,12 @@ foreach (\$config['installedpackages']['package'] as \$package) { if (isset(\$package['internal_name'])) { \$removed_packages[] = \$package['internal_name']; } else { - \$removed_packages[] = \$package['name']; + \$rename_arr = array("Quagga OSPF" => "Quagga_OSPF", "System Patches" => "System_Patches"); + if (key_exists(\$package['name'], \$rename_arr)) { + \$removed_packages[] = \$rename_arr[\$package['name']]; + } else { + \$removed_packages[] = \$package['name']; + } } ${UNINSTALL}(\$package['name']); } diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 90b84eb..f762fe8 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -774,8 +774,12 @@ events.push(function() { disable_subnets = (tab == 'host') || (tab == 'port') || (tab == 'url') || (tab == 'url_ports'); + // Enable/disable address_subnet so its value gets POSTed or not, as appropriate. $("[id^='address_subnet']").prop("disabled", disable_subnets); + // Show or hide the slash plus address_subnet field so the user does not even see it if it is not relevant. + hideMask('address_subnet', disable_subnets); + // Set the help text to match the tab var helparray = <?=json_encode($help);?>; $('.helptext').html(helparray[tab]); diff --git a/src/usr/local/www/js/pfSenseHelpers.js b/src/usr/local/www/js/pfSenseHelpers.js index 0283b11..dadcf9f 100644 --- a/src/usr/local/www/js/pfSenseHelpers.js +++ b/src/usr/local/www/js/pfSenseHelpers.js @@ -143,11 +143,11 @@ function hideMask(name, hide) { if(hide) { $('[id^=' + name + ']').hide(); $('[id^=' + name + ']').prev('span').hide(); - $('[id^=' + name + ']').parents('div').removeClass('input-group'); + $('[id^=' + name + ']').parent('div').removeClass('input-group'); } else { $('[id^=' + name + ']').show(); $('[id^=' + name + ']').prev('span').show(); - $('[id^=' + name + ']').parents('div').addClass('input-group'); + $('[id^=' + name + ']').parent('div').addClass('input-group'); } } |
