From fcf07bb76fb58556bee76f4e3898ee769b2785d5 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Tue, 30 Aug 2011 15:53:10 +0000
Subject: [PATCH] Fix several issues in pppoe code and remove duplicated code.

---
 etc/inc/vpn.inc                  | 4 ++--
 usr/local/www/vpn_pppoe_edit.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 4baa9b04fc..971c9200d0 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -1252,7 +1252,7 @@ function vpn_pppoe_configure(&$pppoecfg) {
 
 				$clientip = long2ip32(ip2long($pppoecfg['remoteip']) + $i);
 
-				if (isset ($pppoecfg['radius']['radiusissueips']) && isset ($pppoecfg['radius']['server']['enable'])) {
+				if (isset($pppoecfg['radius']['radiusissueips']) && isset($pppoecfg['radius']['server']['enable'])) {
 					$isssue_ip_type = "set ipcp ranges {$pppoecfg['localip']}/32 0.0.0.0/0";
 				} else {
 					$isssue_ip_type = "set ipcp ranges {$pppoecfg['localip']}/32 {$clientip}/32";
@@ -1320,7 +1320,7 @@ EOD;
 				if (isset($pppoecfg['radius']['server']['acctport']))
 					$radiusacctport = $pppoecfg['radius']['server']['acctport'];
 				$mpdconf .=<<<EOD
-	set radius server {$pppoecfg['radius']['server']['ip']} "{$pppoecfg['radius']['server']['secret']} {$radiusport} {$radiusacctport}" 
+	set radius server {$pppoecfg['radius']['server']['ip']} "{$pppoecfg['radius']['server']['secret']}" {$radiusport} {$radiusacctport}
 	set radius retries 3
 	set radius timeout 10
 	set auth enable radius-auth
diff --git a/usr/local/www/vpn_pppoe_edit.php b/usr/local/www/vpn_pppoe_edit.php
index 6c94797487..92d617fde9 100755
--- a/usr/local/www/vpn_pppoe_edit.php
+++ b/usr/local/www/vpn_pppoe_edit.php
@@ -95,7 +95,6 @@ if (isset($id) && $a_pppoes[$id]) {
 			$pconfig['radiusserver2acctport'] = $pppoecfg['radius']['server2']['acctport'];
 			$pconfig['radiussecret2'] = $pppoecfg['radius']['server2']['secret2'];
 		}
-		$pconfig['radiusissueips'] = isset($pppoecfg['radius']['radiusissueips']);
 		$pconfig['radius_nasip'] = $pppoecfg['radius']['nasip'];
 		$pconfig['radius_acct_update'] = $pppoecfg['radius']['acct_update'];
 	}
@@ -170,7 +169,7 @@ if ($_POST) {
 			$pppoecfg['radius']['server']['port'] = $_POST['radiusserverport'];
 			$pppoecfg['radius']['server']['acctport'] = $_POST['radiusserveracctport'];
 		}
-		if ($_POST['radiusserver']) {
+		if ($_POST['radiusserver2']) {
 			$pppoecfg['radius']['server2'] = array();
 
 			$pppoecfg['radius']['server2']['ip'] = $_POST['radiusserver2'];