diff --git a/plugins/admin/fai/class_faiScriptEntry.inc b/plugins/admin/fai/class_faiScriptEntry.inc
index 903230055977e3de746c576b549f0be8bc5e72ca..3d6ad9eb92e29304af1b11edffdebe10161bdd5d 100644 (file)
/* attribute list for save action */
var $ignore_account= TRUE;
/* attribute list for save action */
var $ignore_account= TRUE;
- var $attributes = array("Object_cn","Object_description","Object_FAIpriority","Object_FAIscript");
+ var $attributes = array("cn","description","FAIpriority","FAIscript");
var $objectclasses= array();
var $orig_cn = "";
var $objectclasses= array();
var $orig_cn = "";
- var $Object_dn = "";
- var $Object_cn = "";
- var $Object_FAIpriority = "";
- var $Object_FAIscript = "";
- var $Object_description = "";
- var $Object_status = "new";
+ var $dn = "";
+ var $cn = "";
+ var $FAIpriority = "0";
+ var $FAIscript = "";
+ var $description = "";
+ var $status = "new";
function faiScriptEntry ($config, $dn= NULL,$object=false)
{
function faiScriptEntry ($config, $dn= NULL,$object=false)
{
$this->orig_cn= $object['cn'];
$this->dn=$object['dn'];
foreach($object as $name=>$value){
$this->orig_cn= $object['cn'];
$this->dn=$object['dn'];
foreach($object as $name=>$value){
- $oname = "Object_".$name;
+ $oname = $name;
$this->$oname=$value;
}
}else{
$this->$oname=$value;
}
}else{
- $this->Object_status = "new";
+ $this->status = "new";
$this->orig_cn = false;
}
}
function execute()
{
$this->orig_cn = false;
}
}
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Fill templating stuff */
$smarty = get_smarty();
$display = "";
/* Fill templating stuff */
$smarty = get_smarty();
$display = "";
if(($_FILES['ImportFile']['size']==0)){
print_red(_("Selected file is empty."));
}else{
if(($_FILES['ImportFile']['size']==0)){
print_red(_("Selected file is empty."));
}else{
- $str = file_get_contents($_FILES['ImportFile']['tmp_name']);
- $this->Object_FAIscript = $str;
+ $str = utf8_encode(addslashes(file_get_contents($_FILES['ImportFile']['tmp_name'])));
+ $this->FAIscript = $str;
}
}
}
}
-
-
foreach($this->attributes as $attrs){
foreach($this->attributes as $attrs){
- $smarty->assign($attrs,stripslashes($this->$attrs));
+ if(get_magic_quotes_gpc()){
+ $smarty->assign($attrs,stripslashes($this->$attrs));
+ }else{
+ $smarty->assign($attrs,($this->$attrs));
+ }
}
}
- for($i =1 ; $i <= 100 ; $i++){
- $Object_FAIprioritys[$i]=$i;
+ for($i =0 ; $i < 100 ; $i++){
+ $FAIprioritys[$i]=$i;
}
}
- $smarty->assign("Object_FAIprioritys",$Object_FAIprioritys);
+ $smarty->assign("FAIprioritys",$FAIprioritys);
$display.= $smarty->fetch(get_template_path('faiScriptEntry.tpl', TRUE));
return($display);
}
$display.= $smarty->fetch(get_template_path('faiScriptEntry.tpl', TRUE));
return($display);
}
$this->$attrs = "";
}
}
$this->$attrs = "";
}
}
+ $this->FAIscript= recode("DOS..LATIN1", $this->FAIscript);
}
}
}
}
{
$message= array();
{
$message= array();
- $str = utf8_encode("üöä");
-
- if(empty($this->Object_FAIscript)){
- $message[]=_("Please specify a script.");
- }
-
- if(empty($this->Object_description)){
- $message[] = _("Please enter a description.");
- }
-
- if(preg_match("/[^a-z0-9".$str."\.,;:\-_\? ]/i",$this->Object_description)){
- $message[] = _("Invalid character in description. Please enter a valid description.");
- }
-
- if(empty($this->Object_cn)){
+ if(empty($this->cn)){
$message[] = _("Please enter a name.");
}
$message[] = _("Please enter a name.");
}
- if(preg_match("/[^0-9a-z]/i",$this->Object_cn)){
- $message[] = _("Please enter a valid name. Only a-Z 0-9 are allowed.");
+ if(empty($this->FAIscript)){
+ $message[]=_("Please enter a script.");
}
}
-
+
return ($message);
}
return ($message);
}
{
$tmp=array();
foreach($this->attributes as $attrs){
{
$tmp=array();
foreach($this->attributes as $attrs){
- $attr = preg_replace("/^Object_/","",$attrs);
- $tmp[$attr] = $this->$attrs;
+ $tmp[$attrs] = $this->$attrs;
}
if(($this->orig_cn)&&($tmp['cn']!=$this->orig_cn)){
}
if(($this->orig_cn)&&($tmp['cn']!=$this->orig_cn)){
}
$tmp['dn'] = $this->dn;
}
$tmp['dn'] = $this->dn;
- $tmp['status'] = $this->Object_status;
+ $tmp['status'] = $this->status;
return($tmp);
}
}
return($tmp);
}
}