From 144e14b6126affd94c97cd9f9561c159925f113d Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 30 Sep 2009 13:18:33 +0000 Subject: [PATCH] Updated ACLs git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14413 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../opsiLicenses/class_licenseByProduct.inc | 4 +-- .../admin/opsiLicenses/class_licenseUsage.inc | 26 +++++++++---------- .../opsiLicenses/class_licenseUsageByHost.inc | 4 +-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseByProduct.inc index 2a6ef7bce..83f79e581 100644 --- 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 57cbff3d6..3c9bf0ec9 100644 --- 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 c2b96e6f1..fc30f5435 100644 --- 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, -- 2.30.2