From 566193a579a45683e9d82d8cba34db2a8d638784 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Mon, 28 Feb 2011 12:25:33 -0500
Subject: Only make gateway changes if we have been given a new gateway IP.

---
 usr/local/www/wizards/setup_wizard.xml | 38 ++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'usr/local/www/wizards')

diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml
index 523ad30..8d37518 100644
--- a/usr/local/www/wizards/setup_wizard.xml
+++ b/usr/local/www/wizards/setup_wizard.xml
@@ -562,26 +562,28 @@
 		<![CDATA[
 		$config['system']['hostname'] = $config['wizardtemp']['system']['hostname'];
 		$config['system']['domain'] = $config['wizardtemp']['system']['domain'];
-		if (!is_array($config['gateways']['gateway_item']))
-			$config['gateways']['gateway_item'] = array();
-		$found = false;
-		foreach ($config['gateways']['gateway_item'] as & $gw) {
-			if ($gw['name'] == 'WANGW') {
-				$found = true;
-				$gw['gateway'] = $config['wizardtemp']['wangateway'];
+		if (!empty($config['wizardtemp']['wangateway'])) {
+			if (!is_array($config['gateways']['gateway_item']))
+				$config['gateways']['gateway_item'] = array();
+			$found = false;
+			foreach ($config['gateways']['gateway_item'] as & $gw) {
+				if ($gw['name'] == 'WANGW') {
+					$found = true;
+					$gw['gateway'] = $config['wizardtemp']['wangateway'];
+				}
 			}
+			if (!$found) {
+				$newgw = array();
+				$newgw['interface'] = "wan";
+				$newgw['gateway'] = $config['wizardtemp']['wangateway'];
+				$newgw['name'] = "WANGW";
+				$newgw['weight'] = 1;
+				$newgw['descr'] = "WAN Gateway";
+				$newgw['defaultgw'] = true;
+				$config['gateways']['gateway_item'][] = $newgw;
+			}
+			$config['interfaces']['wan']['gateway'] = "WANGW";
 		}
-		if (!$found) {
-			$newgw = array();
-			$newgw['interface'] = "wan";
-			$newgw['gateway'] = $config['wizardtemp']['wangateway'];
-			$newgw['name'] = "WANGW";
-			$newgw['weight'] = 1;
-			$newgw['descr'] = "WAN Gateway";
-			$newgw['defaultgw'] = true;
-			$config['gateways']['gateway_item'][] = $newgw;
-		}
-		$config['interfaces']['wan']['gateway'] = "WANGW";
 		unset($config['wizardtemp']);
 		write_config();
 		reload_all();
-- 
cgit v1.1