Added checks

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

diff --git a/plugins/admin/FAI/class_faiHookEntry.inc b/plugins/admin/FAI/class_faiHookEntry.inc
index dba2a8ac6f8acc17b6661f0138b229c0b847adc2..06fe4024e857f5fc4b15c8baf3ad447695a82c7b 100644 (file)
--- a/plugins/admin/FAI/class_faiHookEntry.inc
+++ b/plugins/admin/FAI/class_faiHookEntry.inc
@@ -73,8 +73,31 @@ class faiHookEntry extends plugin
   function check()
   {
     $message= array();
+    if(empty($this->Object_FAItask)) {
+      $message[]=_("Please enter a value for task.");
+    }
+    if(empty($this->Object_FAIscript)) {
+      $message[]=_("Please enter a value for script.");
+    }
+
+    $str = utf8_encode("üöä");
+
+    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)){
+      $message[] = _("Please enter a name.");
+    }
+
+    if(preg_match("/[^0-9a-z]/",$this->Object_cn)){
+      $message[] = _("Please enter a valid name. Only a-Z 0-9 are allowed.");
+    }
   
-    
     return ($message);
   }
  

diff --git a/plugins/admin/FAI/class_faiScriptEntry.inc b/plugins/admin/FAI/class_faiScriptEntry.inc
index f43052fa1b367280253799e98b3a04d42bba9f67..308b8c5c389071232d6446aeda694e9522f2237a 100644 (file)
--- a/plugins/admin/FAI/class_faiScriptEntry.inc
+++ b/plugins/admin/FAI/class_faiScriptEntry.inc
@@ -74,7 +74,28 @@ class faiScriptEntry extends plugin
   {
     $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)){
+      $message[] = _("Please enter a name.");
+    }
+
+    if(preg_match("/[^0-9a-z]/",$this->Object_cn)){
+      $message[] = _("Please enter a valid name. Only a-Z 0-9 are allowed.");
+    }
+ 
     return ($message);
   }
  

diff --git a/plugins/admin/FAI/class_faiTemplateEntry.inc b/plugins/admin/FAI/class_faiTemplateEntry.inc
index ca0f879f4383fb396a394924e86bece3c0270537..0aa30733568ed813cdb15a8638f76b74224306c8 100644 (file)
--- a/plugins/admin/FAI/class_faiTemplateEntry.inc
+++ b/plugins/admin/FAI/class_faiTemplateEntry.inc
@@ -75,8 +75,31 @@ class faiTemplateEntry extends plugin
   function check()
   {
     $message= array();
+    if(empty($this->Object_FAItemplateFile)){
+      $message[]=_("Please specify a value for attribute 'file'.");
+    } 
+
+    if(empty($this->Object_FAItemplatePath)){
+      $message[]=_("Please specify a value for attribute 'path'.");
+    } 
   
-    
+    $str = utf8_encode("üöä");
+
+    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)){
+      $message[] = _("Please enter a name.");
+    }
+
+    if(preg_match("/[^0-9a-z]/",$this->Object_cn)){
+      $message[] = _("Please enter a valid name. Only a-Z 0-9 are allowed.");
+    }
     return ($message);
   }
  

diff --git a/plugins/admin/FAI/class_faiVariableEntry.inc b/plugins/admin/FAI/class_faiVariableEntry.inc
index 01dff1dbbd89da846e58e4f2cc747c0fe5f68385..6277645f52f844e4ad06ef178b148161893bd453 100644 (file)
--- a/plugins/admin/FAI/class_faiVariableEntry.inc
+++ b/plugins/admin/FAI/class_faiVariableEntry.inc
@@ -71,8 +71,28 @@ class faiVariableEntry extends plugin
   function check()
   {
     $message= array();
-  
     
+    $str = utf8_encode("üöä");
+    if(empty($this->Object_FAIvariableContent)) {
+      $message[]=_("Please specify a value for the attribute 'content'."); 
+    }
+   
+    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)){
+      $message[] = _("Please enter a name.");
+    }
+
+    if(preg_match("/[^0-9a-z]/",$this->Object_cn)){
+      $message[] = _("Please enter a valid name. Only a-Z 0-9 are allowed.");
+    }
+ 
     return ($message);
   }