Make error message more specific on where the error is.

[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 b095c10c039ebed3930cebd28bc647360f162f6a..371957ab65f78d926cf01e510d646e5ccd9fb32e 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
@@ -184,8 +184,13 @@ class servnfs extends plugin
         $message[]= _("'Path / Volume' must be of format 'server:port'!");
       }
     } elseif ($this->type == "CIFS" || $this->type == "samba") {
-      if (!preg_match("/[a-z0-9%\/_.+-]+[\$]*$/i", $this->path)) {
-        $message[] = _("'$' is only allowed at the end of the share name for hidden shares");
+      if (!preg_match("/^[a-z0-9%\/_.+-]+[\$]*$/i", $this->path)) {
+        if (preg_match("/\$/", $this->path) && !preg_match("/^[^\$]+[\$]*$/", $this->path)) {
+          $message[] = _("'$' is only allowed at the end of the share name for hidden shares");
+        }
+        else {
+          $message[] = msgPool::invalid(_("Path"),$this->path,"/[a-z0-9\$%\/_.+-]+[\$]*$/i");
+        }
       }
     } else {
       if (!tests::is_path($this->path)){