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

menu: rework wireless status for #1928

Browse Source
This commit is contained in:
Franco Fichtner 2017-11-20 17:14:25 +00:00
parent 581b8b17bc
commit 224579328c
3 changed files with 37 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
View File

@ -100,9 +100,6 @@
<Edit url="/interfaces_wireless_edit.php*" visibility="hidden"/>
</Devices>
<Log VisibleName="Log File" url="/diag_logs_wireless.php"/>
<Status url="/status_wireless.php">
<Status url="/status_wireless.php*" visibility="hidden"/>
</Status>
</Wireless>
<PPP order="940" VisibleName="Point-to-Point" cssClass="fa fa-tty fa-fw">
<Devices url="/interfaces_ppps.php">

21
src/opnsense/mvc/app/models/OPNsense/Base/Menu/MenuSystem.php
View File

@ -103,7 +103,9 @@ class MenuSystem
}
}
}
$config = Config::getInstance()->object();
// add interfaces to "Interfaces" menu tab...
$ifarr = array();
if ($config->interfaces->count() > 0) {
@ -124,6 +126,25 @@ class MenuSystem
));
}
// add interfaces to "Interfaces: Wireless" menu tab...
$wlarr = array();
if ($config->interfaces->count() > 0) {
foreach ($config->interfaces->children() as $key => $node) {
if (!empty($node->wireless)) {
$wlarr[$key] = !empty($node->descr) ? (string)$node->descr : strtoupper($key);
}
}
}
natcasesort($wlarr);
$ordid = 100;
foreach ($wlarr as $key => $descr) {
$this->appendItem('Interfaces.Wireless', $key, array(
'visiblename' => sprintf(gettext('%s Status'), $descr),
'url' => '/status_wireless.php?if='. $key,
'order' => $ordid++,
));
}
// add interfaces to "Firewall: Rules" menu tab...
if ($config->interfaces->count() > 0) {
foreach ($config->interfaces->children() as $key => $node) {

66
src/www/status_wireless.php
View File

@ -34,63 +34,39 @@ require_once("interfaces.inc");
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
if(!empty($_GET['if'])) {
$if = $_GET['if'];
}
if (!empty($_GET['savemsg']) && $_GET['savemsg'] == 'rescan') {
$savemsg = gettext("Rescan has been initiated in the background. Refresh this page in 10 seconds to see the results.");
}
} elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (!empty($_POST['if'])) {
$if = $_POST['if'];
} else {
/* if no interface is provided this invoke is invalid */
header(url_safe('Location: /index.php'));
exit;
}
$rwlif = escapeshellarg(get_real_interface($if));
if(!empty($_POST['rescanwifi'])) {
mwexecf_bg('/sbin/ifconfig %s scan', $rwlif);
header(url_safe('Location: /status_wireless.php?if=%s&savemsg=rescan', array($if)));
if(!empty($_GET['rescanwifi'])) {
mwexec("/sbin/ifconfig {$rwlif} scan; sleep 1");
header(url_safe('Location: /status_wireless.php?if=%s', array($if)));
exit;
}
}
$ciflist = get_configured_interface_with_descr();
if(empty($if)) {
/* Find the first wireless interface */
foreach($ciflist as $interface => $ifdescr) {
if(is_interface_wireless(get_real_interface($interface))) {
$if = $interface;
break;
}
}
}
$rwlif = escapeshellarg(get_real_interface($if));
include("head.inc");
?>
$main_buttons = array(
array('href' => 'status_wireless.php?if=' . html_safe($if) . '&rescanwifi=1', 'label' => gettext('Rescan')),
);
?>
<body>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<?php if (isset($savemsg)) print_info_box($savemsg); ?>
<div class="row">
<section class="col-xs-12">
<?php if (isset($savemsg)) print_info_box($savemsg); ?>
<?php
$tab_array = array();
foreach($ciflist as $interface => $ifdescr) {
if (is_interface_wireless(get_real_interface($interface))) {
$enabled = false;
if($if == $interface) {
$enabled = true;
}
$tab_array[] = array(gettext("Status") . " ({$ifdescr})", $enabled, "status_wireless.php?if={$interface}");
}
}
display_top_tabs($tab_array);
?>
<div class="content-box">
<form method="post" name="iform" id="iform">
<div class="content-box table-responsive __mb">
<input type="hidden" name="if" id="if" value="<?= html_safe($if) ?>">
<header class="content-box-head container-fluid">
<h3><?=gettext("Nearby access points or ad-hoc peers"); ?></h3>
</header>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
@ -138,8 +114,7 @@ include("head.inc");
</tbody>
</table>
</div>
<br/>
<div class="table-responsive">
<div class="content-box table-responsive">
<header class="content-box-head container-fluid">
<h3><?=gettext("Associated or ad-hoc peers"); ?></h3>
</header>
@ -181,18 +156,9 @@ include("head.inc");
<?php
endforeach;?>
</tbody>
</table>
</div>
<div class="table-responsive">
<table class="table table-striped">
<tr>
<td>
<input type="submit" name="rescanwifi" value="<?=gettext("Rescan");?>" class="btn btn-primary"/>
</td>
</tr>
<tfoot>
<tr>
<td>
<td colspan="10">
<b><?=gettext('Flags:') ?></b> <?=gettext('A = authorized, E = Extended Rate (802.11g), P = Power save mode') ?><br />
<b><?=gettext('Capabilities:') ?></b> <?=gettext('E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES), S = Short preamble, s = Short slot time') ?>
</td>