services: bring back service widgets for dns

src/www/diag_logs_resolver.php

@@ -3,4 +3,7 @@
 $logfile = '/var/log/resolver.log';
 $logclog = true;
 
+require_once 'services.inc';
+$shortcut_section = array('dnsmasq', 'unbound');
+
 require_once 'diag_logs_template.inc';

src/www/fbegin.inc

@@ -29,21 +29,26 @@
 	POSSIBILITY OF SUCH DAMAGE.
 */
 
-function find_service_by_shortcut($name)
+function find_service_by_shortcut($names)
 {
 	$shortcuts = array();
 
-	/* WIP unify mapping so "shortcuts" are no longer needed */
+	if (!is_array($names)) {
+		$names = array($names);
+	}
+
 	$shortcuts['dhcpd'] = 'dhcpd';
 	$shortcuts['dhcrelay'] = 'dhcrelay';
 	$shortcuts['dhcrelay6'] = 'dhcrelay6';
-	$shortcuts['forwarder'] = 'dnsmasq';
+	$shortcuts['dnsmasq'] = 'dnsmasq';
+	$shortcuts['unbound'] = 'unbound';
+
+	/* WIP unify mapping so "shortcuts" are no longer needed */
 	$shortcuts['gateways'] = 'apinger';
 	$shortcuts['ipsec'] = 'ipsec';
 	$shortcuts['ntp'] = 'ntpd';
 	$shortcuts['openvpn'] = 'openvpn';
 	$shortcuts['relayd'] = 'relayd';
-	$shortcuts['resolver'] = 'unbound';
 	$shortcuts['snmp'] = 'bsnmpd';
 	$shortcuts['squid'] = 'squid';
 	$shortcuts['upnp'] = 'miniupnpd';
@@ -51,6 +56,7 @@ function find_service_by_shortcut($name)
 	$services = get_services();
 
 	foreach ($shortcuts as $shortcut => $realname) {
+		foreach ($names as $name) {
 			if ($shortcut == $name) {
 				foreach ($services as $service)
 				if ($service['name'] == $realname) {
@@ -58,6 +64,7 @@ function find_service_by_shortcut($name)
 				}
 			}
 		}
+	}
 
 	return array();
 }

src/www/services_dnsmasq.php

@@ -139,6 +139,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
+$shortcut_section = 'dnsmasq';
 $closehead = false;
 
 include("head.inc");

src/www/services_dnsmasq_domainoverride_edit.php

@@ -111,6 +111,8 @@ if ($_POST) {
        }
 }
 
+$shortcut_section = 'dnsmasq';
+
 include("head.inc");
 
 ?>

src/www/services_dnsmasq_edit.php

@@ -156,6 +156,8 @@ if ($_POST) {
 	}
 }
 
+$shortcut_section = 'dnsmasq';
+
 include("head.inc");
 
 ?>

src/www/services_unbound.php

@@ -133,6 +133,7 @@ if ($_POST) {
 	}
 }
 
+$shortcut_section = 'unbound';
 $closehead = false;
 
 include_once("head.inc");

src/www/services_unbound_acls.php

@@ -156,6 +156,7 @@ if ($_POST) {
 	}
 }
 
+$shortcut_section = 'unbound';
 $closehead = false;
 
 include("head.inc");

src/www/services_unbound_advanced.php

@@ -113,6 +113,7 @@ if ($_POST) {
 	}
 }
 
+$shortcut_section = 'unbound';
 $closehead = false;
 
 include_once("head.inc");

src/www/services_unbound_domainoverride_edit.php

@@ -101,6 +101,8 @@ if ($_POST) {
     }
 }
 
+$shortcut_section = 'unbound';
+
 include("head.inc");
 
 ?>

src/www/services_unbound_host_edit.php

@@ -191,6 +191,8 @@ if ($_POST) {
 	}
 }
 
+$shortcut_section = 'unbound';
+
 include("head.inc");
 
 ?>

src/www/services_unbound_overrides.php

@@ -88,8 +88,9 @@ if ($_GET['act'] == "del") {
 	}
 }
 
+$shortcut_section = 'unbound';
 $closehead = false;
-$pgtitle = array(gettext('Services'), gettext('DNS Resolver'), gettext('Overrides'));
+
 include_once("head.inc");
 
 ?>