diff options
| author | gnhb <gnoahb@gmail.com> | 2010-06-10 22:54:17 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-06-10 22:54:17 +0700 |
| commit | ced4df74289cb84ac9aa05d77e78ea81abb423e7 (patch) | |
| tree | 2bbd43ebb0901976ce646dbe95ebfdd86345655e /usr/local/www/interfaces_ppps_edit.php | |
| parent | 2b52ecd6fd2440e7e835163333f2cfd3eab6ea8d (diff) | |
| download | pfsense-ced4df74289cb84ac9aa05d77e78ea81abb423e7.zip pfsense-ced4df74289cb84ac9aa05d77e78ea81abb423e7.tar.gz | |
Take out all code that assumes to use DHCP for local ip if local ip is left blank.
Also, check for blank local IPs and error out if they occur.
Diffstat (limited to 'usr/local/www/interfaces_ppps_edit.php')
| -rw-r--r-- | usr/local/www/interfaces_ppps_edit.php | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php index 9b4e028..f218f3c 100644 --- a/usr/local/www/interfaces_ppps_edit.php +++ b/usr/local/www/interfaces_ppps_edit.php @@ -102,10 +102,6 @@ if (isset($id) && $a_ppps[$id]) { case "l2tp": case "pptp": $pconfig['localip'] = explode(",",$a_ppps[$id]['localip']); - foreach ($pconfig['localip'] as $key => $value){ - if ($value == "dhcp") - $pconfig['localip'][$key] = ""; - } $pconfig['subnet'] = explode(",",$a_ppps[$id]['subnet']); $pconfig['gateway'] = explode(",",$a_ppps[$id]['gateway']); case "pppoe": @@ -327,13 +323,6 @@ if ($_POST) { break; case "pptp": case "l2tp": - $ppp['dhcp'] = $_POST['pptp_dhcp'] ? true : false; - foreach ($port_data['localip'] as $key => $value){ - if (empty($value)){ - $port_data['localip'][$key] = "dhcp"; - $port_data['subnet'][$key] = ""; - } - } $ppp['localip'] = implode(',',$port_data['localip']); $ppp['subnet'] = implode(',',$port_data['subnet']); $ppp['gateway'] = implode(',',$port_data['gateway']); @@ -664,7 +653,7 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" <?php for ($i = 31; $i > 0; $i--): ?> <option value="<?=$i;?>"<?php if ($i == $pconfig['subnet'][$j]) echo " selected"; ?>><?=$i;?></option> <?php endfor; ?> - </select> <?= gettext("IP Address (Leave empty to enable DHCP)"); ?> + </select> <?= gettext("IP Address"); ?> </td> </tr> |
