From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 19 Oct 2009 12:42:02 +0000 (+0000)
Subject: - Corrected error message subject
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e42e8721706457472b34ed6655d21cb51662afa0;p=gosa.git

- Corrected error message subject
- Made regex for host names more precise


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14603 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/goto/admin/systems/services/ldap/class_goLdapServer.inc b/gosa-plugins/goto/admin/systems/services/ldap/class_goLdapServer.inc
index 165659b46..8d76f2a2b 100644
--- a/gosa-plugins/goto/admin/systems/services/ldap/class_goLdapServer.inc
+++ b/gosa-plugins/goto/admin/systems/services/ldap/class_goLdapServer.inc
@@ -76,10 +76,10 @@ class goLdapServer extends goService{
   { 
     $message = plugin::check();
     if(empty($this->goLdapBase)){
-      $message[] = msgPool::required(_("Base"));
+      $message[] = msgPool::required(_("LDAP URI"));
     }
-    if(!preg_match("/^ldap[si]?:\/\/[^\/]+\/.+$/", $this->goLdapBase)){
-      $message[] = msgPool::invalid(_("Base"),"","","ldap[si]://base");
+    if(!preg_match("/^ldap[si]?:\/\/[0-9a-z_.-]+\/.+$/", $this->goLdapBase)){
+      $message[] = msgPool::invalid(_("LDAP URI"),"","","ldap[si]://server/base");
     }
     return($message);
   }