frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Processed with phpcbf for PSR-2 coding standard

Browse Source
This commit is contained in:
billz 2019-09-07 16:42:31 +01:00
parent ef406edc61
commit 8be24381a8
20 changed files with 106 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/configure_client.php
View File

@ -96,5 +96,4 @@ function DisplayWPAConfig()
connectedWifiStations($networks); connectedWifiStations($networks);
echo renderTemplate("configure_client", compact("status")); echo renderTemplate("configure_client", compact("status"));
} }

22
includes/dashboard.php
View File

@ -173,12 +173,21 @@ function DisplayDashboard()
echo renderTemplate("dashboard", compact( echo renderTemplate("dashboard", compact(
"status", "status",
"ipv4Addrs", "ipv4Netmasks", "ipv4Addrs",
"ipv6Addrs", "macAddr", "ipv4Netmasks",
"strRxPackets", "strRxBytes", "ipv6Addrs",
"strTxPackets", "strTxBytes", "macAddr",
"connectedSSID", "connectedBSSID", "strRxPackets",
"bitrate", "signalLevel", "txPower", "frequency", "strLinkQuality", "strRxBytes",
"strTxPackets",
"strTxBytes",
"connectedSSID",
"connectedBSSID",
"bitrate",
"signalLevel",
"txPower",
"frequency",
"strLinkQuality",
"wlan0up" "wlan0up"
)); ));
} }
@ -213,4 +222,3 @@ function getHumanReadableDatasize($numbytes, $precision = 2)
return $humanDatasize; return $humanDatasize;
} }

15
includes/dhcp.php
View File

@ -138,10 +138,17 @@ function DisplayDHCPConfig()
echo renderTemplate("dhcp", compact( echo renderTemplate("dhcp", compact(
"status", "status",
"serviceStatus", "serviceStatus",
"RangeStart", "RangeEnd", "RangeStart",
"RangeEnd",
"arrRangeLeaseTime", "arrRangeLeaseTime",
"mselected", "hselected", "dselected", "infiniteselected", "mselected",
"dnsmasq_state", "conf", "dhcpHost", "hselected",
"interfaces", "leases" "dselected",
"infiniteselected",
"dnsmasq_state",
"conf",
"dhcpHost",
"interfaces",
"leases"
)); ));
} }

14
includes/functions.php
View File

@ -194,7 +194,9 @@ function ParseConfig($arrConfig)
$config = array(); $config = array();
foreach ($arrConfig as $line) { foreach ($arrConfig as $line) {
$line = trim($line); $line = trim($line);
if ($line == "" || $line[0] == "#") { continue; } if ($line == "" || $line[0] == "#") {
continue;
}
list($option, $value) = array_map("trim", explode("=", $line, 2)); list($option, $value) = array_map("trim", explode("=", $line, 2));
@ -384,14 +386,14 @@ function DisplayOpenVPNConfig()
} else { } else {
echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL; echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL;
} }
?> ?>
</form> </form>
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->
<div class="panel-footer"> Information provided by openvpn</div> <div class="panel-footer"> Information provided by openvpn</div>
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
</div><!-- /.row --> </div><!-- /.row -->
<?php <?php
} }
/** /**
@ -420,7 +422,7 @@ function DisplayTorProxyConfig()
} }
} }
?> ?>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-primary"> <div class="panel panel-primary">
@ -535,7 +537,7 @@ function DisplayTorProxyConfig()
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->
</div><!-- /.col-lg-12 --> </div><!-- /.col-lg-12 -->
</div><!-- /.row --> </div><!-- /.row -->
<?php <?php
} }
/** /**
@ -585,7 +587,7 @@ function renderTemplate($name, $data = [])
return "template $name ($file) not found"; return "template $name ($file) not found";
} }
if (is_array($data)){ if (is_array($data)) {
extract($data); extract($data);
} }

14
includes/hostapd.php
View File

@ -59,10 +59,15 @@ function DisplayHostAPDConfig()
echo renderTemplate("hostapd", compact( echo renderTemplate("hostapd", compact(
"status", "status",
"serviceStatus", "hostapdstatus", "serviceStatus",
"interfaces", "arrConfig", "hostapdstatus",
"arr80211Standard", "selectedHwMode", "interfaces",
"arrSecurity", "arrEncType", "arrHostapdConf" "arrConfig",
"arr80211Standard",
"selectedHwMode",
"arrSecurity",
"arrEncType",
"arrHostapdConf"
)); ));
} }
@ -260,4 +265,3 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
return true; return true;
} }

1
includes/system.php
View File

@ -102,4 +102,3 @@ function DisplaySystem()
echo renderTemplate("system", compact("arrLocales", "status", "system")); echo renderTemplate("system", compact("arrLocales", "status", "system"));
} }

2
includes/wifi_functions.php
View File

@ -51,7 +51,7 @@ function nearbyWifiStations(&$networks, $cached = true)
deleteCache($cacheKey); deleteCache($cacheKey);
} }
$scan_results = cache($cacheKey, function() { $scan_results = cache($cacheKey, function () {
exec('sudo wpa_cli -i ' . RASPI_WIFI_CLIENT_INTERFACE . ' scan'); exec('sudo wpa_cli -i ' . RASPI_WIFI_CLIENT_INTERFACE . ' scan');
sleep(3); sleep(3);

8
templates/dashboard.php
View File

@ -64,7 +64,7 @@ exec('cat '.RASPI_DNSMASQ_LEASES.'| grep -E $(arp -i '.$client_iface.' -n | grep
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($clients as $client): ?> <?php foreach ($clients as $client) : ?>
<?php $props = explode(' ', $client) ?> <?php $props = explode(' ', $client) ?>
<tr> <tr>
<td><?php echo htmlspecialchars($props[3], ENT_QUOTES) ?></td> <td><?php echo htmlspecialchars($props[3], ENT_QUOTES) ?></td>
@ -84,10 +84,10 @@ exec('cat '.RASPI_DNSMASQ_LEASES.'| grep -E $(arp -i '.$client_iface.' -n | grep
<div class="row"> <div class="row">
<form action="?page=wlan0_info" method="POST"> <form action="?page=wlan0_info" method="POST">
<?php echo CSRFTokenFieldTag() ?> <?php echo CSRFTokenFieldTag() ?>
<?php if (!RASPI_MONITOR_ENABLED): ?> <?php if (!RASPI_MONITOR_ENABLED) : ?>
<?php if (!$wlan0up): ?> <?php if (!$wlan0up) : ?>
<input type="submit" class="btn btn-success" value="<?php echo _("Start ").RASPI_WIFI_CLIENT_INTERFACE ?>" name="ifup_wlan0" /> <input type="submit" class="btn btn-success" value="<?php echo _("Start ").RASPI_WIFI_CLIENT_INTERFACE ?>" name="ifup_wlan0" />
<?php else: ?> <?php else : ?>
<input type="submit" class="btn btn-warning" value="<?php echo _("Stop ").RASPI_WIFI_CLIENT_INTERFACE ?>" name="ifdown_wlan0" /> <input type="submit" class="btn btn-warning" value="<?php echo _("Stop ").RASPI_WIFI_CLIENT_INTERFACE ?>" name="ifdown_wlan0" />
<?php endif ?> <?php endif ?>
<?php endif ?> <?php endif ?>

6
templates/data_usage.php
View File

@ -17,7 +17,7 @@
<h4><?php echo _('Hourly traffic amount'); ?></h4> <h4><?php echo _('Hourly traffic amount'); ?></h4>
<label for="cbxInterfacehourly"><?php echo _('interface'); ?></label> <label for="cbxInterfacehourly"><?php echo _('interface'); ?></label>
<select id="cbxInterfacehourly" class="form-control" name="interfacehourly"> <select id="cbxInterfacehourly" class="form-control" name="interfacehourly">
<?php foreach ($interfaces as $if): ?> <?php foreach ($interfaces as $if) : ?>
<?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?> <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
<option value="<?php echo $if_quoted ?>"><?php echo $if_quoted ?></option> <option value="<?php echo $if_quoted ?>"><?php echo $if_quoted ?></option>
<?php endforeach ?> <?php endforeach ?>
@ -36,7 +36,7 @@
<h4><?php echo _('Daily traffic amount'); ?></h4> <h4><?php echo _('Daily traffic amount'); ?></h4>
<label for="cbxInterfacedaily"><?php echo _('interface'); ?></label> <label for="cbxInterfacedaily"><?php echo _('interface'); ?></label>
<select id="cbxInterfacedaily" class="form-control" name="interfacedaily"> <select id="cbxInterfacedaily" class="form-control" name="interfacedaily">
<?php foreach ($interfaces as $if): ?> <?php foreach ($interfaces as $if) : ?>
<?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?> <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
<option value="<?php echo $if_quoted ?>"><?php echo $if_quoted ?></option> <option value="<?php echo $if_quoted ?>"><?php echo $if_quoted ?></option>
<?php endforeach ?> <?php endforeach ?>
@ -55,7 +55,7 @@
<h4><?php echo _("Monthly traffic amount"); ?></h4> <h4><?php echo _("Monthly traffic amount"); ?></h4>
<label for="cbxInterfacemonthly"><?php echo _('interface'); ?></label> <label for="cbxInterfacemonthly"><?php echo _('interface'); ?></label>
<select id="cbxInterfacemonthly" class="form-control" name="interfacemonthly"> <select id="cbxInterfacemonthly" class="form-control" name="interfacemonthly">
<?php foreach ($interfaces as $if): ?> <?php foreach ($interfaces as $if) : ?>
<?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?> <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
<option value="<?php echo $if_quoted ?>"><?php echo $if_quoted ?></option> <option value="<?php echo $if_quoted ?>"><?php echo $if_quoted ?></option>
<?php endforeach ?> <?php endforeach ?>

16
templates/dhcp.php
View File

@ -26,7 +26,7 @@
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="code">Interface</label> <label for="code">Interface</label>
<select class="form-control" name="interface"> <select class="form-control" name="interface">
<?php foreach ($interfaces as $if): ?> <?php foreach ($interfaces as $if) : ?>
<?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?> <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
<?php $selected = $if === $conf['interface'] ? ' selected="selected"' : '' ?> <?php $selected = $if === $conf['interface'] ? ' selected="selected"' : '' ?>
<option value="<?php echo $if_quoted ?>"<?php echo $selected ?>><?php echo $if_quoted ?></option> <option value="<?php echo $if_quoted ?>"<?php echo $selected ?>><?php echo $if_quoted ?></option>
@ -63,11 +63,11 @@
</select> </select>
</div> </div>
</div> </div>
<?php if (!RASPI_MONITOR_ENABLED): ?> <?php if (!RASPI_MONITOR_ENABLED) : ?>
<input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" /> <input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" />
<?php if ($dnsmasq_state): ?> <?php if ($dnsmasq_state) : ?>
<input type="submit" class="btn btn-warning" value="<?php echo _("Stop dnsmasq") ?>" name="stopdhcpd" /> <input type="submit" class="btn btn-warning" value="<?php echo _("Stop dnsmasq") ?>" name="stopdhcpd" />
<?php else: ?> <?php else : ?>
<input type="submit" class="btn btn-success" value="<?php echo _("Start dnsmasq") ?>" name="startdhcpd" /> <input type="submit" class="btn btn-success" value="<?php echo _("Start dnsmasq") ?>" name="startdhcpd" />
<?php endif ?> <?php endif ?>
<?php endif ?> <?php endif ?>
@ -93,8 +93,8 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach ($leases as $lease): ?> <?php foreach ($leases as $lease) : ?>
<?php foreach (explode(' ', $lease) as $prop): ?> <?php foreach (explode(' ', $lease) as $prop) : ?>
<tr> <tr>
<td><?php echo htmlspecialchars($prop, ENT_QUOTES) ?></td> <td><?php echo htmlspecialchars($prop, ENT_QUOTES) ?></td>
</tr> </tr>
@ -111,7 +111,7 @@
<div class="tab-pane fade in" id="static-leases"> <div class="tab-pane fade in" id="static-leases">
<div class="dhcp-static-leases js-dhcp-static-lease-container"> <div class="dhcp-static-leases js-dhcp-static-lease-container">
<?php foreach ($dhcpHost as $host): ?> <?php foreach ($dhcpHost as $host) : ?>
<?php list($mac, $ip) = array_map("trim", explode(",", $host)); ?> <?php list($mac, $ip) = array_map("trim", explode(",", $host)); ?>
<div class="row dhcp-static-lease-row js-dhcp-static-lease-row"> <div class="row dhcp-static-lease-row js-dhcp-static-lease-row">
<div class="col-md-5 col-xs-5"> <div class="col-md-5 col-xs-5">
@ -153,7 +153,7 @@
</div> </div>
</div> </div>
</template> </template>
<?php if (!RASPI_MONITOR_ENABLED): ?> <?php if (!RASPI_MONITOR_ENABLED) : ?>
<input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" /> <input type="submit" class="btn btn-outline btn-primary" value="<?php echo _("Save settings"); ?>" name="savedhcpdsettings" />
<?php <?php
if ($dnsmasq_state) { if ($dnsmasq_state) {

8
templates/hostapd.php
View File

@ -121,7 +121,7 @@
<?php <?php
$checkedWifiAPEnabled = ''; $checkedWifiAPEnabled = '';
if ($arrHostapdConf['WifiAPEnable'] == 1) { if ($arrHostapdConf['WifiAPEnable'] == 1) {
$checkedWifiAPEnabled = ' checked="checked"'; $checkedWifiAPEnabled = ' checked="checked"';
} }
?> ?>
<input id="chxwificlientap" name="wifiAPEnable" type="checkbox" class="form-check-input" data-toggle="toggle" data-on="Enabled" data-off="Disabled" data-width="100" value="1"<?php echo $checkedWifiAPEnabled; ?> /> <input id="chxwificlientap" name="wifiAPEnable" type="checkbox" class="form-check-input" data-toggle="toggle" data-on="Enabled" data-off="Disabled" data-width="100" value="1"<?php echo $checkedWifiAPEnabled; ?> />
@ -135,7 +135,7 @@ $checkedWifiAPEnabled = ' checked="checked"';
<?php <?php
$checkedLogEnabled = ''; $checkedLogEnabled = '';
if ($arrHostapdConf['LogEnable'] == 1) { if ($arrHostapdConf['LogEnable'] == 1) {
$checkedLogEnabled = ' checked="checked"'; $checkedLogEnabled = ' checked="checked"';
} }
?> ?>
<input id="chxlogenable" name="logEnable" type="checkbox" class="form-check-input" data-toggle="toggle" data-on="Enabled" data-off="Disabled" data-width="100" value="1"<?php echo $checkedLogEnabled; ?> /> <input id="chxlogenable" name="logEnable" type="checkbox" class="form-check-input" data-toggle="toggle" data-on="Enabled" data-off="Disabled" data-width="100" value="1"<?php echo $checkedLogEnabled; ?> />
@ -149,7 +149,7 @@ $checkedLogEnabled = ' checked="checked"';
<?php <?php
$checkedHiddenSSID = ''; $checkedHiddenSSID = '';
if ($arrConfig['ignore_broadcast_ssid'] == 1 || $arrConfig['ignore_broadcast_ssid'] == 2) { if ($arrConfig['ignore_broadcast_ssid'] == 1 || $arrConfig['ignore_broadcast_ssid'] == 2) {
$checkedHiddenSSID = ' checked="checked"'; $checkedHiddenSSID = ' checked="checked"';
} }
?> ?>
<input id="chxhiddenssid" name="hiddenSSID" type="checkbox" class="form-check-input" data-toggle="toggle" data-on="Enabled" data-off="Disabled" data-width="100" value="1"<?php echo $checkedHiddenSSID; ?> /> <input id="chxhiddenssid" name="hiddenSSID" type="checkbox" class="form-check-input" data-toggle="toggle" data-on="Enabled" data-off="Disabled" data-width="100" value="1"<?php echo $checkedHiddenSSID; ?> />
@ -434,7 +434,7 @@ if(ops[i].value == country){
</div> </div>
</div><!-- /.panel-body --> </div><!-- /.panel-body -->
</div><!-- /.panel-primary --> </div><!-- /.panel-primary -->
<?php if (!RASPI_MONITOR_ENABLED): ?> <?php if (!RASPI_MONITOR_ENABLED) : ?>
<input type="submit" class="btn btn-outline btn-primary" name="SaveHostAPDSettings" value="<?php echo _("Save settings"); ?>" /> <input type="submit" class="btn btn-outline btn-primary" name="SaveHostAPDSettings" value="<?php echo _("Save settings"); ?>" />
<?php <?php
if ($hostapdstatus[0] == 0) { if ($hostapdstatus[0] == 0) {

2
templates/system.php
View File

@ -67,7 +67,7 @@ if ($cpuload > 90) {
<form action="?page=system_info" method="POST"> <form action="?page=system_info" method="POST">
<?php echo CSRFTokenFieldTag() ?> <?php echo CSRFTokenFieldTag() ?>
<?php if (!RASPI_MONITOR_ENABLED): ?> <?php if (!RASPI_MONITOR_ENABLED) : ?>
<input type="submit" class="btn btn-warning" name="system_reboot" value="<?php echo _("Reboot"); ?>" /> <input type="submit" class="btn btn-warning" name="system_reboot" value="<?php echo _("Reboot"); ?>" />
<input type="submit" class="btn btn-warning" name="system_shutdown" value="<?php echo _("Shutdown"); ?>" /> <input type="submit" class="btn btn-warning" name="system_shutdown" value="<?php echo _("Shutdown"); ?>" />
<?php endif ?> <?php endif ?>

6
templates/wifi_stations.php
View File

@ -1,9 +1,9 @@
<?php if (empty($networks)): ?> <?php if (empty($networks)) : ?>
<p class="lead text-center"><?php echo _('No Wifi stations found') ?></p> <p class="lead text-center"><?php echo _('No Wifi stations found') ?></p>
<p class="text-center"><?php echo _('Click "Rescan" to search for nearby Wifi stations.') ?></p> <p class="text-center"><?php echo _('Click "Rescan" to search for nearby Wifi stations.') ?></p>
<?php endif ?> <?php endif ?>
<?php $index = 0; ?> <?php $index = 0; ?>
<?php foreach ($networks as $ssid => $network): ?> <?php foreach ($networks as $ssid => $network) : ?>
<div class="col-md-6"> <div class="col-md-6">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
@ -89,5 +89,5 @@
</div><!-- /.panel-default --> </div><!-- /.panel-default -->
</div><!-- /.col-md-6 --> </div><!-- /.col-md-6 -->
<?php $index += 1; ?> <?php $index += 1; ?>
<?php endforeach ?> <?php endforeach ?>