lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: remove null_service, empty service name works; closes #6568

Browse Source
This commit is contained in:
Franco Fichtner 2023-07-21 11:39:35 +02:00
parent 7366d785a6
commit c3db32722d
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/interfaces.inc
View File

@ -1215,7 +1215,7 @@ EOD;
}
}
} elseif ($ppp['type'] == "pppoe") {
$provider = isset($ppp['provider']) ? $ppp['provider'] : "";
$provider = $ppp['provider'] ?? '';
$hostuniq = '';
if (!empty($ppp['hostuniq'])) {
$hostuniq = '0x' . strtolower(array_shift(unpack('H*', $ppp['hostuniq']))) . '|';

4
src/www/interfaces.php
View File

@ -1103,9 +1103,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
$new_ppp_config['username'] = $pconfig['pppoe_username'];
$new_ppp_config['password'] = base64_encode($pconfig['pppoe_password']);
if (!empty($pconfig['provider'])) {
$new_ppp_config['provider'] = $pconfig['provider'];
}
$new_ppp_config['provider'] = $pconfig['provider'];
if (!empty($pconfig['pppoe_hostuniq'])) {
$new_ppp_config['hostuniq'] = $pconfig['pppoe_hostuniq'];
}

13
src/www/interfaces_ppps_edit.php
View File

@ -106,7 +106,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// special cases
$pconfig['password'] = isset($a_ppps[$id]['password']) ? base64_decode($a_ppps[$id]['password']) : null;
$pconfig['initstr'] = isset($a_ppps[$id]['initstr']) ? base64_decode($a_ppps[$id]['initstr']) : null;
$pconfig['null_service'] = (isset($a_ppps[$id]['provider']) && empty($a_ppps[$id]['provider']));
if ($pconfig['ptpid'] == null) {
$pconfig['ptpid'] = interfaces_ptpid_next();
@ -162,9 +161,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (!empty($pconfig['provider']) && !is_domain($pconfig['provider'])) {
$input_errors[] = gettext("The Service name contains invalid characters.");
}
if (!empty($pconfig['provider']) && !empty($pconfig['null_service'])) {
$input_errors[] = gettext("Do not specify both a Service name and a NULL Service name.");
}
if (($pconfig['idletimeout'] != "") && !is_numericint($pconfig['idletimeout'])) {
$input_errors[] = gettext("The idle timeout value must be an integer.");
}
@ -239,11 +235,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
}
break;
case "pppoe":
if (!empty($pconfig['provider'])) {
$ppp['provider'] = $pconfig['provider'];
} else {
$ppp['provider'] = !empty($pconfig['null_service']);
}
$ppp['provider'] = $pconfig['provider'];
if (!empty($pconfig['hostuniq'])) {
$ppp['hostuniq'] = $pconfig['hostuniq'];
}
@ -573,8 +565,7 @@ include("head.inc");
<tr style="display:none" id="pppoe">
<td><a id="help_for_provider" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?= gettext("Service name"); ?></td>
<td>
<input name="provider" type="text" id="provider" value="<?=$pconfig['provider'];?>" />&nbsp;&nbsp;
<input type="checkbox" value="on" id="null_service" name="null_service" <?=!empty($pconfig['null_service']) ? "checked=\"checked\"" : ""; ?> /> <?= gettext("Configure a NULL Service name"); ?>
<input name="provider" type="text" id="provider" value="<?=$pconfig['provider'];?>" />
<div class="hidden" data-for="help_for_provider">
<?= gettext("Hint: this field can usually be left empty. Service name will not be configured if this field is empty. Check the \"Configure NULL\" box to configure a blank Service name."); ?>
</div>