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

Merge from upstream master: Pass $upstreamServers to template

Browse Source
This commit is contained in:
billz 2021-09-07 17:05:58 +01:00
parent 890aaaabc9
commit a634e0dfaa
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/dhcp.php
View File

@ -52,6 +52,7 @@ function DisplayDHCPConfig()
exec('cat '. RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return); exec('cat '. RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return);
$conf = array_merge(ParseConfig($return)); $conf = array_merge(ParseConfig($return));
$hosts = (array)$conf['dhcp-host']; $hosts = (array)$conf['dhcp-host'];
$upstreamServers = (array)$conf['server'];
exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces); exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
exec('cat ' . RASPI_DNSMASQ_LEASES, $leases); exec('cat ' . RASPI_DNSMASQ_LEASES, $leases);
@ -63,6 +64,7 @@ function DisplayDHCPConfig()
"ap_iface", "ap_iface",
"conf", "conf",
"hosts", "hosts",
"upstreamServers",
"interfaces", "interfaces",
"leases" "leases"
) )