From 9ff9ad0e14edc40f165433911935c437aa0ad427 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 14 Feb 2006 13:21:37 +0000
Subject: [PATCH] Added some more checks

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2693 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/admin/systems/class_servDNSeditZone.inc | 16 ++++++++++++++++
 plugins/admin/systems/servdnseditzone.tpl       | 14 +++++++-------
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/plugins/admin/systems/class_servDNSeditZone.inc b/plugins/admin/systems/class_servDNSeditZone.inc
index fcfc6780c..4e92d0ce6 100644
--- a/plugins/admin/systems/class_servDNSeditZone.inc
+++ b/plugins/admin/systems/class_servDNSeditZone.inc
@@ -153,6 +153,22 @@ class servdnseditZone extends plugin
       }
     }
 
+    if(!preg_match("/\.$/",$this->sOAprimary)){
+      $message[] = _("Primary dns server must end with '.' to be a valid entry.");
+    }
+
+    if(!preg_match("/\.$/",$this->sOAmail)){
+      $message[] = _("Your soecified mail address must end with '.' to be a valid record.");
+    }
+
+    if(preg_match("/@/",$this->sOAmail)){
+      $message[] = _("Your mail address contains '@' replace this with '.' to enable GOsa to create a valid SOA record.");
+    }
+
+    if(preg_match("/@/",$this->sOAmail)){
+      $message[] = _("Your mail address contains '@' replace this with '.' to enable GOsa to create a valid SOA record.");
+    }
+
     if($this->zoneName != strtolower($this->zoneName)){
       $message[] = _("Only lowercase strings are allowed as zone name.");
     }
diff --git a/plugins/admin/systems/servdnseditzone.tpl b/plugins/admin/systems/servdnseditzone.tpl
index 97a1cb3a0..13297a34c 100644
--- a/plugins/admin/systems/servdnseditzone.tpl
+++ b/plugins/admin/systems/servdnseditzone.tpl
@@ -30,19 +30,19 @@
 		<td style="vertical-align:top;width:50%;border-right:1px	solid	#b0b0b0;">
 			<table summary="">
 				<tr>
-					<td>{t}Primary dns server for this zone{/t}
+					<td>{t}Primary dns server for this zone{/t}{$must}
 					</td>
 					<td><input type="text" name="sOAprimary" value="{$sOAprimary}">
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Mail address{/t}
+					<td>{t}Mail address{/t}{$must}
 					</td>
 					<td><input type="text" name="sOAmail" value="{$sOAmail}">
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Serial number (automatically incremented){/t}
+					<td>{t}Serial number (automatically incremented){/t}{$must}
 					</td>
 					<td><input type="text" name="sOAserial" value="{$sOAserial}">
 					</td>
@@ -52,25 +52,25 @@
 		<td style="vertical-align:top;">
 			<table summary="">
 				<tr>
-					<td>{t}Refresh{/t}
+					<td>{t}Refresh{/t}{$must}
 					</td>
 					<td><input type="text" name="sOArefresh" value="{$sOArefresh}">
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Retry{/t}
+					<td>{t}Retry{/t}{$must}
 					</td>
 					<td><input type="text" name="sOAretry" value="{$sOAretry}">
 					</td>
 				</tr>
 				<tr>
-					<td>{t}Expire{/t}
+					<td>{t}Expire{/t}{$must}
 					</td>
 					<td><input type="text" name="sOAexpire" value="{$sOAexpire}">
 					</td>
 				</tr>
 				<tr>
-					<td>{t}TTL{/t}
+					<td>{t}TTL{/t}{$must}
 					</td>
 					<td><input type="text" name="sOAttl" value="{$sOAttl}">
 					</td>
-- 
2.30.2