From fad2ae873d08cc854dc8dd20bbd79813ecc61aab Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Sun, 6 Feb 2011 09:57:31 +0000
Subject: [PATCH] show message when trying to delete a domain which is used as
 alias-domain instead of blank page, fixes #571

---
 admin_domains.php   | 7 +++++--
 lng/english.lng.php | 2 ++
 lng/german.lng.php  | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/admin_domains.php b/admin_domains.php
index 7f68c24c..5632e276 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -144,8 +144,8 @@ if($page == 'domains'
 		$alias_check = $db->query_first('SELECT COUNT(`id`) AS `count` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . (int)$id . '\'');
 
 		if($result['domain'] != ''
-		   && $alias_check['count'] == 0)
-		{
+			&& $alias_check['count'] == 0
+		) {
 			if(isset($_POST['send'])
 			   && $_POST['send'] == 'send')
 			{
@@ -197,6 +197,9 @@ if($page == 'domains'
 				inserttask('4');
 				redirectTo($filename, Array('page' => $page, 's' => $s));
 			}
+			elseif ($alias_check['count'] > 0) {
+				standard_error('domains_cantdeletedomainwithaliases');
+			}
 			else
 			{
 				$showcheck = false;
diff --git a/lng/english.lng.php b/lng/english.lng.php
index 03658069..080da75e 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -1564,3 +1564,5 @@ $lng['mails']['webmaxpercent']['mailbody'] = 'Dear {NAME},\n\nyou used {DISKUSED
 $lng['mails']['webmaxpercent']['subject'] = 'Reaching your diskspace limit';
 $lng['mysql']['database_edit'] = 'Edit database';
 
+// ADDED IN FROXLOR 0.9.18
+$lng['error']['domains_cantdeletedomainwithaliases'] = 'You cannot delete a domain which is used for alias-domains. You have to delete the aliases first.';
diff --git a/lng/german.lng.php b/lng/german.lng.php
index d5fbb98e..37db6fbd 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -1545,3 +1545,6 @@ $lng['serversettings']['manual'] = 'Manuelle Eingabe';
 $lng['mails']['webmaxpercent']['mailbody'] = 'Sehr geehrte(r) {NAME},\n\nSie haben bereits {DISKUSED} MB von Ihren insgesamt {DISKAVAILABLE} MB Speicherplatz verbraucht.\nDies sind mehr als {MAX_PERCENT}%.\n\nVielen Dank,\ndas Froxlor-Team';
 $lng['mails']['webmaxpercent']['subject'] = 'Sie erreichen bald Ihr Speicherplatz-Limit';
 $lng['mysql']['database_edit'] = 'Datenbank bearbeiten';
+
+// ADDED IN FROXLOR 0.9.18
+$lng['error']['domains_cantdeletedomainwithaliases'] = 'Sie k&ouml;nnen keine Domain l&ouml;schen, die noch von Alias-Domains verwendet wird. L&ouml;schen Sie zuerst alle Alias-Domains dieser Domain.';