From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 interface/web/dns/lib/module.conf.php |  101 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/interface/web/dns/lib/module.conf.php b/interface/web/dns/lib/module.conf.php
index ea7d08d..75b17a9 100644
--- a/interface/web/dns/lib/module.conf.php
+++ b/interface/web/dns/lib/module.conf.php
@@ -1,27 +1,74 @@
-<?php
-$module = array (
-  'name' => 'dns',
-  'title' => 'DNS',
-  'template' => 'module.tpl.htm',
-  'navframe_page' => '',
-  'startpage' => 'dns/soa_list.php',
-  'tab_width' => '',
-  'nav' => 
-  array (
-    0 => 
-    array (
-      'title' => 'Zones',
-      'open' => 1,
-      'items' => 
-      array (
-        0 => 
-        array (
-          'title' => 'SOA',
-          'target' => 'content',
-          'link' => 'dns/soa_list.php',
-        ),
-      ),
-    ),
-  ),
-)
-?>
\ No newline at end of file
+<?php
+
+$module["name"]   = "dns";
+$module["title"]   = "top_menu_dns";
+$module["template"]  = "module.tpl.htm";
+$module["startpage"]  = "dns/dns_soa_list.php";
+$module["tab_width"]    = '';
+$module['order']    = '50';
+
+
+$items[] = array( 'title'  => "Add DNS Zone",
+	'target'  => 'content',
+	'link' => 'dns/dns_wizard.php',
+	'html_id' => 'dns_wizard');
+
+$items[] = array( 'title'  => "Import Zone File",
+	'target'  => 'content',
+	'link' => 'dns/dns_import.php',
+	'html_id' => 'dns_import');
+
+if($_SESSION["s"]["user"]["typ"] == 'admin') {
+	$items[] = array(  'title'  => "Templates",
+		'target'  => 'content',
+		'link'  => 'dns/dns_template_list.php',
+		'html_id' => 'dns_template_list');
+}
+
+
+$module["nav"][] = array( 'title' => 'DNS Wizard',
+	'open'  => 1,
+	'items' => $items);
+
+
+unset($items);
+
+/*
+	Email accounts menu
+*/
+
+
+$items[] = array( 'title'  => "Zones",
+	'target'  => 'content',
+	'link' => 'dns/dns_soa_list.php',
+	'html_id' => 'dns_soa_list');
+/*
+$items[] = array( 'title' 	=> "A-Records",
+				  'target' 	=> 'content',
+				  'link'	=> 'dns/dns_a_list.php',
+				  'html_id' => 'dns_a_list');
+*/
+
+
+$module["nav"][] = array( 'title' => 'DNS',
+	'open'  => 1,
+	'items' => $items);
+
+unset($items);
+
+$items[] = array( 'title'  => "Secondary Zones",
+	'target'  => 'content',
+	'link' => 'dns/dns_slave_list.php',
+	'html_id' => 'dns_slave_list');
+
+$module["nav"][] = array( 'title' => 'Secondary DNS',
+	'open'  => 1,
+	'items' => $items);
+
+unset($items);
+
+
+
+
+
+?>

--
Gitblit v1.9.1