Merge pull request #2771 from stilez/patch-20

2 files changed, 2 insertions, 26 deletions

diff --git a/src/usr/local/www/diag_ping.php b/src/usr/local/www/diag_ping.php
index e5756b6..7cf8301 100644
--- a/src/usr/local/www/diag_ping.php
+++ b/src/usr/local/www/diag_ping.php
@@ -74,18 +74,6 @@ $do_ping = false;
 $host = '';
 $count = DEFAULT_COUNT;
 
-function create_sourceaddresslist() {
-	$sourceips = get_possible_traffic_source_addresses(true);
-
-	$list = array("" => gettext('Default'));
-
-	foreach ($sourceips as $sipvalue => $sipname) {
-		$list[$sipvalue] = $sipname;
-	}
-
-	return $list;
-}
-
 if ($_POST || $_REQUEST['host']) {
 	unset($input_errors);
 	unset($do_ping);
@@ -190,7 +178,7 @@ $section->addInput(new Form_Select(
 	'sourceip',
 	'Source address',
 	$sourceip,
-	create_sourceaddresslist()
+	array('' => gettext('Automatically selected (default)')) + get_possible_traffic_source_addresses(true)
 ))->setHelp('Select source address for the ping');
 
 $section->addInput(new Form_Select(
diff --git a/src/usr/local/www/diag_traceroute.php b/src/usr/local/www/diag_traceroute.php
index eb1d762..a1c45ce 100644
--- a/src/usr/local/www/diag_traceroute.php
+++ b/src/usr/local/www/diag_traceroute.php
@@ -80,18 +80,6 @@ $ttl = DEFAULT_TTL;
 $ipproto = 'ipv4';
 $sourceip = 'any';
 
-function create_sourceaddresslist() {
-	$list = array('any' => gettext('Any'));
-
-	$sourceips = get_possible_traffic_source_addresses(true);
-
-	foreach ($sourceips as $sipvalue => $sipname) {
-		$list[$sipvalue] = $sipname;
-	}
-
-	return($list);
-}
-
 if ($_POST || $_REQUEST['host']) {
 	unset($input_errors);
 
@@ -178,7 +166,7 @@ $section->addInput(new Form_Select(
 	'sourceip',
 	'Source Address',
 	$sourceip,
-	create_sourceaddresslist()
+	array('any' => gettext('Any')) + get_possible_traffic_source_addresses(true);
 ))->setHelp('Select source address for the trace');
 
 $section->addInput(new Form_Select(