Fixed problem with not clickable buttons in fai package error msgs

[gosa.git] / plugins / admin / fai / class_faiPartitionTableEntry.inc

diff --git a/plugins/admin/fai/class_faiPartitionTableEntry.inc b/plugins/admin/fai/class_faiPartitionTableEntry.inc
index 9122d6c3ced763b02d45607435addbdce7b0e17e..1223d9e598e1ed1245dc188074ac4bfb1225d7d2 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTableEntry.inc
+++ b/plugins/admin/fai/class_faiPartitionTableEntry.inc
@@ -123,7 +123,8 @@ class faiPartitionTableEntry extends plugin
      */
     if($s_action == "remove" && $this->acl_is_removeable()){
       if($this->partitions[$s_entry]['status'] == "edited"){
-        $this->deletePartitions[]= $this->partitions[$s_entry];
+        $this->deletePartitions[$s_entry]= $this->partitions[$s_entry];
+        $this->deletePartitions[$s_entry]['FAIpartitionNr']=$s_entry;
         unset($this->partitions[$s_entry]);
       }else{
         unset($this->partitions[$s_entry]);
@@ -179,7 +180,7 @@ class faiPartitionTableEntry extends plugin
   {
     /* Define Arrays with allowed syntax */
     $PartitionTypes   = array("primary"=>_("primary"),"logical"=>_("logical"));
-    $FAIfsTypes       = array("ext2","ext3","xfs","swap","reiserfs","dosfat16","winfat32");
+    $FAIfsTypes       = array("ext2","ext3","xfs","swap","reiser","dosfat16","winfat32");
 
     /* Display Header */
     $str = "<table summary='' style='width:100%'>";
@@ -390,7 +391,7 @@ class faiPartitionTableEntry extends plugin
         $message[]=sprintf(_("please enter a unique mount point for partition %s"),($key));
       }
 
-      if($part['FAIfsType']!="swap"){
+      if($part['FAIfsType']!="swap" && $part['FAImountPoint'] != "-"){
         if((empty($part['FAImountPoint']))||(!((preg_match("/^\/.*/",$part['FAImountPoint']))||(preg_match("/^swap$/",$part['FAImountPoint']))))){
           $message[]=sprintf(_("Please enter a valid mount point for partition %s." ),($key));
         }
@@ -410,13 +411,13 @@ class faiPartitionTableEntry extends plugin
                 $message[]= sprintf(_("Please enter a valid partition size for partition %s."),($key));
                 break;
         case 1:
-                if (!is_id(is_id($tmp[0]))){
+                if (!is_id(is_id($tmp[0])) &&(!empty($tmp[1]))){
                   $message[]= sprintf(_("Please enter a valid partition size for partition %s."),($key));
                 }
                 break;
                 
         case 2:
-                if((!is_id($tmp[0]))&&(!is_id($tmp[1]))){
+                if((!is_id($tmp[0]))&&(!is_id($tmp[1])) &&(!empty($tmp[1]))){
                   $message[]=sprintf(_("Please enter a valid range for partition %s."),($key)); 
                 }elseif($tmp[0]>=$tmp[1]){
                   $message[]=sprintf(_("Please enter a valid range for partition %s."),($key));