diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc
index a415e19e9ade5d4ef7638c602f28537667b44c05..9b946ee97cce5792d6b571dd05d4f497d11cd463 100644 (file)
$this->dn = "";
$this->config = $config;
$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);
}
$this->DivListBlocklist = new divListBlocklist($this->config,$this);
}
foreach($_POST as $name => $value){
if(preg_match("/^chooseBase/",$name) && $once){
$once = false;
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);
}
}
$this->dialog->setCurrentBase($this->base);
}
}
***************/
/* Check if there is a snapshot dialog open */
***************/
/* 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);
}
return($str);
}
}
}
+ /* 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()
{
/* Clear garbage from edited lists */
function clear_fields()
{
/* Create filter */
if ($ShowSendBocklists){
$filter = "(&(objectClass=goFaxSBlock)(|(cn=".$Regex.")(goFaxSBlocklist=".$Regex.")))";
/* 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.")))";
}
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);
}
$this->blocklists = array_merge($res,$res2);
{
$ldap= $this->config->get_ldap_link();
$ldap->rmDir($this->dn);
{
$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");
}
$this->clear_fields();
$this->handle_post_events("remove");
}
$this->$attr = $_POST[$attr];
}
}
$this->$attr = $_POST[$attr];
}
}
+ if(isset($_POST['type'])){
+ $this->type = $_POST['type'];
+ }
}
}
$ldap->add($this->attrs);
$this->handle_post_events("add");
}
$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));
}
}
}
}
}
}
+ /* 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:
?>
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>