X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fgofax%2Fblocklists%2Fclass_blocklistManagement.inc;h=9b946ee97cce5792d6b571dd05d4f497d11cd463;hb=5d0f48602651da43514bff253b037394b308b25e;hp=a415e19e9ade5d4ef7638c602f28537667b44c05;hpb=554ac877fe40fc7b46328fab620380029c278003;p=gosa.git

diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index a415e19e9..9b946ee97 100644
--- a/plugins/gofax/blocklists/class_blocklistManagement.inc
+++ b/plugins/gofax/blocklists/class_blocklistManagement.inc
@@ -29,10 +29,6 @@ class blocklist extends plugin
     $this->dn     = "";
     $this->config = $config;
 
-    $ui           = get_userinfo();
-    $acl          = get_permissions ($ui->dn, $ui->subtreeACL);
-    $this->acl    = get_module_permission($acl, "blocklists", $ui->dn);
-
     $this->DivListBlocklist = new divListBlocklist($this->config,$this);
   }
 
@@ -259,7 +255,7 @@ class blocklist extends plugin
       foreach($_POST as $name => $value){
         if(preg_match("/^chooseBase/",$name) && $once){
           $once = false;
-          $this->dialog = new baseSelectDialog($this->config);
+          $this->dialog = new baseSelectDialog($this->config,$this);
           $this->dialog->setCurrentBase($this->base);
         }
       }
@@ -322,8 +318,8 @@ class blocklist extends plugin
        ***************/
 
       /* Check if there is a snapshot dialog open */
-      if($str = $this->showSnapshotDialog($this->DivListBlocklist->selectedBase,
-              array("ou=gofax,ou=systems,". $this->DivListBlocklist->selectedBase))){
+      $base = $this->DivListBlocklist->selectedBase;
+      if($str = $this->showSnapshotDialog($base,$this->get_used_snapshot_bases())){
         return($str);
       }
 
@@ -342,6 +338,13 @@ class blocklist extends plugin
   }
 
 
+  /* Return departments, that will be included within snapshot detection */
+  function get_used_snapshot_bases()
+  {
+    return(array("ou=gofax,ou=systems,". $this->DivListBlocklist->selectedBase));
+  }
+
+
   /* Clear garbage from edited lists */
   function clear_fields()
   {
@@ -376,11 +379,11 @@ class blocklist extends plugin
     /* Create filter */
     if ($ShowSendBocklists){
       $filter = "(&(objectClass=goFaxSBlock)(|(cn=".$Regex.")(goFaxSBlocklist=".$Regex.")))";
-      $res= get_list($filter, $this->ui->subtreeACL, $base,array("*"), $Flags);
+      $res= get_list($filter, "gofax", $base,array("*"), $Flags);
     }
     if ($ShowReceiveBlocklists){
       $filter2= "(&(objectClass=goFaxRBlock)(|(cn=".$Regex.")(goFaxRBlocklist=".$Regex.")))";
-      $res2= get_list($filter2, $this->ui->subtreeACL, $base,array("*"), $Flags);
+      $res2= get_list($filter2, "gofax", $base,array("*"), $Flags);
     }
    
     $this->blocklists = array_merge($res,$res2);
@@ -403,7 +406,7 @@ class blocklist extends plugin
   {
     $ldap= $this->config->get_ldap_link();
     $ldap->rmDir($this->dn);
-    show_ldap_error($ldap->get_error(), _("Removing blocklist object failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Removing of blocklist with dn '%s' failed."),$this->dn));
     $this->clear_fields();
     $this->handle_post_events("remove");
   }
@@ -423,6 +426,9 @@ class blocklist extends plugin
         $this->$attr = $_POST[$attr];
       }
     }
+    if(isset($_POST['type'])){
+      $this->type = $_POST['type'];
+    }
   }
 
 
@@ -511,7 +517,7 @@ class blocklist extends plugin
       $ldap->add($this->attrs);
       $this->handle_post_events("add");
     }
-    show_ldap_error($ldap->get_error(), _("Saving blocklist object failed"));
+    show_ldap_error($ldap->get_error(), sprintf(_("Saving of blocklist with dn '%s' failed."),$this->dn));
   }
 
 
@@ -546,6 +552,30 @@ class blocklist extends plugin
     }
   }
 
+  /* Return plugin informations for acl handling */
+  function plInfo()
+  {
+    return (array(  
+          "plShortName"       => _("Fax"),
+          "plDescription"     => _("Fax Blocklists"),
+          "plSelfModify"      => TRUE,
+          "plDepends"         => array(),
+
+          "plPriority"    => 0,
+          "plSection"     => array("administration" => _("FAX Blocklists")),
+          "plCategory"    => array("gofax"          => array("description" => _("Fax"),
+                                                             "objectClass" => array("goFaxRBlock","goFaxSBlock"))),
+      
+  
+
+          "plProvidedAcls" => array(
+            "cn"              => _("Name"),
+            "description"     => _("Description"),
+            "base"            => _("Base"),
+            "type"            => _("Blocklist type"))
+          ));
+  }
+
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>