Fixed Macro acls

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

diff --git a/plugins/admin/groups/acl_definition.inc b/plugins/admin/groups/acl_definition.inc
index b4bff2ebb4606926921324b2691288317575e590..2413e2205133b138a0b028db361148a13585cd73 100644 (file)
--- a/plugins/admin/groups/acl_definition.inc
+++ b/plugins/admin/groups/acl_definition.inc
@@ -315,5 +315,6 @@ $ACLD['conference'] =       array(
 $ACLD['FAIclass']      =       array(
                                                                // Allow displaying of FAI menu element
                                                                "FAIclass"      => "FAI management enabled");
+$ACLD['goFonMacro']    =array("goFonMacro","edit","delete");
 
 ?>

diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index 051675f87883447dcd2be0abe14234dacfa0a318..d33f8a605fdc047cae8482c1a6aab9c4cdac6fee 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -77,6 +77,9 @@ class macro extends plugin
       $this->orig_cn=$this->cn;
       $this->base= dn2base($this->dn);
     }
+    $ui= get_userinfo();
+    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
+    $this->acl= get_module_permission($acl, "goFonMacro", $ui->dn);
   }
 
   /*!  Execute this plugin */
@@ -327,7 +330,11 @@ class macro extends plugin
   {
     if (isset($_POST['displayName'])){
       plugin::save_object();
-
+    }
+    foreach($this->attributes as $attr){
+      if(isset($_POST[$attr])){
+        $this->$attr= $_POST [$attr];
+      }
     }
   }
 
@@ -360,7 +367,7 @@ class macro extends plugin
     }
  
     foreach($this->attributes as $attr){
-      if(chkacl($this->acl,$attr)){
+      if(chkacl($this->acl,"edit")){
         $str =  sprintf( _("Insufficient permissions, can't change attribute '%s' in goFonMacro"),$attr) ;
         return(array($str));
         }

diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc
index c6f1303237507f5536ad718f74bdd54cdb603044..0f5d782557fc4fdb9af64feefa90ac0dcb9a67b3 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroManagement.inc
+++ b/plugins/gofon/macro/class_gofonMacroManagement.inc
@@ -43,6 +43,9 @@ class gofonMacro extends plugin
       $macrofilter= array("depselect" => $base,  "regex" => "*");
       register_global("macrofilter", $macrofilter);
     }
+
+    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
+    $this->acl= get_module_permission($acl, "goFonMacro", $ui->dn);
   }
 
   function execute()
@@ -154,7 +157,6 @@ class gofonMacro extends plugin
 
       /* Create new usertab object */
       $this->macrotabs= new macrotabs($this->config,$this->config->data['TABS']['MACROTABS'], $this->dn);
-      $this->macrotabs->set_acl(array(':all'));
     }
 
     /* Cancel dialogs */
@@ -216,14 +218,9 @@ class gofonMacro extends plugin
       /* Lock the current entry, so everyone will get the
          above dialog */
       add_lock ($this->dn, $this->ui->dn);
-
-      /* Set up the users ACL's for this 'dn' */
-      $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-
       /* Register macrotabs to trigger edit dialog */
       $this->macrotabs= new macrotabs($this->config,
-          $this->config->data['TABS']['MACROTABS'], $this->dn);
-      $this->macrotabs->set_acl($acl);
+      $this->config->data['TABS']['MACROTABS'], $this->dn);
       $_SESSION['objectinfo']= $this->dn;
     }
 
@@ -236,7 +233,7 @@ class gofonMacro extends plugin
       /* Load permissions for selected 'dn' and check if
          we're allowed to remove this 'dn' */
       $acl= get_permissions ($this->dn, $this->ui->subtreeACL);
-      $this->acl= get_module_permission($acl, "macro", $this->dn);
+      $this->acl= get_module_permission($acl, "goFonMacro", $this->dn);
       if (chkacl($this->acl, "delete") == ""){
 
         /* Check locking, save current plugin in 'back_plugin', so

diff --git a/plugins/gofon/macro/class_gofonMacroParameters.inc b/plugins/gofon/macro/class_gofonMacroParameters.inc
index c9a97d7830619e0ace5e0561dee4749006780a84..e7e7b0d0a15bfeab095903c38754a14b6f574d93 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacroParameters.inc
+++ b/plugins/gofon/macro/class_gofonMacroParameters.inc
@@ -101,7 +101,10 @@ class macroParameter extends plugin
     $this->goFonMacroParameter = $tmp2;
 
     $this->para_count = count ($tmp2);
-    
+   
+    $ui= get_userinfo();
+    $acl= get_permissions ($ui->dn, $ui->subtreeACL);
+    $this->acl= get_module_permission($acl, "goFonMacro", $ui->dn);
   }
 
   //! Perform Parameter check 
@@ -320,7 +323,7 @@ class macroParameter extends plugin
     $message = array();
 
     foreach($this->attributes as $attr){
-      if(chkacl($this->acl,$attr)){
+      if(chkacl($this->acl,"edit")){
         $str =  sprintf( _("Insufficient permissions, can't change attribute '%s' in goFonMacro."),$attr) ;
         return(array($str));
       }