Commit 130d52da authored by Franco Fichtner's avatar Franco Fichtner

wol: remove from core

parent c91841af
...@@ -146,7 +146,6 @@ CORE_DEPENDS?= apinger \ ...@@ -146,7 +146,6 @@ CORE_DEPENDS?= apinger \
suricata \ suricata \
syslogd \ syslogd \
unbound \ unbound \
wol \
zip zip
WRKDIR?=${.CURDIR}/work WRKDIR?=${.CURDIR}/work
......
...@@ -58,7 +58,6 @@ ...@@ -58,7 +58,6 @@
/usr/local/etc/inc/plugins.inc.d/squid.inc /usr/local/etc/inc/plugins.inc.d/squid.inc
/usr/local/etc/inc/plugins.inc.d/suricata.inc /usr/local/etc/inc/plugins.inc.d/suricata.inc
/usr/local/etc/inc/plugins.inc.d/unbound.inc /usr/local/etc/inc/plugins.inc.d/unbound.inc
/usr/local/etc/inc/plugins.inc.d/wol.inc
/usr/local/etc/inc/rrd.inc /usr/local/etc/inc/rrd.inc
/usr/local/etc/inc/services.inc /usr/local/etc/inc/services.inc
/usr/local/etc/inc/squid.auth-user.php /usr/local/etc/inc/squid.auth-user.php
...@@ -467,8 +466,6 @@ ...@@ -467,8 +466,6 @@
/usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml /usr/local/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
/usr/local/opnsense/mvc/app/models/OPNsense/UPnP/ACL/ACL.xml /usr/local/opnsense/mvc/app/models/OPNsense/UPnP/ACL/ACL.xml
/usr/local/opnsense/mvc/app/models/OPNsense/UPnP/Menu/Menu.xml /usr/local/opnsense/mvc/app/models/OPNsense/UPnP/Menu/Menu.xml
/usr/local/opnsense/mvc/app/models/OPNsense/WOL/ACL/ACL.xml
/usr/local/opnsense/mvc/app/models/OPNsense/WOL/Menu/Menu.xml
/usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/clients.volt
/usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/index.volt
/usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/vouchers.volt /usr/local/opnsense/mvc/app/views/OPNsense/CaptivePortal/vouchers.volt
...@@ -1062,8 +1059,6 @@ ...@@ -1062,8 +1059,6 @@
/usr/local/www/services_unbound_host_edit.php /usr/local/www/services_unbound_host_edit.php
/usr/local/www/services_unbound_overrides.php /usr/local/www/services_unbound_overrides.php
/usr/local/www/services_upnp.php /usr/local/www/services_upnp.php
/usr/local/www/services_wol.php
/usr/local/www/services_wol_edit.php
/usr/local/www/status_dhcp_leases.php /usr/local/www/status_dhcp_leases.php
/usr/local/www/status_dhcpv6_leases.php /usr/local/www/status_dhcpv6_leases.php
/usr/local/www/status_filter_reload.php /usr/local/www/status_filter_reload.php
...@@ -1136,7 +1131,6 @@ ...@@ -1136,7 +1131,6 @@
/usr/local/www/widgets/include/system_log.inc /usr/local/www/widgets/include/system_log.inc
/usr/local/www/widgets/include/thermal_sensors.inc /usr/local/www/widgets/include/thermal_sensors.inc
/usr/local/www/widgets/include/traffic_graph.inc /usr/local/www/widgets/include/traffic_graph.inc
/usr/local/www/widgets/include/wake_on_lan.inc
/usr/local/www/widgets/widgets/carp_status.widget.php /usr/local/www/widgets/widgets/carp_status.widget.php
/usr/local/www/widgets/widgets/dyn_dns_status.widget.php /usr/local/www/widgets/widgets/dyn_dns_status.widget.php
/usr/local/www/widgets/widgets/gateways.widget.php /usr/local/www/widgets/widgets/gateways.widget.php
...@@ -1154,7 +1148,6 @@ ...@@ -1154,7 +1148,6 @@
/usr/local/www/widgets/widgets/system_log.widget.php /usr/local/www/widgets/widgets/system_log.widget.php
/usr/local/www/widgets/widgets/thermal_sensors.widget.php /usr/local/www/widgets/widgets/thermal_sensors.widget.php
/usr/local/www/widgets/widgets/traffic_graphs.widget.php /usr/local/www/widgets/widgets/traffic_graphs.widget.php
/usr/local/www/widgets/widgets/wake_on_lan.widget.php
/usr/local/www/wizard.php /usr/local/www/wizard.php
/usr/local/www/xmlrpc.php /usr/local/www/xmlrpc.php
@shadow /usr/local/etc/bogons.sample @shadow /usr/local/etc/bogons.sample
......
<?php
/*
Copyright (C) 2016 Franco Fichtner <franco@opnsense.org>
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
function wol_xmlrpc_sync()
{
$result = array();
$result[] = array(
'description' => gettext('Wake on LAN'),
'section' => 'wol',
'id' => 'wol',
);
return $result;
}
<acl>
<page-services-wakeonlan>
<name>Services: Wake on LAN</name>
<patterns>
<pattern>services_wol.php*</pattern>
</patterns>
</page-services-wakeonlan>
<page-services-wakeonlan-edit>
<name>Services: Wake on LAN: Edit</name>
<patterns>
<pattern>services_wol_edit.php*</pattern>
</patterns>
</page-services-wakeonlan-edit>
</acl>
<menu>
<Services>
<WoL VisibleName="Wake on LAN" url="/services_wol.php" cssClass="fa fa-power-off fa-fw">
<WoLEdit url="/services_wol_edit.php*" visibility="hidden"/>
<Wol url="/services_wol.php*" visibility="hidden"/>
</WoL>
</Services>
</menu>
This diff is collapsed.
<?php
/*
Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("guiconfig.inc");
require_once("interfaces.inc");
function wolcmp($a, $b) {
return strcmp($a['descr'], $b['descr']);
}
if (empty($config['wol']['wolentry']) || !is_array($config['wol']['wolentry'])) {
$config['wol'] = array();
$config['wol']['wolentry'] = array();
}
$a_wol = &$config['wol']['wolentry'];
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if (isset($_GET['id']) && !empty($a_wol[$_GET['id']])) {
$id = $_GET['id'];
}
$pconfig = array();
foreach (array('interface', 'mac', 'descr') as $fieldname) {
if (isset($id) && isset($a_wol[$id][$fieldname])) {
$pconfig[$fieldname] = $a_wol[$id][$fieldname];
} elseif (isset($_GET[$fieldname])) {
$pconfig[$fieldname] = $_GET[$fieldname];
} else {
$pconfig[$fieldname] = null;
}
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (isset($_POST['id']) && !empty($a_wol[$_POST['id']])) {
$id = $_POST['id'];
}
$pconfig = $_POST;
$input_errors = array();
/* input validation */
$reqdfields = explode(" ", "interface mac");
$reqdfieldsn = array(gettext("Interface"),gettext("MAC address"));
do_input_validation($pconfig, $reqdfields, $reqdfieldsn, $input_errors);
/* normalize MAC addresses - lowercase and convert Windows-ized hyphenated MACs to colon delimited */
$pconfig['mac'] = strtolower(str_replace("-", ":", $pconfig['mac']));
if (!empty($pconfig['mac']) && !is_macaddr($_POST['mac'])) {
$input_errors[] = gettext("A valid MAC address must be specified.");
}
if (count($input_errors) == 0) {
$wolent = array();
$wolent['interface'] = $_POST['interface'];
$wolent['mac'] = $_POST['mac'];
$wolent['descr'] = $_POST['descr'];
if (isset($id)) {
$a_wol[$id] = $wolent;
} else {
$a_wol[] = $wolent;
}
usort($config['wol']['wolentry'], "wolcmp");
write_config();
header(url_safe('Location: /services_wol.php'));
exit;
}
}
include("head.inc");
legacy_html_escape_form_data($pconfig);
?>
<body>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<div class="content-box">
<form method="post" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped opnsense_standard_table_form">
<tr>
<td width="22%">
<strong><?=gettext("Edit WOL entry");?></strong>
</td>
<td width="78%" align="right">
<small><?=gettext("full help"); ?> </small>
<i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page"></i>
</td>
</tr>
<tr>
<td><a id="help_for_interface" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Interface");?></td>
<td>
<select name="interface" class="selectpicker">
<?php
foreach (get_configured_interface_with_descr() as $iface => $ifacename): ?>
<option value="<?=$iface;?>" <?= !link_interface_to_bridge($iface) && $iface == $pconfig['interface'] ? "selected=\"selected\"" : ""; ?>>
<?=htmlspecialchars($ifacename);?>
</option>
<?php
endforeach; ?>
</select>
<div class="hidden" for="help_for_interface">
<?=gettext("Choose which interface this host is connected to.");?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_mac" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("MAC address");?></td>
<td>
<input name="mac" type="text" value="<?=$pconfig['mac'];?>" />
<div class="hidden" for="help_for_mac">
<?=gettext("Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx");?>
</div>
</td>
</tr>
<tr>
<td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description");?></td>
<td>
<input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
<div class="hidden" for="help_for_descr">
<?=gettext("You may enter a description here for your reference (not parsed).");?>
</div>
</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" />
<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='/services_wol.php'" />
<?php if (isset($id)): ?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" />
<?php endif; ?>
</td>
</tr>
</table>
</div>
</form>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php
$wake_on_lan_title = gettext('Wake On Lan');
$wake_on_lan_title_link = 'services_wol.php';
<?php
/*
Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2010 Yehuda Katz
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INClUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("guiconfig.inc");
require_once("widgets/include/wake_on_lan.inc");
require_once("interfaces.inc");
if (isset($config['wol']['wolentry'])) {
$wolcomputers = $config['wol']['wolentry'];
} else {
$wolcomputers = array();
}
?>
<table class="table table-striped table-condensed">
<thead>
<tr>
<th><?=gettext("Computer / Device");?></th>
<th><?=gettext("Interface");?></th>
<th><?=gettext("Status");?></th>
<th></th>
</tr>
</thead>
<tbody>
<?php
foreach ($wolcomputers as $wolent):
$is_active = exec("/usr/sbin/arp -an |/usr/bin/grep {$wolent['mac']}| /usr/bin/wc -l|/usr/bin/awk '{print $1;}'");?>
<tr>
<td><?=$wolent['descr'];?><br/><?=$wolent['mac'];?></td>
<td><?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($wolent['interface']));?></td>
<td>
<span class="glyphicon glyphicon-<?=$is_active == 1 ? "play" : "remove";?> text-<?=$is_active == 1 ? "success" : "danger";?>" ></span>
<?=$is_active == 1 ? gettext("Online") : gettext("Offline");?>
</td>
<td>
<a href="services_wol.php?mac=<?=$wolent['mac'];?>&amp;if=<?=$wolent['interface'];?>">
<span class="glyphicon glyphicon-flash" title="<?=gettext("Wake Up");?>"></span>
</a>
</td>
</tr>
<?php
endforeach;
if (count($wolcomputers) == 0):?>
<tr>
<td colspan="4" ><?=gettext("No saved WoL addresses");?></td>
</tr>
<?php
endif;?>
</tbody>
<tfoot>
<tr>
<td colspan="4"><a href="status_dhcp_leases.php" class="navlink"><?= gettext('DHCP Leases Status') ?></a></td>
</tr>
</tfoot>
</table>
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