From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 12 Sep 2005 11:05:49 +0000 (+0000)
Subject: it wasn't permitted to create a new conference
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=79e0485734ac4a114e3fd1d95bdf13a51dbec02d;p=gosa.git

it wasn't permitted to create a new conference


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

diff --git a/plugins/gofon/conference/class_phoneConferenceGeneric.inc b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
index 1ae62b913..a119c495d 100644
--- a/plugins/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/plugins/gofon/conference/class_phoneConferenceGeneric.inc
@@ -109,8 +109,8 @@ class conference extends plugin
 
   function execute()
   {
-    $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-    $this->acl= get_module_permission($acl, "goFonConference", $this->dn);
+    //$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();
diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc
index e4913b2f4..112e54223 100644
--- a/plugins/gofon/conference/class_phoneConferenceManagment.inc
+++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc
@@ -212,15 +212,21 @@ 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(array(":all"));
+      $this->conftab->set_acl($this->acl);
       $_SESSION['objectinfo']= $this->dn;
     }
 
     /* Insert new entry*/    
     if($s_action == "new"){
+      $this->dn= "new";
+      /* Set up the users ACL's for this 'dn' */
+      $this->acl= get_permissions ($this->dn, $this->ui->subtreeACL);
       $this->dn= "new";
       $this->conftab= new conferencetabs($this->config,$this->config->data['TABS']['CONFERENCETABS'], $this->dn);
+      $this->acl= get_permissions ($this->conftab->dn, $this->ui->subtreeACL);
+      $this->conftab->set_acl($this->acl);
       $this->conftab->set_acl(array(':all'));
+      $_SESSION['objectinfo']= $this->dn;
     }
 
     /* Edit finished, check and save changes */