From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 5 Jan 2010 08:33:34 +0000 (+0000)
Subject: Fixed Blocklist handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7c1e16193fdc7ee8237a732787ea9d3d84dff14b;p=gosa.git

Fixed Blocklist handling


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

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
index 865e7c7fe..c1701053b 100644
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
@@ -68,7 +68,7 @@ class blocklistGeneric extends plugin
         $this->base= dn2base($ui->dn);
       }
     } else {
-      $this->base =preg_replace ("/^[^,]+,[^,]+,[^,]+,/","",$this->dn);
+      $this->base= preg_replace ("/^[^,]+,".preg_quote(get_ou("faxBlocklistRDN"), '/')."/i", "", $this->dn);
     }
     
     $this->orig_base = $this->base;
diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
index a3df52fb4..d04958a42 100644
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
@@ -33,8 +33,6 @@ class blocklistManagement extends management
   protected $aclPlugin   = "blocklistGeneric";
   protected $objectName   = "blocklist";
 
-  protected $skipFooter = TRUE;
-
   function __construct($config,$ui)
   {
     $this->config = $config;
diff --git a/gosa-plugins/gofax/gofax/blocklists/generic.tpl b/gosa-plugins/gofax/gofax/blocklists/generic.tpl
index 11e6b56e2..157b29b7b 100644
--- a/gosa-plugins/gofax/gofax/blocklists/generic.tpl
+++ b/gosa-plugins/gofax/gofax/blocklists/generic.tpl
@@ -95,15 +95,6 @@
  </tr>
 </table>
 
-<p class="plugbottom">
-  {if !$read_only}
-  <input type=submit name="edit_finish" style="width:80px" value="{msgPool type=okButton}">
-	{if $dn != "new"}
-	  <input type=submit name="edit_apply" value="{msgPool type=applyButton}">
-	{/if}
-  {/if}
-  <input type=submit name="edit_cancel" value="{msgPool type=cancelButton}">
-</p>
 <input type='hidden' name='blocklist_posted' value="1">
 <!-- Place cursor -->
 <script language="JavaScript" type="text/javascript">