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 865e7c7fe71571663bfb06f1890692348a31dad4..c1701053bf4f01be2880dc2de6c0550649db166d 100644 (file)
--- 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 a3df52fb4a6e37a8a032a7b891048d6e0aa657fe..d04958a42c93dd0f8b0aff0b7d5fb08495324d3e 100644 (file)
--- 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 11e6b56e29f044bcaef192eb67aaf8ee251865ea..157b29b7b84a9c1fc900dd0bcdc61598b1ee5ab4 100644 (file)
--- 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">