diff options
author | jim-p <jimp@pfsense.org> | 2017-04-03 14:55:54 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2017-04-03 14:55:54 -0400 |
commit | f0875a7e6af8862ddd71b91b52194a96ff385d3b (patch) | |
tree | 68648d562112726f2dee880c1184e8bd2b23cd3b /src/etc | |
parent | 916168fdbb3628516a6887fe8384889ee40a42b9 (diff) | |
parent | 1d3510cf6cc471b179d52e03f4cfe77e23b4b20b (diff) | |
download | pfsense-f0875a7e6af8862ddd71b91b52194a96ff385d3b.zip pfsense-f0875a7e6af8862ddd71b91b52194a96ff385d3b.tar.gz |
Merge pull request #3685 from phil-davis/sort-if-names
Diffstat (limited to 'src/etc')
-rw-r--r-- | src/etc/inc/auth.inc | 2 | ||||
-rw-r--r-- | src/etc/inc/pfsense-utils.inc | 20 | ||||
-rw-r--r-- | src/etc/inc/util.inc | 9 |
3 files changed, 28 insertions, 3 deletions
diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc index 59114d6..168af38 100644 --- a/src/etc/inc/auth.inc +++ b/src/etc/inc/auth.inc @@ -1580,6 +1580,7 @@ function get_user_settings($username) { $settings['webgui']['dashboardcolumns'] = $config['system']['webgui']['dashboardcolumns']; $settings['webgui']['webguihostnamemenu'] = $config['system']['webgui']['webguihostnamemenu']; $settings['webgui']['webguicss'] = $config['system']['webgui']['webguicss']; + $settings['webgui']['interfacessort'] = isset($config['system']['webgui']['interfacessort']); $settings['webgui']['dashboardavailablewidgetspanel'] = isset($config['system']['webgui']['dashboardavailablewidgetspanel']); $settings['webgui']['webguifixedmenu'] = isset($config['system']['webgui']['webguifixedmenu']); $settings['webgui']['webguileftcolumnhyper'] = isset($config['system']['webgui']['webguileftcolumnhyper']); @@ -1604,6 +1605,7 @@ function get_user_settings($username) { if (isset($user['webguihostnamemenu'])) { $settings['webgui']['webguihostnamemenu'] = $user['webguihostnamemenu']; } + $settings['webgui']['interfacessort'] = isset($user['interfacessort']); $settings['webgui']['dashboardavailablewidgetspanel'] = isset($user['dashboardavailablewidgetspanel']); $settings['webgui']['webguifixedmenu'] = isset($user['webguifixedmenu']); $settings['webgui']['webguileftcolumnhyper'] = isset($user['webguileftcolumnhyper']); diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 81a2ea3..ded6b3f 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -255,6 +255,25 @@ function gen_dashboardcolumns_field(&$section, $value) { )); } +/****f* pfsense-utils/gen_interfacessort_field + * NAME + * gen_interfacessort_field + * INPUTS + * Pointer to section object + * Initial value for the field + * RESULT + * no return value, section object is updated + ******/ +function gen_interfacessort_field(&$section, $value) { + + $section->addInput(new Form_Checkbox( + 'interfacessort', + 'Interfaces Sort', + 'Sort Alphabetically', + $value + ))->setHelp('If selected, lists of interfaces will be sorted by description, otherwise they are listed wan,lan,optn...'); +} + /****f* pfsense-utils/gen_associatedpanels_fields * NAME * gen_associatedpanels_fields @@ -375,6 +394,7 @@ function gen_user_settings_fields(&$section, $pconfig) { gen_webguifixedmenu_field($section, $pconfig['webguifixedmenu']); gen_webguihostnamemenu_field($section, $pconfig['webguihostnamemenu']); gen_dashboardcolumns_field($section, $pconfig['dashboardcolumns']); + gen_interfacessort_field($section, $pconfig['interfacessort']); gen_associatedpanels_fields( $section, $pconfig['dashboardavailablewidgetspanel'], diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 4e3af5d..d294d1d 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -1409,7 +1409,7 @@ function get_configured_interface_list_by_realif($only_opt = false, $withdisable /* return the configured interfaces list with their description. */ function get_configured_interface_with_descr($only_opt = false, $withdisabled = false) { - global $config; + global $config, $user_settings; $iflist = array(); @@ -1426,8 +1426,11 @@ function get_configured_interface_with_descr($only_opt = false, $withdisabled = } } } - - asort($iflist); + + if ($user_settings['webgui']['interfacessort']) { + asort($iflist); + } + return $iflist; } |