From 88f66e13fc2e8b28b5371145034a77e8d0db27f8 Mon Sep 17 00:00:00 2001
From: Bill Marquette <billm@pfsense.org>
Date: Thu, 10 Mar 2005 05:19:37 +0000
Subject: Move default gateway out of wan config to system config (leave in gui
 though) Remove scheduler config from interfaces Bump config file version to
 1.5

---
 usr/local/www/interfaces.php     | 6 +++---
 usr/local/www/interfaces_wan.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index a4fa794..7d93de9 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -68,7 +68,7 @@ if ($wancfg['ipaddr'] == "dhcp") {
 	$pconfig['type'] = "Static";
 	$pconfig['ipaddr'] = $wancfg['ipaddr'];
 	$pconfig['subnet'] = $wancfg['subnet'];
-	$pconfig['gateway'] = $wancfg['gateway'];
+	$pconfig['gateway'] = $config['system']['gateway'];
 	$pconfig['pointtopoint'] = $wancfg['pointtopoint'];
 }
 
@@ -175,7 +175,7 @@ if ($_POST) {
 
 		unset($wancfg['ipaddr']);
 		unset($wancfg['subnet']);
-		unset($wancfg['gateway']);
+		unset($config['system']['gateway']);
 		unset($wancfg['pointtopoint']);
 		unset($wancfg['dhcphostname']);
 		unset($config['pppoe']['username']);
@@ -199,7 +199,7 @@ if ($_POST) {
 		if ($_POST['type'] == "Static") {
 			$wancfg['ipaddr'] = $_POST['ipaddr'];
 			$wancfg['subnet'] = $_POST['subnet'];
-			$wancfg['gateway'] = $_POST['gateway'];
+			$config['system']['gateway'] = $_POST['gateway'];
 			if (isset($wancfg['ispointtopoint']))
 				$wancfg['pointtopoint'] = $_POST['pointtopoint'];
 		} else if ($_POST['type'] == "DHCP") {
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index a4fa794..7d93de9 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -68,7 +68,7 @@ if ($wancfg['ipaddr'] == "dhcp") {
 	$pconfig['type'] = "Static";
 	$pconfig['ipaddr'] = $wancfg['ipaddr'];
 	$pconfig['subnet'] = $wancfg['subnet'];
-	$pconfig['gateway'] = $wancfg['gateway'];
+	$pconfig['gateway'] = $config['system']['gateway'];
 	$pconfig['pointtopoint'] = $wancfg['pointtopoint'];
 }
 
@@ -175,7 +175,7 @@ if ($_POST) {
 
 		unset($wancfg['ipaddr']);
 		unset($wancfg['subnet']);
-		unset($wancfg['gateway']);
+		unset($config['system']['gateway']);
 		unset($wancfg['pointtopoint']);
 		unset($wancfg['dhcphostname']);
 		unset($config['pppoe']['username']);
@@ -199,7 +199,7 @@ if ($_POST) {
 		if ($_POST['type'] == "Static") {
 			$wancfg['ipaddr'] = $_POST['ipaddr'];
 			$wancfg['subnet'] = $_POST['subnet'];
-			$wancfg['gateway'] = $_POST['gateway'];
+			$config['system']['gateway'] = $_POST['gateway'];
 			if (isset($wancfg['ispointtopoint']))
 				$wancfg['pointtopoint'] = $_POST['pointtopoint'];
 		} else if ($_POST['type'] == "DHCP") {
-- 
cgit v1.1