From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty

---
 interface/web/client/lib/module.conf.php |  127 +++++++++++++++++++++++++++++-------------
 1 files changed, 88 insertions(+), 39 deletions(-)

diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php
index 78b825b..7d6f1b3 100644
--- a/interface/web/client/lib/module.conf.php
+++ b/interface/web/client/lib/module.conf.php
@@ -1,63 +1,112 @@
 <?php
 
-$module["name"] 		= "client";
-$module["title"] 		= "top_menu_client";
-$module["template"] 	= "module.tpl.htm";
-$module["startpage"] 	= "client/client_list.php";
+$module["name"]  = "client";
+$module["title"]  = "top_menu_client";
+$module["template"]  = "module.tpl.htm";
+$module["startpage"]  = "client/client_list.php";
 $module["tab_width"]    = '';
-
-/*
-	Email accounts menu
-*/
+$module['order']    = '20';
 
 
-$items[] = array( 'title' 	=> "Add Client",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/client_edit.php');
+$items[] = array(   'title'  => "Edit Client",
+	'target'  => 'content',
+	'link' => 'client/client_list.php',
+	'html_id'   => 'client_list');
 
-$items[] = array( 'title' 	=> "Edit Client",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/client_list.php');
+$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');
-}
-
-$module["nav"][] = array(	'title'	=> 'Clients',
-							'open' 	=> 1,
-							'items'	=> $items);
+$module["nav"][] = array(   'title' => 'Clients',
+	'open'  => 1,
+	'items' => $items);
 
 unset($items);
 
 
 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',
+		'html_id'   => 'reseller_list');
 
-$items[] = array( 'title' 	=> "Edit Reseller",
-				  'target' 	=> 'content',
-				  'link'	=> 'client/reseller_list.php');
+	$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);
+	$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);
 
 
+$items[] = array(   'title'  => "Limit-Templates",
+	'target'  => 'content',
+	'link' => 'client/client_template_list.php',
+	'html_id'   => 'client_template_list');
+
+$items[] = array(   'title'  => "Email-Templates",
+	'target'  => 'content',
+	'link' => 'client/message_template_list.php',
+	'html_id'   => 'message_template_list');
+
+$module["nav"][] = array(   'title' => 'Templates',
+	'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);
+}
+
+/*
+if($_SESSION["s"]["user"]["typ"] == 'admin'){
+$items[] = array(   'title' 	=> "Interface Settings",
+                    'target' 	=> 'content',
+                    'link'	=> 'client/reseller_admin_interface.php',
+                    'html_id'   => 'reseller_admin_interface');
 
 
+$module["nav"][] = array(   'title'	=> 'Reseller Panel',
+                            'open' 	=> 1,
+                            'items'	=> $items);
 
-
-
-
-
-
-
-?>
\ No newline at end of file
+unset($items);
+}
+*/
+?>

--
Gitblit v1.9.1