From da843bf45f6c0edfbc246efaacc8a329b2ce7a8b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 27 Aug 2012 10:54:16 -0400
Subject: [PATCH] Fixed: FS#2245 - Unable to move from the state "Installation Failed" of an app

---
 interface/web/client/lib/module.conf.php |   64 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php
index cc4347b..2575ba2 100644
--- a/interface/web/client/lib/module.conf.php
+++ b/interface/web/client/lib/module.conf.php
@@ -1,7 +1,7 @@
 <?php
 
 $module["name"] 		= "client";
-$module["title"] 		= "Client";
+$module["title"] 		= "top_menu_client";
 $module["template"] 	= "module.tpl.htm";
 $module["startpage"] 	= "client/client_list.php";
 $module["tab_width"]    = '';
@@ -11,18 +11,23 @@
 */
 
 
-$items[] = array( 'title' 	=> "Add Client",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/client_edit.php');
+
 
 $items[] = array( 'title' 	=> "Edit Client",
 				  'target' 	=> 'content',
-				  'link'	=> 'client/client_list.php');
+				  'link'	=> 'client/client_list.php',
+				  'html_id' => 'client_list');
 
-if($_SESSION["s"]["user"]["typ"] == 'admin'){
+$items[] = array( 'title' 	=> "Add Client",
+				  'target' 	=> 'content',
+				  'link'	=> 'client/client_edit.php',
+				  'html_id' => 'client_add');
+				  
+				  if($_SESSION["s"]["user"]["typ"] == 'admin'){
 	$items[] = array( 'title' 	=> "Edit Client-Templates",
 					  'target' 	=> 'content',
-					  'link'	=> 'client/client_template_list.php');
+					  'link'	=> 'client/client_template_list.php',
+					  'html_id' => 'client_template_list');
 }
 
 $module["nav"][] = array(	'title'	=> 'Clients',
@@ -34,30 +39,53 @@
 
 if($_SESSION["s"]["user"]["typ"] == 'admin'){
 
-$items[] = array( 'title' 	=> "Add Reseller",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/reseller_edit.php');
-
 $items[] = array( 'title' 	=> "Edit Reseller",
 				  'target' 	=> 'content',
-				  'link'	=> 'client/reseller_list.php');
+				  'link'	=> 'client/reseller_list.php',
+				  'html_id' => 'reseller_list');
+
+$items[] = array( 'title' 	=> "Add Reseller",
+				  'target' 	=> 'content',
+				  'link'	=> 'client/reseller_edit.php',
+				  'html_id' => 'reseller_add');
 
 $module["nav"][] = array(	'title'	=> 'Resellers',
 							'open' 	=> 1,
 							'items'	=> $items);
+
+unset($items);
 }
 
+$items[] = array( 'title' 	=> "Edit Client Circle",
+				  'target' 	=> 'content',
+				  'link'	=> 'client/client_circle_list.php',
+				  'html_id' => 'client_circle_list');
 
+$items[] = array( 'title' 	=> "Send email",
+				  'target' 	=> 'content',
+				  'link'	=> 'client/client_message.php',
+				  'html_id' => 'reseller_add');
 
+$module["nav"][] = array(	'title'	=> 'Messaging',
+							'open' 	=> 1,
+							'items'	=> $items);
 
+unset($items);
 
+$app->uses('ini_parser,getconf');
+$settings = $app->getconf->get_global_config('domains');
 
+if ($settings['use_domain_module'] == 'y') {
+	$items = array();
+	$items[] = array( 'title' 	=> 'Domains',
+					'target' 	=> 'content',
+					'link'	=> 'client/domain_list.php');
 
+	$module['nav'][] = array(	'title'	=> 'Domains',
+								'open' 	=> 1,
+								'items'	=> $items);
 
-
-
-
-
-
-
+	unset($items);
+}
+							
 ?>
\ No newline at end of file

--
Gitblit v1.9.1