Added several comments

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

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 989ff1be3721db5cb5285e3c58a82f193bb46738..bb06019cd064a4d132405ccef8579f9b525b5367 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -67,8 +67,6 @@ class faiPackage extends plugin
     /* Load Attributes */
     plugin::plugin ($config, $dn);
 
-    $this->acl ="#all#";
-
     /* If "dn==new" we try to create a new entry
      * Else we must read all objects from ldap which belong to this entry.
      * First read SubObjects from ldap ... and then the partition definitions for the SubObjects.
@@ -76,13 +74,6 @@ class faiPackage extends plugin
     if($dn != "new"){
       $this->dn =$dn;
 
-      /* Set acls
-       */
-      $ui   = get_userinfo();
-      $acl  = get_permissions ($this->dn, $ui->subtreeACL);
-      $acli = get_module_permission($acl, "FAIclass", $this->dn);
-      $this->acl=$acli;
-
       /* Get FAIstate
        */
       if(isset($this->attrs['FAIstate'][0])){
@@ -226,13 +217,13 @@ class faiPackage extends plugin
     $this->list=$this->genPkgs();
 
     /* + was pressed to open the package dialog */
-    if(isset($_POST['Addpkg'])){
+    if(isset($_POST['Addpkg']) && $this->acl_is_writeable("FAIpackage")){
       $this->dialog = new faiPackageEntry($this->config, $this->dn,$this->list,$this->usedPackages);
       $this->is_dialog =true;
     }
 
     /* Delte selected package */ 
-    if(isset($_POST['Delpkg'])){
+    if(isset($_POST['Delpkg']) && $this->acl_is_writeable("FAIpackage")){
       if($this->FAIstate != "freeze"){
         foreach($_POST['usedPackages'] as $del){
           if(isset($this->usedPackages[$del])){
@@ -270,7 +261,7 @@ class faiPackage extends plugin
     }
 
     /* Configuration dialog open*/
-    if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages']))){
+    if((isset($_POST['Conpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages'])) && $this->acl_is_writeable("FAIdebconfInfo")){
       $path = "/etc/gosa/fai/".$this->FAIdebianRelease."/debconf.d";
       $pkg_config = array();
       $pkg = $_POST['usedPackages'][0];
@@ -280,12 +271,11 @@ class faiPackage extends plugin
       }
 
       $this->dialog = new faiPackageConfiguration($this->config, $this->dn,$pkg, $path, $pkg_config);
-      $this->dialog ->acl = $this->acl;
       $this->is_dialog =true;
     }
 
     /* Configuration dialog open*/
-    if($this->FAIstate != "freeze"){
+    if($this->FAIstate != "freeze" && $this->acl_is_writeable("FAIpackage")){
       if((isset($_POST['Markpkg']))&&(isset($_POST['usedPackages']))&&(!empty($_POST['usedPackages']))){
         foreach($_POST['usedPackages'] as $pkg){
           if (isset($this->usedPackages[$pkg])){
@@ -327,12 +317,11 @@ class faiPackage extends plugin
       $strsec .= $sec." ";
     }
 
-    foreach($this->attributes as $attr){
-      $smarty->assign($attr."ACL",chkacl($this->acl,$attr));
+    $tmp = $this->plInfo();
+    foreach($tmp['plProvidedAcls'] as $name => $translated){
+      $smarty->assign($name."ACL",$this->getacl($name,preg_match("/freeze/",$this->FAIstate)));
     }
 
-    $smarty->assign("OptionsACL","");
-
     $smarty->assign("releases",$this->releases);
     $smarty->assign("release" ,$this->FAIdebianRelease);
     $smarty->assign("sections",$this->sections);
@@ -376,16 +365,8 @@ class faiPackage extends plugin
    */
   function save_object()
   {
-
     if($this->FAIstate == "freeze") return;  
     plugin::save_object();
-
-
-    foreach($this->attributes as $attrs){
-      if(isset($_POST[$attrs])){
-        $this->$attrs = $_POST[$attrs];
-      }
-    }
   }
 
 
@@ -557,6 +538,7 @@ class faiPackage extends plugin
             "FAIpackage"        => _("Packages"),
             "FAIdebianSection"  => _("Section"),
             "FAIinstallMethod"  => _("Install Method"),
+            "FAIdebconfInfo"    => _("Package configuration"),
             "FAIdebianRelease"  => _("Release"))
           ));
   }