summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
Diffstat (limited to 'usr/local')
-rw-r--r--usr/local/www/interfaces_ppps_edit.php11
1 files changed, 7 insertions, 4 deletions
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php
index cbff81a..7aa65de 100644
--- a/usr/local/www/interfaces_ppps_edit.php
+++ b/usr/local/www/interfaces_ppps_edit.php
@@ -208,8 +208,10 @@ if ($_POST) {
}
if ($_POST['type'] == "ppp" && count($_POST['interfaces']) > 1)
$input_errors[] = gettext("Multilink connections (MLPPP) using the PPP link type is not currently supported. Please select only one Link Interface.");
- if (($_POST['provider'] && !is_domain($_POST['provider'])))
- $input_errors[] = gettext("The service name contains invalid characters.");
+ if ($_POST['provider'] && !is_domain($_POST['provider']))
+ $input_errors[] = gettext("The Service name contains invalid characters.");
+ if ($_POST['provider'] && $_POST['null_service'])
+ $input_errors[] = gettext("Do not specify both a Service name and a NULL Service name.");
if (($_POST['idletimeout'] != "") && !is_numericint($_POST['idletimeout']))
$input_errors[] = gettext("The idle timeout value must be an integer.");
if ($_POST['pppoe-reset-type'] == "custom" && $_POST['pppoe_resethour'] <> "" && !is_numericint($_POST['pppoe_resethour']) &&
@@ -315,9 +317,10 @@ if ($_POST) {
case "pppoe":
if (!empty($_POST['provider']))
$ppp['provider'] = $_POST['provider'];
- else
+ else{
unset($ppp['provider']);
- $ppp['provider'] = $_POST['null_service'] ? true : false;
+ $ppp['provider'] = $_POST['null_service'] ? true : false;
+ }
if (!empty($_POST['pppoe-reset-type']))
$ppp['pppoe-reset-type'] = $_POST['pppoe-reset-type'];
else
OpenPOWER on IntegriCloud