Fix unbound shortcut links

Fixes redmine #4151
1) Make the naming in shortcuts.inc more clear - forwarder=dnsmasq
resolver=unbound
2) Make the value of $shortcuts_section correct in each dnsmasq and
unbound php code
3) Make diag_logs_resolver.php smarter, so if dnsmasq is enabled, then
show shortcuts for dnsmasq, otherwise show shortcuts for unbound.
4) Fix some references to forwarder in unbound code - should be
resolver.

1 files changed, 7 insertions, 7 deletions

diff --git a/usr/local/www/shortcuts.inc b/usr/local/www/shortcuts.inc
index a99f35c..1b141cf 100644
--- a/usr/local/www/shortcuts.inc
+++ b/usr/local/www/shortcuts.inc
@@ -220,15 +220,15 @@ $shortcuts['trafficshaper-limiters'] = array();
 $shortcuts['trafficshaper-limiters']['main'] = "firewall_shaper_vinterface.php";
 $shortcuts['trafficshaper-limiters']['status'] = "diag_limiter_info.php";
 
+$shortcuts['forwarder'] = array();
+$shortcuts['forwarder']['main'] = "services_dnsmasq.php";
+$shortcuts['forwarder']['log'] = "diag_logs_resolver.php";
+$shortcuts['forwarder']['service'] = "dnsmasq";
+
 $shortcuts['resolver'] = array();
-$shortcuts['resolver']['main'] = "services_dnsmasq.php";
+$shortcuts['resolver']['main'] = "services_unbound.php";
 $shortcuts['resolver']['log'] = "diag_logs_resolver.php";
-$shortcuts['resolver']['service'] = "dnsmasq";
-
-$shortcuts['unbound'] = array();
-$shortcuts['unbound']['main'] = "services_unbound.php";
-$shortcuts['unbound']['log'] = "diag_logs_resolver.php";
-$shortcuts['unbound']['service'] = "unbound";
+$shortcuts['resolver']['service'] = "unbound";
 
 $shortcuts['wireless'] = array();
 $shortcuts['wireless']['main'] = "interfaces_wireless.php";