Removed encryption in favor of FAI classes. Closes #414

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

diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc
index 2524c97cc6bc3d417fd9c9b686d8b74025b4e695..ee62ddd0963f38cfbaf16957afad1c82caf4859b 100644 (file)
--- a/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc
+++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTableEntry.inc
@@ -67,9 +67,6 @@ class faiPartitionTableEntry extends plugin
 
           if (preg_match('/^_/', $disk['partitions'][$name]['FAIfsType'])){
             $disk['partitions'][$name]['FAIfsType']= preg_replace('/^_/', '', $disk['partitions'][$name]['FAIfsType']);
-            $disk['partitions'][$name]['FAIencrypted']= true;
-          } else {
-            $disk['partitions'][$name]['FAIencrypted']= false;
           }
         }
       }
@@ -146,7 +143,6 @@ class faiPartitionTableEntry extends plugin
         $tmp[$attr]                = "";     
       }
       $tmp["old_cn"]               = "";     
-      $tmp["FAIencrypted"] = FALSE;     
       $tmp['status']="new";
       $this->partitions[count($this->partitions)+1]=$tmp;
     }
@@ -196,7 +192,6 @@ class faiPartitionTableEntry extends plugin
       $str .= "<td><b>"._("Mount options")."</b></td>";
       $str .= "<td><b>"._("FS option")."</b></td>";
       $str .= "<td><b>"._("Preserve")."</b></td>";
-      $str .= "<td><b>"._("Encrypted")."</b></td>";
       $str .= "<td>&nbsp;</td>";
       $str .= "</tr>";
     }
@@ -287,22 +282,12 @@ class faiPartitionTableEntry extends plugin
           }else{
             $str .= "\n<td><input type='checkbox' name='FAIpartitionFlags_".$key."' value='preserve' ".$changeState." ".$disableALL."></td>";
           }
-          if($part['FAIencrypted']!=false){
-            $str .= "\n<td><input type='checkbox' name='FAIencrypted_".$key."' value='encrypted' checked></td>";
-          }else{
-            $str .= "\n<td><input type='checkbox' name='FAIencrypted_".$key."' value='encrypted'></td>";
-          }
         }else{
           if($part['FAIpartitionFlags']!=false){
             $str .= "<td>"._("False")."</td>";
           }else{
             $str .= "<td>"._("True")."</td>";
           }
-          if($part['FAIencrypted']!=false){
-            $str .= "<td>"._("False")."</td>";
-          }else{
-            $str .= "<td>"._("True")."</td>";
-          }
         }
         if($this->acl_is_removeable()){
           $str .= "\n<td><input type='submit' name='Delete_".$key."' value='"._("Remove")."' ".$disableALL."></td>";    
@@ -327,10 +312,6 @@ class faiPartitionTableEntry extends plugin
 
     /* Attach partitions */
     foreach($this->partitions as $key=>$val) {
-      if (isset($this->partitions[$key]['FAIencrypted']) && $this->partitions[$key]['FAIencrypted']){
-        unset ($this->partitions[$key]['FAIencrypted']);
-        $this->partitions[$key]['FAIfsType']= "_".$this->partitions[$key]['FAIfsType'];
-      }
       $this->partitions[$key]['FAIpartitionNr']=$key;
     }
 
@@ -372,15 +353,6 @@ class faiPartitionTableEntry extends plugin
           }
         }
 
-        if($this->acl_is_writeable("FAIencrypted")){
-
-          if(isset($_POST["FAIencrypted_".$key])){
-            $this->partitions[$key]["FAIencrypted"] = $_POST["FAIencrypted_".$key];
-          }else{
-            $this->partitions[$key]["FAIencrypted"] = false;
-          }
-        }
-
         /* Adapt ext3 to have -j option */
         if ($this->partitions[$key]["FAIfsType"] == "ext3") {
           $this->partitions[$key]["FAIfsOptions"]= preg_replace('/\s*-j\s*/', '', $this->partitions[$key]["FAIfsOptions"]);
@@ -504,7 +476,6 @@ class faiPartitionTableEntry extends plugin
             "FAIpartitionSize"  => _("Partition size"),
             "FAImountOptions"   => _("Mount options"),
             "FAIfsOptions"      => _("File system options"),
-            "FAIencrypted"      => _("File system encryption"),
             "FAIpartitionFlags" => _("Partition flags"))
           ));
   }