From 3f425cda43439020be1bac2e99769b9c03afdad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ermal=20Lu=C3=A7i?= Date: Sun, 7 Sep 2008 18:24:05 +0000 Subject: Use different names for pppoe and pptp fields so that problems reported by http://forum.pfsense.org/index.php/topic,11220.0.html is fixed. Reflect the changes even on config conversion part. Add even some code in preparation of merging even lan on the same page. --- etc/inc/config.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'etc') diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 0cd4476..3251c07 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -1524,10 +1524,10 @@ endif; $pconfig['ondemand'] = isset($config['pppoe']['ondemand']); $pconfig['timeout'] = $config['pppoe']['timeout']; unset($config['pppoe']); - $config['interfaces']['wan']['username'] = $pconfig['username']; - $config['interfaces']['wan']['password'] = $pconfig['password']; + $config['interfaces']['wan']['pppoe_username'] = $pconfig['username']; + $config['interfaces']['wan']['pppoe_password'] = $pconfig['password']; $config['interfaces']['wan']['provider'] = $pconfig['provider']; - $config['interfaces']['wan']['username'] = isset($pconfig['ondemand']); + $config['interfaces']['wan']['ondemand'] = isset($pconfig['ondemand']); $config['interfaces']['wan']['timeout'] = $pconfig['timeout']; } if (is_array($config['pptp'])) { @@ -1538,10 +1538,10 @@ endif; $pconfig['ondemand'] = isset($config['pptp']['ondemand']); $pconfig['timeout'] = $config['pptp']['timeout']; unset($config['pptp']); - $config['interfaces']['wan']['username'] = $pconfig['username']; - $config['interfaces']['wan']['password'] = $pconfig['password']; + $config['interfaces']['wan']['pptp_username'] = $pconfig['username']; + $config['interfaces']['wan']['pptp_password'] = $pconfig['password']; $config['interfaces']['wan']['provider'] = $pconfig['provider']; - $config['interfaces']['wan']['username'] = isset($pconfig['ondemand'] ); + $config['interfaces']['wan']['ondemand'] = isset($pconfig['ondemand'] ); $config['interfaces']['wan']['timeout'] = $pconfig['timeout']; } -- cgit v1.1