Finished adding acls 'all/all' is the best solution

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

diff --git a/plugins/addons/ldapmanager/class_export.inc b/plugins/addons/ldapmanager/class_export.inc
index 7669b7f97eaaa083393d9aec775641b64ccd7ff7..53f07d8fd0d79c9879752752b65fa90c738f4082 100644 (file)
--- a/plugins/addons/ldapmanager/class_export.inc
+++ b/plugins/addons/ldapmanager/class_export.inc
@@ -51,7 +51,7 @@ class ldifexport extends plugin
 
     // Set values for optionlist in form
     $bases      = array();
-    $acl_bases  = $this->ui->get_module_departments("ldapmanager");
+    $acl_bases  = $this->ui->get_module_departments("all");
     foreach($this->config->idepartments as $base_dn => $name){
       if(in_array_ics($base_dn,$acl_bases)){
         $bases[$base_dn] = $name;
@@ -81,7 +81,7 @@ class ldifexport extends plugin
     /* check alcs for given dn */
     $acls ="";
     if(isset($dn)){
-      $acls = $this->ui->get_permissions($dn,"ldapmanager/ldifexport");
+      $acls = $this->ui->get_permissions($dn,"all/all");
     }
     if((!preg_match("/r/",$acls)) && (isset($dn))){
 
@@ -111,24 +111,6 @@ class ldifexport extends plugin
     /* Show main page */
     return ($smarty->fetch (get_template_path('contentexport.tpl', TRUE)));
   }
-
-  /* Return plugin informations for acl handling
-     #FIXME You can only read attributes within this report plugin */
-  function plInfo()
-  {
-    return (array(
-        "plShortName"   => _("Export"),
-        "plDescription" => _("Export"),
-        "plSelfModify"  => FALSE,
-        "plDepends"     => array(),
-        "plPriority"    => 1,
-        "plSection"     => array("addon"),
-        "plCategory"    => array("ldapmanager" => array("objectClass" => "none", "description" => _("Ldap manager addon"))),
-
-        "plProvidedAcls" => array()
-        ));
-  }
-
 }
 
 

diff --git a/plugins/addons/ldapmanager/class_exportxls.inc b/plugins/addons/ldapmanager/class_exportxls.inc
index ae27875db37ad070f01d5397be9291c71403eec9..8a830d1069b86c8d64f4911359a294715196f160 100644 (file)
--- a/plugins/addons/ldapmanager/class_exportxls.inc
+++ b/plugins/addons/ldapmanager/class_exportxls.inc
@@ -58,7 +58,7 @@ class xlsexport extends plugin
 
     // Set values for optionlist in form
     $bases      = array();
-    $acl_bases  = $this->ui->get_module_departments("ldapmanager");
+    $acl_bases  = $this->ui->get_module_departments("all");
     foreach($this->config->idepartments as $base_dn => $name){
       if(in_array_ics($base_dn,$acl_bases)){
         $bases[$base_dn] = $name;
@@ -93,7 +93,7 @@ class xlsexport extends plugin
     /* check alcs for given dn */
     $acls ="";
     if(isset($dn)){
-      $acls = $this->ui->get_permissions($dn,"ldapmanager/xlsexport");
+      $acls = $this->ui->get_permissions($dn,"all/all");
     }
  
     if((!preg_match("/r/",$acls)) && isset($dn)){
@@ -125,22 +125,6 @@ class xlsexport extends plugin
     return ($smarty->fetch (get_template_path('contentexportxls.tpl', TRUE)));
   }
 
-  /* Return plugin informations for acl handling
-     #FIXME You can only read attributes within this report plugin */
-  function plInfo()
-  {
-    return (array(
-        "plShortName"   => _("Export XLS"),
-        "plDescription" => _("Export XLS"),
-        "plSelfModify"  => FALSE,
-        "plDepends"     => array(),
-        "plPriority"    => 2,
-        "plSection"     => array("addon"),
-        "plCategory"    => array("ldapmanager"),
-
-        "plProvidedAcls" => array()
-        ));
-  }
 }
 
 

diff --git a/plugins/addons/ldapmanager/class_ldif.inc b/plugins/addons/ldapmanager/class_ldif.inc
index 51b8ec65f539da1ea707cc694a059d3f57cc4080..8f0c783eca52031a607c21a58a113120e562599a 100644 (file)
--- a/plugins/addons/ldapmanager/class_ldif.inc
+++ b/plugins/addons/ldapmanager/class_ldif.inc
@@ -27,6 +27,25 @@ class ldif extends plugin
     return ($this->ldif->execute());
   }
 
+  /* Return plugin informations for acl handling
+     #FIXME You can only read attributes within this report plugin */
+  function plInfo()
+  {
+    return (array(
+        "plShortName"   => _("Ldap manager"),
+        "plDescription" => "Dummy entry for menu creation functions, later",
+        "plSelfModify"  => FALSE,
+        "plDepends"     => array(),
+        "plPriority"    => 1,
+        "plSection"     => array("addon"),
+        "plCategory"    => array("ldapmanager" => array("objectClass" => "none", "description" => _("Ldap manager addon"))),
+
+        "plProvidedAcls" => array()
+        ));
+  }
+
+
+
 }