From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 23 Nov 2006 05:07:42 +0000 (+0000)
Subject: Updated preg_matches
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7f51b7c557fe5fb3c73b5bde15856fbfdb08efbb;p=gosa.git

Updated preg_matches


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

diff --git a/plugins/admin/systems/class_servNfs.inc b/plugins/admin/systems/class_servNfs.inc
index 280d61189..043813d5e 100644
--- a/plugins/admin/systems/class_servNfs.inc
+++ b/plugins/admin/systems/class_servNfs.inc
@@ -180,7 +180,7 @@ class servnfs extends plugin
       $message[]=_("Please specify a valid path for your setup.");
     }
 
-    // only 0-9a-z
+    // Skip if there are diallowed characters 
     if(!$this->is_edit){
       if(!preg_match("/^[a-z0-9\.\-_]+$/i",$this->name)){
         $message[]=_("Please specify a valid name for your share.");
@@ -190,11 +190,11 @@ class servnfs extends plugin
       }
     }
 
-    if(preg_match("/[^a-z0-9._+ \|-]+/i",$this->description)){
+    if(preg_match("/[^a-z0-9._+ -]+/i",$this->description)){
       $message[]=_("Description contains invalid characters.");
     }
 
-    if(preg_match("/[^a-z0-9._+ |-]/i",$this->volume)){
+    if(preg_match("/[^a-z0-9._+ -]/i",$this->volume)){
       $message[]=_("Volume contains invalid characters.");
     }
   
@@ -202,7 +202,7 @@ class servnfs extends plugin
       $message[]=_("Path contains invalid characters.");
     }
 
-    if(preg_match("/[^a-z0-9._,=+ \|-]/i",$this->option)){
+    if(preg_match("/[^a-z0-9\._,=+ -]/i",$this->option)){
       $message[]=_("Option contains invalid characters.");
     }