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

dhcp: side-by-side works fine now #6983

Browse Source
This commit is contained in:
Franco Fichtner 2023-11-21 16:24:02 +01:00
parent 7d80f955de
commit 46ea5ba6b4
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/www/services_dhcp.php
View File

@ -343,12 +343,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
break;
}
}
/* make sure that the DHCP Relay isn't enabled on this interface */
if (isset($config['dhcrelay']['enable']) && (stristr($config['dhcrelay']['interface'], $if) !== false)) {
$input_errors[] = sprintf(gettext("You must disable the DHCP relay on the %s interface before enabling the DHCP server."),
!empty($config['interfaces'][$if]['descr']) ? htmlspecialchars($config['interfaces'][$if]['descr']) : strtoupper($if));
}
}
// save data
@ -603,9 +597,6 @@ include("head.inc");
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<?php if (isset($config['dhcrelay']['enable'])): ?>
<?php print_info_box(gettext("DHCP Relay is currently enabled. Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface.")); ?>
<?php else: ?>
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<?php if (isset($savemsg)) print_info_box($savemsg); ?>
<?php if (is_subsystem_dirty('staticmaps')): ?><br/>
@ -1134,8 +1125,7 @@ include("head.inc");
</form>
</div>
</section>
<?php
if (!isset($pool) && !($act == "newpool")): ?>
<?php if (!isset($pool) && !($act == 'newpool')): ?>
<section class="col-xs-12">
<div class="tab-content content-box col-xs-12">
<div class="table-responsive">
@ -1193,8 +1183,7 @@ include("head.inc");
</div>
</div>
</section>
<?php endif ?>
<?php endif ?>
<?php endif ?>
</div>
</div>
</section>