lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 01:54:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: fix warnings that only appear when validation fails

Browse Source
This commit is contained in:
Franco Fichtner 2022-01-17 17:34:23 +01:00
parent 981373b4cd
commit 68775a50e8
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/www/system_general.php
View File

@ -44,9 +44,9 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['dnsallowoverride'] = isset($config['system']['dnsallowoverride']);
if (!empty($config['system']['dnsallowoverride_exclude'])) {
$pconfig['dnsallowoverride_exclude'] = explode(",", $config['system']['dnsallowoverride_exclude']);
$pconfig['dnsallowoverride_exclude'] = explode(',', $config['system']['dnsallowoverride_exclude']);
} else {
$pconfig['dnsallowoverride_exclude'] = array();
$pconfig['dnsallowoverride_exclude'] = [];
}
$pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']);
$pconfig['dnssearchdomain'] = $config['system']['dnssearchdomain'];
@ -75,6 +75,10 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$reqdfields = explode(" ", "hostname domain");
$reqdfieldsn = array(gettext("Hostname"),gettext("Domain"));
if (empty($pconfig['dnsallowoverride_exclude'])) {
$pconfig['dnsallowoverride_exclude'] = [];
}
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
if (!empty($pconfig['hostname']) && !is_hostname($pconfig['hostname'])) {
@ -158,7 +162,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (!empty($pconfig['dnsallowoverride'])) {
$config['system']['dnsallowoverride'] = true;
$config['system']['dnsallowoverride_exclude'] = empty($pconfig['dnsallowoverride_exclude']) ? "" : implode(",", $pconfig['dnsallowoverride_exclude']);
$config['system']['dnsallowoverride_exclude'] = implode(',', $pconfig['dnsallowoverride_exclude']);
} elseif (isset($config['system']['dnsallowoverride'])) {
unset($config['system']['dnsallowoverride']);
if (isset($config['system']['dnsallowoverride_exclude'])) {
@ -476,13 +480,11 @@ $( document ).ready(function() {
<strong><?=gettext("Exclude interfaces");?></strong>
<br/>
<select name="dnsallowoverride_exclude[]" class="selectpicker" data-style="btn-default" data-live-search="true" multiple="multiple">
<?php
foreach (legacy_config_get_interfaces(array('virtual' => false, "enable" => true)) as $iface => $ifcfg):?>
<?php foreach (legacy_config_get_interfaces(array('virtual' => false, "enable" => true)) as $iface => $ifcfg): ?>
<option value="<?=$iface;?>" <?=in_array($iface, $pconfig['dnsallowoverride_exclude']) ? "selected='selected'" : "";?>>
<?= $ifcfg['descr'] ?>
</option>
<?php
endforeach;?>
<?php endforeach ?>
</select>
</div>
</td>