X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2Fclass_faiVariableEntry.inc;h=dd88739559bbda247393bf731682347c82ecd506;hb=9dc6ac611bbe02539e5d9326a6106f8160bc56c3;hp=92ba68d200ccd181d2f7490c5e50946f97febf28;hpb=1ff4a2907283858f29eea394eb167f4643871ffb;p=gosa.git

diff --git a/gosa-plugins/fai/admin/fai/class_faiVariableEntry.inc b/gosa-plugins/fai/admin/fai/class_faiVariableEntry.inc
index 92ba68d20..dd8873955 100644
--- a/gosa-plugins/fai/admin/fai/class_faiVariableEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiVariableEntry.inc
@@ -26,11 +26,6 @@ class faiVariableEntry extends plugin
         $oname = $name;
         $this->$oname=addslashes($value);
       }
-
-      if(isset($this->attrs['FAIstate'][0])){
-        $this->FAIstate = $this->attrs['FAIstate'][0];
-      }
-
     }else{
       $this->status = "new";
       $this->orig_cn       = false;
@@ -59,23 +54,20 @@ class faiVariableEntry extends plugin
 
     $tmp = $this->plInfo();
     foreach($tmp['plProvidedAcls'] as $name => $translated){
-      $acl = $this->getacl($name);
-      if($this->FAIstate == "freezed"){
-        $acl = preg_replace("/w/","",$acl);
-      }
+      $acl = $this->getacl($name, preg_match("/freeze/",$this->FAIstate));
       $smarty->assign($name."ACL",$acl);
     }
 
-
-
+    $smarty->assign("freeze",preg_match("/freeze/",$this->FAIstate));
     $display.= $smarty->fetch(get_template_path('faiVariableEntry.tpl', TRUE));
     return($display);
   }
 
+
   /* Save data to object */
   function save_object()
   {
-     if((isset($_POST['SubObjectFormSubmitted'])) && ($this->FAIstate != "freeze")){
+     if((isset($_POST['SubObjectFormSubmitted'])) && !preg_match("/freeze/", $this->FAIstate)){
       foreach($this->attributes as $attrs){
         if($this->acl_is_writeable($attrs)){
           if(isset($_POST[$attrs])){
@@ -95,16 +87,20 @@ class faiVariableEntry extends plugin
     $message= plugin::check();
 
     if(isset($this->parent->SubObjects[$this->cn]) && $this->cn != $this->orig_cn){
-      $message[] = msgPool::duplicate(_("Name"));
+      $message[] = msgPool::duplicated(_("Name"));
     }
     
-    if(empty($this->FAIvariableContent)) {
+    if($this->FAIvariableContent == "") {
       $message[]= msgPool::required(_("Content")); 
     }
-   
-    if(empty($this->cn)){
+  
+    $c = trim($this->cn);
+    if($c == ""){
       $message[] = msgPool::required(_("Name"));
     }
+    if(preg_match("/[^a-z0-9_\-]/i",$c)){
+      $message[] = msgPool::invalid(_("Name"),$c,"/[a-z0-9_\-]/i");
+    }
 
     return ($message);
   }