From 6c6a618ac4f1d9d3aba2a33ebca73fad93723afe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= <eri@pfsense.org>
Date: Fri, 25 Jul 2008 21:05:17 +0000
Subject: Fixup lagg GUI.

---
 usr/local/www/interfaces_lagg.php      | 2 +-
 usr/local/www/interfaces_lagg_edit.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php
index f2643df..b5e3179 100644
--- a/usr/local/www/interfaces_lagg.php
+++ b/usr/local/www/interfaces_lagg.php
@@ -100,7 +100,7 @@ include("head.inc");
 			  <?php $i = 0; foreach ($a_laggs as $lagg): ?>
                 <tr>
                   <td class="listlr">
-					<?=htmlspecialchars($lagg['if']);?>
+					<?=htmlspecialchars(strtoupper($lagg['laggif']));?>
                   </td>
                   <td class="listr">
 					<?=htmlspecialchars($lagg['members']);?>
diff --git a/usr/local/www/interfaces_lagg_edit.php b/usr/local/www/interfaces_lagg_edit.php
index 7c7cffd..9bdbc96 100644
--- a/usr/local/www/interfaces_lagg_edit.php
+++ b/usr/local/www/interfaces_lagg_edit.php
@@ -35,6 +35,7 @@ if (!is_array($config['laggs']['lagg']))
 
 $a_laggs = &$config['laggs']['lagg'];
 
+$portlist = get_interface_list();
 
 $id = $_GET['id'];
 if (isset($_POST['id']))
@@ -61,7 +62,7 @@ if ($_POST) {
 
 	if (!$input_errors) {
 		$lagg = array();
-		$lagg['members'] = $_POST['members'];
+		$lagg['members'] = implode(',', $_POST['members']);
 		$lagg['descr'] = $_POST['descr'];
 		$lagg['laggif'] = $_POST['laggif'];
 
@@ -97,12 +98,11 @@ include("head.inc");
                   <td width="78%" class="vtable">
                     <select name="members[]" multiple="true" size="4" class="formselect">
                       <?php
-						$portlist = get_configured_interface_with_descr();
 					  	foreach ($portlist as $ifn => $ifinfo) {
 							echo "<option value=\"{$ifn}\"";
 							if (stristr($pconfig['members'], $ifn))
 								echo "selected";
-							echo ">{$ifinfo}</option>";
+							echo ">". $ifn ."(".$ifinfo['mac'] .")</option>";
 						}
 		      		?>
                     </select>
-- 
cgit v1.1