diff --git a/gosa-plugins/fai/admin/fai/class_faiVariableEntry.inc b/gosa-plugins/fai/admin/fai/class_faiVariableEntry.inc
index 50e7348203146fb3636108a4863770ad048318d7..dd88739559bbda247393bf731682347c82ecd506 100644 (file)
$oname = $name;
$this->$oname=addslashes($value);
}
$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;
}else{
$this->status = "new";
$this->orig_cn = false;
$tmp = $this->plInfo();
foreach($tmp['plProvidedAcls'] as $name => $translated){
$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($name."ACL",$acl);
}
-
-
+ $smarty->assign("freeze",preg_match("/freeze/",$this->FAIstate));
$display.= $smarty->fetch(get_template_path('faiVariableEntry.tpl', TRUE));
return($display);
}
$display.= $smarty->fetch(get_template_path('faiVariableEntry.tpl', TRUE));
return($display);
}
+
/* Save data to object */
function save_object()
{
/* Save data to object */
function save_object()
{
$message[] = msgPool::duplicated(_("Name"));
}
$message[] = msgPool::duplicated(_("Name"));
}
- if(empty($this->FAIvariableContent)) {
+ if($this->FAIvariableContent == "") {
$message[]= msgPool::required(_("Content"));
}
$message[]= msgPool::required(_("Content"));
}
-
- if(empty($this->cn)){
+
+ $c = trim($this->cn);
+ if($c == ""){
$message[] = msgPool::required(_("Name"));
}
$message[] = msgPool::required(_("Name"));
}
+ if(preg_match("/[^a-z0-9_\-]/i",$c)){
+ $message[] = msgPool::invalid(_("Name"),$c,"/[a-z0-9_\-]/i");
+ }
return ($message);
}
return ($message);
}