Skip to content

O
OpnSense
Commit 550d4d95 authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

(legacy) refactor services_dhcp_relay.php

parent 493a3d18
Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 182 deletions
src/www/services_dhcp_relay.php
View file @ 550d4d95
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2010 Ermal Luçi Copyright (C) 2010 Ermal Luçi
Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com> Copyright (C) 2003-2004 Justin Ellison <justin@techadvise.com>
All rights reserved. All rights reserved.
...@@ -33,162 +33,141 @@ require_once("services.inc"); ...@@ -33,162 +33,141 @@ require_once("services.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
$pconfig['enable'] = isset($config['dhcrelay']['enable']);
if (empty($config['dhcrelay']['interface'])) { if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$pconfig['enable'] = isset($config['dhcrelay']['enable']);
if (empty($config['dhcrelay']['interface'])) {
$pconfig['interface'] = array(); $pconfig['interface'] = array();
} else { } else {
$pconfig['interface'] = explode(",", $config['dhcrelay']['interface']); $pconfig['interface'] = explode(",", $config['dhcrelay']['interface']);
} }
if (!isset($config['dhcrelay']['server'])) { if (empty($config['dhcrelay']['server'])) {
$pconfig['server'] = array(); $pconfig['server'] = "";
} else { } else {
$pconfig['server'] = $config['dhcrelay']['server']; $pconfig['server'] = $config['dhcrelay']['server'];
} }
$pconfig['agentoption'] = isset($config['dhcrelay']['agentoption']); $pconfig['agentoption'] = isset($config['dhcrelay']['agentoption']);
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
$iflist = get_configured_interface_with_descr(); $input_errors = array();
/* set the enabled flag which will tell us if DHCP server is enabled
* on any interface. We will use this to disable dhcp-relay since
* the two are not compatible with each other.
*/
$dhcpd_enabled = false;
if (is_array($config['dhcpd'])) {
foreach($config['dhcpd'] as $dhcp)
if (isset($dhcp['enable']))
$dhcpd_enabled = true;
}
if ($_POST) {
unset($input_errors);
$pconfig = $_POST; $pconfig = $_POST;
/* input validation */ /* input validation */
if ($_POST['enable']) {
$reqdfields = explode(" ", "server interface"); $reqdfields = explode(" ", "server interface");
$reqdfieldsn = array(gettext("Destination Server"), gettext("Interface")); $reqdfieldsn = array(gettext("Destination Server"), gettext("Interface"));
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
if ($_POST['server']) { if (!empty($pconfig['server'])) {
$checksrv = explode(",", $_POST['server']); $checksrv = explode(",", $pconfig['server']);
foreach ($checksrv as $srv) { foreach ($checksrv as $srv) {
if (!is_ipaddr($srv)) if (!is_ipaddr($srv)) {
$input_errors[] = gettext("A valid Destination Server IP address must be specified."); $input_errors[] = gettext("A valid Destination Server IP address must be specified.");
} }
} }
} }
if (!$input_errors) { if (count($input_errors) == 0) {
$config['dhcrelay']['enable'] = $_POST['enable'] ? true : false; $config['dhcrelay']['enable'] = !empty($pconfig['enable']);
$config['dhcrelay']['interface'] = implode(",", $_POST['interface']); $config['dhcrelay']['interface'] = implode(",", $pconfig['interface']);
$config['dhcrelay']['agentoption'] = $_POST['agentoption'] ? true : false; $config['dhcrelay']['agentoption'] = !empty($pconfig['agentoption']);
$config['dhcrelay']['server'] = $_POST['server']; $config['dhcrelay']['server'] = $pconfig['server'];
write_config(); write_config();
// reconfigure
services_dhcrelay_configure();
header("Location: services_dhcp_relay.php");
exit;
}
}
$retval = 0;
$retval = services_dhcrelay_configure();
$savemsg = get_std_save_message();
$iflist = get_configured_interface_with_descr();
/* set the enabled flag which will tell us if DHCP server is enabled
* on any interface. We will use this to disable dhcp-relay since
* the two are not compatible with each other.
*/
$dhcpd_enabled = false;
if (is_array($config['dhcpd'])) {
foreach($config['dhcpd'] as $dhcp) {
if (isset($dhcp['enable'])) {
$dhcpd_enabled = true;
}
} }
} }
$service_hook = 'dhcrelay'; $service_hook = 'dhcrelay';
include("head.inc"); include("head.inc");
?> ?>
<body> <body>
<script type="text/javascript">
//<![CDATA[
function enable_change(enable_over) {
if (document.iform.enable.checked || enable_over) {
document.iform.server.disabled = 0;
document.iform.interface.disabled = 0;
document.iform.agentoption.disabled = 0;
} else {
document.iform.server.disabled = 1;
document.iform.interface.disabled = 1;
document.iform.agentoption.disabled = 1;
}
}
//]]>
</script>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?> <?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<?php if (isset($savemsg)) print_info_box($savemsg); ?> <?php if (isset($savemsg)) print_info_box($savemsg); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<form method="post" name="iform" id="iform">
<form action="services_dhcp_relay.php" method="post" name="iform" id="iform"> <?php
if ($dhcpd_enabled): ?>
<?php if ($dhcpd_enabled): ?>
<p><?= gettext('DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.') ?></p> <p><?= gettext('DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.') ?></p>
<?php else: ?> <?php
else: ?>
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("DHCP Relay configuration"); ?></h3> <h3><?=gettext("DHCP Relay configuration"); ?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped">
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?= gettext('Enable') ?></td> <td width="22%"><i class="fa fa-info-circle text-muted"></i> <?=gettext('Enable') ?></td>
<td width="78%" class="vtable"> <td width="78%">
<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" /> <input name="enable" type="checkbox" value="yes" <?=!empty($pconfig['enable']) ? "checked=\"checked\"" : ""; ?> onclick="enable_change(false)" />
<strong><?php printf(gettext("Enable DHCP relay on interface"));?></strong>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?= gettext('Interface(s)') ?></td> <td><a id="help_for_interface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext('Interface(s)') ?></td>
<td width="78%" class="vtable"> <td>
<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3"> <select id="interface" name="interface[]" multiple="multiple" class="selectpicker">
<?php <?php
foreach ($iflist as $ifent => $ifdesc) { foreach ($iflist as $ifent => $ifdesc):
if (!is_ipaddr(get_interface_ip($ifent))) if (!is_ipaddr(get_interface_ip($ifent))) {
continue; continue;
echo "<option value=\"{$ifent}\""; }?>
if (isset($pconfig['interface']) && in_array($ifent, $pconfig['interface'])) <option value="<?=$ifent;?>" <?=isset($pconfig['interface']) && in_array($ifent, $pconfig['interface']) ? "selected=\"selected\"" : "";?>>
echo " selected=\"selected\""; <?=$ifdesc;?>
echo ">{$ifdesc}</option>\n"; </option>
} <?php
?> endforeach;?>
</select> </select>
<br /><?= gettext('Interfaces without an IP address will not be shown.') ?> <div class="hidden" for="help_for_interface">
<?= gettext('Interfaces without an IP address will not be shown.') ?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vtable">&nbsp;</td> <td><a id="help_for_agentoption" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Append circuit ID");?></td>
<td width="78%" class="vtable"> <td>
<input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked=\"checked\""; ?> /> <input name="agentoption" type="checkbox" value="yes" <?=!empty($pconfig['agentoption']) ? "checked=\"checked\"" : ""; ?> />
<strong><?=gettext("Append circuit ID and agent ID to requests"); ?></strong><br /> <strong><?=gettext("Append circuit ID and agent ID to requests"); ?></strong><br />
<?php printf(gettext("If this is checked, the DHCP relay will append the circuit ID (%s interface number) and the agent ID to the DHCP request."), $g['product_name']); ?></td> <div class="hidden" for="help_for_agentoption">
<?php printf(gettext("If this is checked, the DHCP relay will append the circuit ID (%s interface number) and the agent ID to the DHCP request."), $g['product_name']); ?>
</div>
</td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top" class="vncellreq"><?=gettext("Destination server");?></td> <td><a id="help_for_server" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Destination server");?></td>
<td width="78%" class="vtable"> <td>
<input name="server" type="text" class="formfld unknown" id="server" size="20" value="<?=!empty($pconfig['server'])?htmlspecialchars($pconfig['server']):"";?>" /> <input name="server" type="text" value="<?=!empty($pconfig['server']) ? htmlspecialchars($pconfig['server']):"";?>" />
<br /> <div class="hidden" for="help_for_server">
<?=gettext("This is the IP address of the server to which DHCP requests are relayed. You can enter multiple server IP addresses, separated by commas. Select \"Proxy requests to DHCP server on WAN subnet\" to relay DHCP packets to the server that was used on the WAN interface.");?> <?=gettext("This is the IP address of the server to which DHCP requests are relayed. You can enter multiple server IP addresses, separated by commas. Select \"Proxy requests to DHCP server on WAN subnet\" to relay DHCP packets to the server that was used on the WAN interface.");?>
</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="22%" valign="top">&nbsp;</td> <td>&nbsp;</td>
<td width="78%"> <td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" onclick="enable_change(true)" /> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" onclick="enable_change(true)" />
</td> </td>
</tr> </tr>
...@@ -202,10 +181,4 @@ function enable_change(enable_over) { ...@@ -202,10 +181,4 @@ function enable_change(enable_over) {
</div> </div>
</div> </div>
</section> </section>
<script type="text/javascript">
//<![CDATA[
enable_change(false);
//]]>
</script>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023