From a0a8ff07346683beafc132b6bd9a736f52e6cf91 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 20 Nov 2020 07:35:36 +0000 Subject: [PATCH] Cleanup: procedural code into functions --- includes/dhcp.php | 195 ++++++++++++++++++++++++++-------------------- 1 file changed, 110 insertions(+), 85 deletions(-) diff --git a/includes/dhcp.php b/includes/dhcp.php index 3f930738..9f76e298 100755 --- a/includes/dhcp.php +++ b/includes/dhcp.php @@ -69,101 +69,21 @@ function SaveDHCPConfig($status) if (($_POST['dhcp-iface'] == "1")) { $errors = ValidateDHCPInput(); - if (empty($errors)) { - $config = 'interface='.$iface.PHP_EOL. - 'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd']. - ',255.255.255.0,'; - if ($_POST['RangeLeaseTimeUnits'] !== 'infinite') { - $config .= $_POST['RangeLeaseTime']; - } - $config .= $_POST['RangeLeaseTimeUnits'].PHP_EOL; - for ($i=0; $i < count($_POST["static_leases"]["mac"]); $i++) { - $mac = trim($_POST["static_leases"]["mac"][$i]); - $ip = trim($_POST["static_leases"]["ip"][$i]); - if ($mac != "" && $ip != "") { - $config .= "dhcp-host=$mac,$ip".PHP_EOL; - } - } - if ($_POST['no-resolv'] == "1") { - $config .= "no-resolv".PHP_EOL; - } - foreach ($_POST['server'] as $server) { - $config .= "server=$server".PHP_EOL; - } - if ($_POST['log-dhcp'] == "1") { - $config .= "log-dhcp".PHP_EOL; - } - if ($_POST['log-queries'] == "1") { - $config .= "log-queries".PHP_EOL; - } - if ($_POST['DNS1']) { - $config .= "dhcp-option=6," . $_POST['DNS1']; - if ($_POST['DNS2']) { - $config .= ','.$_POST['DNS2']; - } - $config .= PHP_EOL; - } - // enable these settings on the default interface - if ($iface == "wlan0") { - $config .= "log-facility=/tmp/dnsmasq.log".PHP_EOL; - $config .= "conf-dir=/etc/dnsmasq.d".PHP_EOL; - } - file_put_contents("/tmp/dnsmasqdata", $config); - $msg = file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf') ? 'updated' : 'added'; - system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $return); + if (empty($errors)) { + $return = UpdateDnsmasqCfg($iface,$status); } else { $status->addMessage($errors, 'danger'); } - - if ($return == 0) { - $status->addMessage('Dnsmasq configuration for '.$iface.' '.$msg.'.', 'success'); - } else { + if ($return == 1) { $status->addMessage('Dnsmasq configuration failed to be updated.', 'danger'); return false; } + $return = UpdateDHCPCfg($iface,$status); - $net_cfg = RASPI_CONFIG_NETWORKING.'/'.$iface.'.ini'; - if (!file_exists($net_cfg) || filesize($net_cfg) ==0 ) { - $status->addMessage('Static IP address for '.$iface.' not found.', 'danger'); - $status->addMessage('Configure this interface in Networking > '.$iface.'.', 'danger'); - $return = 1; - } else { - $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); - if (!preg_match('/^interface\s'.$iface.'$/m', $dhcp_cfg)) { - // set dhcp values from ini - $iface_cfg = parse_ini_file($net_cfg, false, INI_SCANNER_RAW); - $ip_address = $iface_cfg['ip_address']; - $domain_name_server = ($iface_cfg['domain_name_server'] =='') ? '1.1.1.1 8.8.8.8' : $iface_cfg['domain_name_server']; - - // append interface config to dhcpcd.conf - $cfg = $dhcp_conf; - $cfg[] = '# RaspAP '.$_POST['interface'].' configuration'; - $cfg[] = 'interface '.$_POST['interface']; - $cfg[] = 'static ip_address='.$ip_address; - $cfg[] = 'static domain_name_server='.$domain_name_server; - $cfg[] = PHP_EOL; - $cfg = join(PHP_EOL, $cfg); - $dhcp_cfg .= $cfg; - file_put_contents("/tmp/dhcpddata", $dhcp_cfg); - system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return); - $status->addMessage('DHCP configuration for '.$iface.' added.', 'success'); - } else { - $status->addMessage('DHCP for '.$iface.' already enabled.', 'success'); - } - } // process disable dhcp option } elseif (($_POST['dhcp-iface'] == "0") && file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) { // remove dhcp conf for selected interface - $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); - $dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$iface.'.*\n(.*\n){3}/m', '', $dhcp_cfg); - file_put_contents("/tmp/dhcpddata", rtrim($dhcp_cfg).PHP_EOL); - system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return); - $status->addMessage('DHCP configuration for '.$iface.' removed.', 'success'); - // remove dnsmasq eth0 conf - system('sudo rm '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $return); - $status->addMessage('Dnsmasq configuration for '.$iface.' removed.', 'success'); - } else { - system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $return); + $return = RemoveDHCPCfg($iface,$status); } if ($return == 0) { @@ -203,3 +123,108 @@ function ValidateDHCPInput() return $errors; } +function UpdateDnsmasqCfg($iface,$status) +{ + $config = 'interface='.$iface.PHP_EOL. + 'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd']. + ',255.255.255.0,'; + if ($_POST['RangeLeaseTimeUnits'] !== 'infinite') { + $config .= $_POST['RangeLeaseTime']; + } + $config .= $_POST['RangeLeaseTimeUnits'].PHP_EOL; + for ($i=0; $i < count($_POST["static_leases"]["mac"]); $i++) { + $mac = trim($_POST["static_leases"]["mac"][$i]); + $ip = trim($_POST["static_leases"]["ip"][$i]); + if ($mac != "" && $ip != "") { + $config .= "dhcp-host=$mac,$ip".PHP_EOL; + } + } + if ($_POST['no-resolv'] == "1") { + $config .= "no-resolv".PHP_EOL; + } + foreach ($_POST['server'] as $server) { + $config .= "server=$server".PHP_EOL; + } + if ($_POST['log-dhcp'] == "1") { + $config .= "log-dhcp".PHP_EOL; + } + if ($_POST['log-queries'] == "1") { + $config .= "log-queries".PHP_EOL; + } + if ($_POST['DNS1']) { + $config .= "dhcp-option=6," . $_POST['DNS1']; + if ($_POST['DNS2']) { + $config .= ','.$_POST['DNS2']; + } + $config .= PHP_EOL; + } + // enable these settings on the default interface + if ($iface == "wlan0") { + $config .= "log-facility=/tmp/dnsmasq.log".PHP_EOL; + $config .= "conf-dir=/etc/dnsmasq.d".PHP_EOL; + } + file_put_contents("/tmp/dnsmasqdata", $config); + $msg = file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf') ? 'updated' : 'added'; + system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $result); + if ($result == 0) { + $status->addMessage('Dnsmasq configuration for '.$iface.' '.$msg.'.', 'success'); + } + return $result; +} + +function UpdateDHCPCfg($iface,$status) +{ + $net_cfg = RASPI_CONFIG_NETWORKING.'/'.$iface.'.ini'; + if (!file_exists($net_cfg) || filesize($net_cfg) ==0 ) { + $status->addMessage('Static IP address for '.$iface.' not found.', 'danger'); + $status->addMessage('Configure this interface in Networking > '.$iface.'.', 'danger'); + $return = 1; + } else { + $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); + if (!preg_match('/^interface\s'.$iface.'$/m', $dhcp_cfg)) { + // set dhcp values from ini + $iface_cfg = parse_ini_file($net_cfg, false, INI_SCANNER_RAW); + $ip_address = $iface_cfg['ip_address']; + $domain_name_server = ($iface_cfg['domain_name_server'] =='') ? '1.1.1.1 8.8.8.8' : $iface_cfg['domain_name_server']; + + // append interface config to dhcpcd.conf + $cfg = $dhcp_conf; + $cfg[] = '# RaspAP '.$iface.' configuration'; + $cfg[] = 'interface '.$iface; + $cfg[] = 'static ip_address='.$ip_address; + $cfg[] = 'static domain_name_server='.$domain_name_server; + $cfg[] = PHP_EOL; + $cfg = join(PHP_EOL, $cfg); + $dhcp_cfg .= $cfg; + file_put_contents("/tmp/dhcpddata", $dhcp_cfg); + system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $result); + $status->addMessage('DHCP configuration for '.$iface.' added.', 'success'); + } else { + $status->addMessage('DHCP for '.$iface.' already enabled.', 'success'); + } + } + return $result; +} + +function RemoveDHCPCfg($iface,$status) +{ + $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); + $dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$iface.'.*\n(.*\n){3}/m', '', $dhcp_cfg); + file_put_contents("/tmp/dhcpddata", rtrim($dhcp_cfg).PHP_EOL); + system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $result); + if ($result == 0) { + $status->addMessage('DHCP configuration for '.$iface.' removed.', 'success'); + } else { + $status->addMessage('Failed to remove DHCP configuration for '.$iface.'.', 'danger'); + return $result; + } + // remove dnsmasq eth0 conf + system('sudo rm '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $result); + if ($result == 0) { + $status->addMessage('Dnsmasq configuration for '.$iface.' removed.', 'success'); + } else { + $status->addMessage('Failed to remove dnsmasq configuration for '.$iface.'.', 'danger'); + } + return $result; +} +