From 5f53260a2da559c71a5de91dc5c6a332e664b24e Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 30 Apr 2010 14:32:25 +0000
Subject: Allow for each gateway a weight to be choosen if the gateway has to
 be used in Gateway groups. This will create that many entries in the route-to
 statement as the weight says.

---
 usr/local/www/system_gateway_groups_edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www/system_gateway_groups_edit.php')

diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 57aaf97..6d0539b 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -168,10 +168,10 @@ include("head.inc");
 					$itemsplit = explode("|", $item);
 					if($itemsplit[0] == $name) {
 						$selected[$itemsplit[1]] = "selected";
+						break;
 					} else {
 						$selected[0] = "selected";
 					}
-
 				}
 				echo "<select name='{$name}' class='formfldselect' id='{$name}'>";
 				echo "<option value='0' $selected[0] >Never</option>";
@@ -180,7 +180,7 @@ include("head.inc");
 				echo "<option value='3' $selected[3] >Tier 3</option>";
 				echo "<option value='4' $selected[4] >Tier 4</option>";
 				echo "<option value='5' $selected[5] >Tier 5</option>";
-				echo "</select> <strong>{$name} - {$gateway['descr']}</strong><br/>";
+				echo "</select> <strong>{$name} - {$gateway['descr']}</strong><br />";
 		 	}
 		?>
 			<br/><span class="vexpl">
-- 
cgit v1.1


From c8e495a372df940115a19ba8089739b6997e93bb Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 30 Apr 2010 19:36:00 +0000
Subject: Use correct gateway name instead of the descriptive ones to adapt to
 dynamic gateways which use the interface name not the interface description
 as a reference. While here do not use history.back for cancel button but
 redirect to the groups page directly.

---
 usr/local/www/system_gateway_groups_edit.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'usr/local/www/system_gateway_groups_edit.php')

diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 6d0539b..2f884aa 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -105,10 +105,10 @@ if ($_POST) {
 
 	/* Build list of items in group with priority */
 	$pconfig['item'] = array();
-	foreach($a_gateways as $gateway) {
-		if($_POST[$gateway['name']] > 0) {
+	foreach($a_gateways as $gwname => $gateway) {
+		if($_POST[$gwname] > 0) {
 			/* we have a priority above 0 (disabled), add item to list */
-			$pconfig['item'][] = "{$gateway[name]}|{$_POST[$gateway['name']]}";
+			$pconfig['item'][] = "{$gwname}|{$_POST[$gwname]}";
 		}
 
 	}
@@ -160,20 +160,19 @@ include("head.inc");
                   <td width="22%" valign="top" class="vncellreq">Gateway Priority</td>
                   <td width="78%" class="vtable"> 
 		<?php
-			foreach($a_gateways as $gateway) {
+			foreach($a_gateways as $gwname => $gateway) {
 				$selected = array();
-				$name = $gateway['name'];
 				$interface = $gateway['interface'];
 				foreach((array)$pconfig['item'] as $item) {
 					$itemsplit = explode("|", $item);
-					if($itemsplit[0] == $name) {
+					if($itemsplit[0] == $gwname) {
 						$selected[$itemsplit[1]] = "selected";
 						break;
 					} else {
 						$selected[0] = "selected";
 					}
 				}
-				echo "<select name='{$name}' class='formfldselect' id='{$name}'>";
+				echo "<select name='{$gwname}' class='formfldselect' id='{$gwname}'>";
 				echo "<option value='0' $selected[0] >Never</option>";
 				echo "<option value='1' $selected[1] >Tier 1</option>";
 				echo "<option value='2' $selected[2] >Tier 2</option>";
@@ -218,7 +217,8 @@ value="<?=htmlspecialchars($pconfig['descr']);?>">
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" value="Cancel" class="formbtn"  onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> 
+		    <a href="system_gateway_groups.php"><input type="button" value="Cancel" class="formbtn" ></a>
                     <?php if (isset($id) && $a_gateway_groups[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
-- 
cgit v1.1


From 0307f35126ee87651f213624c4d6c6e302863e52 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Fri, 30 Apr 2010 19:47:23 +0000
Subject: Show descriptive name not the internal used one.

---
 usr/local/www/system_gateway_groups_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www/system_gateway_groups_edit.php')

diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 2f884aa..5e5ee11 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -179,7 +179,7 @@ include("head.inc");
 				echo "<option value='3' $selected[3] >Tier 3</option>";
 				echo "<option value='4' $selected[4] >Tier 4</option>";
 				echo "<option value='5' $selected[5] >Tier 5</option>";
-				echo "</select> <strong>{$name} - {$gateway['descr']}</strong><br />";
+				echo "</select> <strong>{$gateway['name']} - {$gateway['descr']}</strong><br />";
 		 	}
 		?>
 			<br/><span class="vexpl">
-- 
cgit v1.1