From f43ef975d75a57973886e7f8eabb068d2ac15cc0 Mon Sep 17 00:00:00 2001
From: Falko Timme <ft@falkotimme.com>
Date: Mon, 16 Jun 2014 12:06:06 -0400
Subject: [PATCH] - Make sure ISPConfig shows the correct error message (instad of an SQL error) when a website is renamed after an alias domain that still exists. - It should be possible to create two websites with the same domain on the same server as long as the IP differs. I therefore changed the serverdomain index of the web_domain table to include the IP address.

---
 interface/web/tools/lib/menu.d/resync.menu.php |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/interface/web/tools/lib/menu.d/resync.menu.php b/interface/web/tools/lib/menu.d/resync.menu.php
index 3ef45fb..5de2f77 100644
--- a/interface/web/tools/lib/menu.d/resync.menu.php
+++ b/interface/web/tools/lib/menu.d/resync.menu.php
@@ -5,18 +5,18 @@
 
 if($app->auth->is_admin()) {
 
-$items = array();
+	$items = array();
 
-$items[] = array( 'title' 	=> 'Resync',
-				  'target' 	=> 'content',
-				  'link'	=> 'tools/resync.php');
+	$items[] = array( 'title'  => 'Resync',
+		'target'  => 'content',
+		'link' => 'tools/resync.php');
 
 
-$module['nav'][] = array(	'title'	=> 'Sync Tools',
-							'open' 	=> 1,
-							'items'	=> $items);
+	$module['nav'][] = array( 'title' => 'Sync Tools',
+		'open'  => 1,
+		'items' => $items);
 
-unset($items);
+	unset($items);
 }
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1