Updated ACLs

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

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc
index 2a6ef7bce325a11eaa81dd77b226fe16a2a482d4..83f79e5811ee6301b95df7cedfde13fb823f9f02 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc
@@ -133,8 +133,8 @@ class licenseByProduct extends plugin
   static function plInfo()
   {
     return (array(
-          "plShortName"   => _("Usage"),
-          "plDescription" => _("License usage"),
+          "plShortName"   => _("Usage by product"),
+          "plDescription" => _("License usage by product"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
           "plPriority"    => 1,

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsage.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsage.inc
index 57cbff3d687412b958be7655b90b7b7d8d8fd675..3c9bf0ec9fb50b3d8a3ca0439b5b3848a9372e29 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsage.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsage.inc
@@ -80,14 +80,17 @@ class licenseUsage extends plugin
     
     // Create usage list
     $list = new divSelectBox("licenseUsage");
-    foreach($this->licenseUses as $license){
-
-      $f1 = array("string" => $license['hostId'][0]);
-      $f2 = array("string" => $license['licenseKey'][0]);
-      $f3 = array("string" => $license['licensePoolId'][0]);
-      $f4 = array("string" => $license['softwareLicenseId'][0],
-                  "attach" => "style='border-right:0px;'");
-      $list->addEntry(array($f1,$f2,$f3,$f4));
+    $ui = get_userinfo();
+    $readable = $ui->get_permissions($this->config->current['BASE'], "opsi/licenseUsage","");
+    if($readable) {
+      foreach($this->licenseUses as $license){
+        $f1 = array("string" => $license['hostId'][0]);
+        $f2 = array("string" => $license['licenseKey'][0]);
+        $f3 = array("string" => $license['licensePoolId'][0]);
+        $f4 = array("string" => $license['softwareLicenseId'][0],
+            "attach" => "style='border-right:0px;'");
+        $list->addEntry(array($f1,$f2,$f3,$f4));
+      } 
     } 
 
     $smarty = get_smarty();
@@ -136,17 +139,14 @@ class licenseUsage extends plugin
   static function plInfo()
   {
     return (array(
-          "plShortName"   => _("Usage"),
+          "plShortName"   => _("License usage"),
           "plDescription" => _("License usage"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
           "plPriority"    => 1,
           "plSection"     => array("administration"),
           "plCategory"    => array("opsi"),
-          "plProvidedAcls"=> array(
-            "cn"                => _("Name"),
-            "description" => _("Description"))
-          ));
+          "plProvidedAcls"=> array()));
   }
 }
 

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc
index c2b96e6f1e826e1f94b2b464d9bd193d28487e21..fc30f543536380886c058f0670f9c94a9ca79c74 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc
@@ -241,8 +241,8 @@ class licenseUsageByHost extends plugin
   static function plInfo()
   {
     return (array(
-          "plShortName"   => _("Usage"),
-          "plDescription" => _("License usage"),
+          "plShortName"   => _("Usage by host"),
+          "plDescription" => _("License usage by host"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
           "plPriority"    => 1,