From b6484af7a9b0d8a3254f90202db1c3f7e2c772bb Mon Sep 17 00:00:00 2001 From: Manuel Faux Date: Sun, 10 Jan 2016 13:34:14 +0100 Subject: [PATCH] Backend functions: worked in some CR recommendations --- src/etc/inc/legacy_bindings.inc | 22 ++++++++++++++++++++++ src/etc/inc/util.inc | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/etc/inc/legacy_bindings.inc b/src/etc/inc/legacy_bindings.inc index c19a38c6e..0c0957184 100644 --- a/src/etc/inc/legacy_bindings.inc +++ b/src/etc/inc/legacy_bindings.inc @@ -138,3 +138,25 @@ function legacy_move_config_list_items($source, $id, $items) { return $new_config; } } + +/** + * Retrieve description text of firewall alias by specifying the alias name. + * @param string $name alias name to retrieve the description from + * @return description of alias, or null if no description was set or alias + * does not exist. + */ +function get_alias_description($name) +{ + global $config; + + if (isset($config['aliases']['alias'])) { + foreach ($config['aliases']['alias'] as $alias) { + if ($alias['name'] == $name) { + return (isset($alias['descr'])) ? $alias['descr'] : ""; + } + } + } + + return null; +} + diff --git a/src/etc/inc/util.inc b/src/etc/inc/util.inc index 941f853fe..edb03b572 100644 --- a/src/etc/inc/util.inc +++ b/src/etc/inc/util.inc @@ -1004,28 +1004,6 @@ function alias_expand($name) { } } -/* get description of alias */ -function get_alias_description($name) -{ - global $config; - - if (is_alias($name)) - { - if (isset($config['aliases']['alias'])) - { - foreach ($config['aliases']['alias'] as $alias) - { - if ($alias['name'] == $name) - { - return (isset($alias['descr'])) ? $alias['descr'] : ""; - } - } - - return null; - } - } -} - function subnet_size($subnet) { if (is_subnetv4($subnet)) { list ($ip, $bits) = explode("/", $subnet);