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/tools/lib/menu.d/import.menu.php |   34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/interface/web/tools/lib/menu.d/import.menu.php b/interface/web/tools/lib/menu.d/import.menu.php
index cf5f9eb..d4a64ce 100644
--- a/interface/web/tools/lib/menu.d/import.menu.php
+++ b/interface/web/tools/lib/menu.d/import.menu.php
@@ -1,26 +1,32 @@
 <?php
 
-
 // Menu
 
 if($app->auth->is_admin()) {
 
-$items = array();
+	$items = array();
 
-$items[] = array( 'title' 	=> 'ISPConfig 3 mail',
+	$items[] = array( 'title'  => 'ISPConfig 3 mail',
+		'target'  => 'content',
+		'link' => 'tools/import_ispconfig.php');
+
+	$items[] = array( 'title'  => 'PDNS Tupa',
+		'target'  => 'content',
+		'link' => 'tools/dns_import_tupa.php');
+
+	/* not yet complete
+$items[] = array( 'title' 	=> 'Plesk',
 				  'target' 	=> 'content',
-				  'link'	=> 'tools/import_ispconfig.php');
+				  'link'	=> 'tools/import_plesk.php');
+*/
 
-$items[] = array( 'title' 	=> 'PDNS Tupa',
-				  'target' 	=> 'content',
-				  'link'	=> 'tools/dns_import_tupa.php');
+	$module['nav'][] = array( 'title' => 'Import',
+		'open'  => 1,
+		'items' => $items);
 
-				  
-$module['nav'][] = array(	'title'	=> 'Import',
-							'open' 	=> 1,
-							'items'	=> $items);
-
-unset($items);
+	unset($items);
 }
 
-?>
\ No newline at end of file
+
+
+?>

--
Gitblit v1.9.1