Unbreak System Gateways page. I'll just add back the changes from the old CVS repo afterwards.

1 files changed, 9 insertions, 11 deletions

diff --git a/usr/local/www/system_gateways.php b/usr/local/www/system_gateways.php
index 3b0cd6c..17a0751 100755
--- a/usr/local/www/system_gateways.php
+++ b/usr/local/www/system_gateways.php
@@ -1,5 +1,5 @@
 <?php
-/* $Id$ */
+/* $Id: system_gateways.php,v 1.1 2008/11/06 16:46:42 sumacob Exp $ */
 /*
 	system_gateways.php
 	part of pfSense (http://pfsense.com)
@@ -39,7 +39,10 @@
 
 require("guiconfig.inc");
 
-$a_gateways = return_gateways_array();
+if (!is_array($config['gateways']['gateway_item']))
+	$config['gateways']['gateway_item'] = array();
+
+$a_gateways = &$config['gateways']['gateway_item'];
 $changedesc = "Gateways: ";
 
 if ($_POST) {
@@ -68,12 +71,8 @@ if ($_POST) {
 
 if ($_GET['act'] == "del") {
 	if ($a_gateways[$_GET['id']]) {
-		/* remove the real entry */
-		$realid = $a_gateways[$_GET['id']]['attribute'];
-		$a_gateways = &$config['gateways']['gateway_item'];
-
-		$changedesc .= "removed gateway {$realid}";
-		unset($a_gateways[$realid]);
+		$changedesc .= "removed gateway {$_GET['id']}";
+		unset($a_gateways[$_GET['id']]);
 		write_config($changedesc);
 		touch($d_staticroutesdirty_path);
 		header("Location: system_gateways.php");
@@ -81,7 +80,6 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-
 $pgtitle = array("System","Gateways");
 include("head.inc");
 
@@ -130,9 +128,9 @@ effect.");?><br>
                 <tr>
                   <td class="listlr" ondblclick="document.location='system_gateways_edit.php?id=<?=$i;?>';">
                     <?php
-			echo strtoupper($gateway['name']);
+			echo $gateway['name'];
 			if(isset($gateway['defaultgw'])) {
-				echo " <strong>(default)<strong>";
+				echo " <br /><strong>({$gateway['type']} default)<strong>";
 			}
 			?>