X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2Fclass_faiScriptEntry.inc;h=a0ba363c99bb006685447226502687eefeee6e2c;hb=9dc6ac611bbe02539e5d9326a6106f8160bc56c3;hp=91c04d67bfba5905f459772c6d4c756ed264bb56;hpb=e6523e6e04a14ff5ca2ebff5dcd7b2080bafa759;p=gosa.git diff --git a/gosa-plugins/fai/admin/fai/class_faiScriptEntry.inc b/gosa-plugins/fai/admin/fai/class_faiScriptEntry.inc index 91c04d67b..a0ba363c9 100644 --- a/gosa-plugins/fai/admin/fai/class_faiScriptEntry.inc +++ b/gosa-plugins/fai/admin/fai/class_faiScriptEntry.inc @@ -20,7 +20,7 @@ class faiScriptEntry extends plugin function faiScriptEntry (&$config, $dn= NULL,$object=false) { - plugin::plugin ($config, $dn); + plugin::plugin ($config, NULL); if($dn != "new"){ $this->orig_cn= $object['cn']; $this->dn=$object['dn']; @@ -78,15 +78,13 @@ class faiScriptEntry extends plugin } /* File download requested */ - if(isset($_GET['getFAIScript'])){ + if(isset($_POST['download'])){ send_binary_content(stripslashes($this->FAIscript),$this->cn.".FAIscript"); } /* Create download button*/ if($this->dn != "new" && $this->acl_is_readable("FAIscript")){ - $smarty->assign("DownMe"," - "._("Download")." - "); + $smarty->assign("DownMe", image('images/save.png','download',_("Download"))); }else{ $smarty->assign("DownMe",""); } @@ -137,11 +135,16 @@ class faiScriptEntry extends plugin $message[] = msgPool::duplicated(_("Name")); } - 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"); + } - if(empty($this->FAIscript)){ + $s = trim($this->FAIscript); + if($s == ""){ $message[]= msgPool::required(_("Script")); }