Fixed acls for confernces

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

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 555f5e3f932f5b492ca3324ace6983edf0b45040..961650e37a091935b86aba0f127327b3c987266f 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -26,7 +26,6 @@ class conference extends plugin
   var $base                              = "";
   var $ou                                              = "";
   var $goFonPIN                                = "";
-  var $acl = "";
   var $old_cn         = "";
 
   var $goFonConferenceOption           = "";
@@ -84,7 +83,7 @@ class conference extends plugin
     }
 
     $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-    $this->acl= get_module_permission($acl, "goFonConference", $this->dn);
+    $this->acl= get_module_permission($acl, "conference", $this->dn);
     $this->goFonConferenceOwner=$this->ui->dn;
 
     /* Parse Options ... 
@@ -114,9 +113,6 @@ class conference extends plugin
        /* Call parent execute */
        plugin::execute();
 
-    //$acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-    //$this->acl= get_module_permission($acl, "goFonConference", $this->dn);
-
     $this->config->departments    = get_departments($this->dn);
     $this->config->make_idepartments();
     $smarty= get_smarty();

diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index 1bddbdf660e8fbbb9c9564a476dbae24b91bf334..1264796f214fe0443b31241c8dd5c2cf195bd93a 100644 (file)
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -216,7 +216,6 @@ class phoneConferenceManagment extends plugin
 
       /* Register conftab to trigger edit dialog */
       $this->conftab= new conferencetabs($this->config,$this->config->data['TABS']['CONFERENCETABS'], $this->dn);
-      $this->conftab->set_acl($this->acl);
       $_SESSION['objectinfo']= $this->dn;
     }
 
@@ -226,7 +225,6 @@ class phoneConferenceManagment extends plugin
       /* Set up the users ACL's for this 'dn' */
       $this->dn= "new";
       $this->conftab= new conferencetabs($this->config,$this->config->data['TABS']['CONFERENCETABS'], $this->dn);
-      $this->conftab->set_acl($this->acl);
       unset($_SESSION['objectinfo']);//
     }