Followup Commit for r14465:

[gosa.git] / trunk / gosa-plugins / goto / admin / systems / services / nfs / class_servNfs.inc

diff --git a/trunk/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc b/trunk/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc
index 6540df2c44b256833c5fb6c49c8cdf91bd51e5d0..ebe89524de64e879ce722e77f8189aa962393e3d 100644 (file)
--- a/trunk/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc
+++ b/trunk/gosa-plugins/goto/admin/systems/services/nfs/class_servNfs.inc
@@ -183,6 +183,10 @@ class servnfs extends plugin
       if (!preg_match('/^[a-z0-9-]+:[0-9]+$/', $this->path)){
         $message[]= _("'Path / Volume' must be of format 'server:port'!");
       }
+    } elseif ($this->type == "CIFS" || $this->type == "samba") {
+      if (!preg_match("/^[^\$]+[\$]*$/", $this->path)) {
+        $message[] = _("'$' is only allowed at the end of the share name for hidden shares");
+      }
     } else {
       if (!tests::is_path($this->path)){
         $message[]= _("'Path / Volume' must contain at least one '/' and no special characters!");
@@ -198,13 +202,8 @@ class servnfs extends plugin
       if(empty($this->name)){
         $message[]= msgPool::required(_("Name"));
       }
-      if(!preg_match("/^[a-z0-9\._äüö\$]*$/ui",$this->name)){
-        $message[]= msgPool::invalid(_("Name"),$this->name,"/[a-z0-9\._äüö]\$/ui");
-      }
-      else {
-        if (!preg_match("/^[^\$].*\$$/", $this->name)) {
-          $message[] = _("Hidden shares must have the '$' at the end of the name!");
-        }
+      if(!preg_match("/^[a-z0-9\._äüö]*$/ui",$this->name)){
+        $message[]= msgPool::invalid(_("Name"),$this->name,"/[a-z0-9\._äüö]/ui");
       }
     }