![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseUsageByHost.inc
index 4618df364ef36fac0139f2a198c11476d46e45a0..746d2b9d8b248ef4b832b04b670dd976f565e8a9 100644 (file)
// Get license usage
$res = $this->si->getLicenseUsage($this->cn);
if($this->si->is_error()){
+ msg_dialog::display(_("Error"),msgPool::siError($this->si->get_error()),ERROR_DIALOG);
$this->init_successfull = FALSE;
return;
}
// Get reservations
$res = $this->si->getReservedLicensesForHost($this->cn);
if($this->si->is_error()){
+ msg_dialog::display(_("Error"),msgPool::siError($this->si->get_error()),ERROR_DIALOG);
$this->init_successfull = FALSE;
return;
}
foreach($res as $pool){
- $this->reservedLicenses[] = $pool['licensePoolId'][0];
+ $l = $pool['softwareLicenseId'][0];
+ $this->reservedLicenses[$l] = $l;
}
$this->init_reservedLicenses = $this->reservedLicenses;
// Get list of license pools
- $res = $this->si->listPools();
+ $res = $this->si->listLicenses();
if($this->si->is_error()){
+ msg_dialog::display(_("Error"),msgPool::siError($this->si->get_error()),ERROR_DIALOG);
$this->init_successfull = FALSE;
return;
}
$this->availableLicenses = array();
- foreach($res as $pool){
- $this->availableLicenses[] = $pool['cn'][0];
+ foreach($res as $license){
+ if(!isset($license['licensePoolId'])) $license['licensePoolId'][0] = '-';
+ $this->availableLicenses[$license['softwareLicenseId'][0]] = $license;
}
$this->init_successfull = TRUE;
function execute()
{
+
// Handle initialization failures.
if(isset($_POST['retry_init'])) $this->init();
if(!$this->init_successfull){
$list = new divSelectBox("licenseUsage");
$list->setHeight(150);
foreach($this->licenseUses as $license){
- $f3 = array("string" => $license['licenseKey'][0]);
- $f2 = array("string" => $license['licensePoolId'][0]);
- $f4 = array("string" => $license['softwareLicenseId'][0]);
- $list->addEntry(array($f2,$f3,$f4));
+ if(preg_match("/r/i",$this->getacl('hostId'))){
+ $f3 = array("string" => $license['licenseKey'][0]);
+ $f2 = array("string" => $license['licensePoolId'][0]);
+ $f4 = array("string" => $license['softwareLicenseId'][0]);
+ $list->addEntry(array($f2,$f3,$f4));
+ }
}
// Create reserved list
$list2 = new divSelectBox("reservedLicenses");
$list2->setHeight(150);
foreach($this->reservedLicenses as $key => $license){
- $action = "<input class='center' type='image' src='images/lists/trash.png'
- name='removeReservation_{$key}'>";
- $f1 = array("string" => $license);
- $f4 = array("string" => $action,
- "attach" => "style='border-right:0px; width:16px;'");
- $list2->addEntry(array($f1,$f4));
+ if(preg_match("/r/i",$this->getacl('boundToHost'))){
+
+ $l = $this->availableLicenses[$key];
+
+ // Display remove button in case of write permissions
+ $action = "";
+ if(preg_match("/w/i",$this->getacl('boundToHost'))){
+ $action = "<input class='center' type='image' src='images/lists/trash.png'
+ name='removeReservation_{$key}'>";
+ }
+
+ $f1 = array("string" => $l['softwareLicenseId'][0]);
+ $f2 = array("string" => $l['licensePoolId'][0]);
+ $f4 = array("string" => $action,
+ "attach" => "style='border-right:0px; width:16px;'");
+ $list2->addEntry(array($f1,$f4));
+ }
}
$smarty = get_smarty();
$smarty->assign($attr,$this->$attr);
}
+ // build up a available licenses list.
+ $licenses = array();
+ foreach($this->availableLicenses as $key => $license){
+ if(!in_array($license['softwareLicenseId'][0], $this->reservedLicenses)){
+ $licenses[$key] = $license['softwareLicenseId'][0]." [".$license['licensePoolId'][0]."]";
+ }
+ }
+
$smarty->assign("licenseUses", $list->DrawList());
$smarty->assign("licenseReserved", $list2->DrawList());
$smarty->assign("init_successfull", $this->init_successfull);
- $smarty->assign("availableLicenses", array_diff($this->availableLicenses, $this->reservedLicenses));
+ $smarty->assign("availableLicenses", $licenses);
$smarty->assign("initially_was_account", $this->initially_was_account);
return($smarty->fetch(get_template_path('licenseUsageByHost.tpl',TRUE,dirname(__FILE__))));
}
if(isset($_POST['opsiLicenseUsagePosted'])){
plugin::save_object();
- // Check if we've to remove reservations
- foreach($_POST as $name => $value){
- if(preg_match("/^removeReservation_/", $name)){
- $id = preg_replace("/^removeReservation_(.*)_.$/", "\\1" ,$name);
- if(isset($this->reservedLicenses[$id])) {
- unset($this->reservedLicenses[$id]);
+ if(preg_match("/w/i",$this->getacl('boundToHost'))){
+
+ // Check if we've to remove reservations
+ foreach($_POST as $name => $value){
+ if(preg_match("/^removeReservation_/", $name)){
+ $id = preg_replace("/^removeReservation_(.*)_.$/", "\\1" ,$name);
+ if(isset($this->reservedLicenses[$id])) {
+ unset($this->reservedLicenses[$id]);
+ }
+ break;
}
- break;
- }
- }
+ }
- // Check if we've to add reservations
- if(isset($_POST['availableLicense']) && isset($_POST['addReservation'])){
- $id = get_post('availableLicense');
- if(isset($this->availableLicenses[$id])){
- $this->reservedLicenses[] = $this->availableLicenses[$id];
+ // Check if we've to add reservations
+ if(isset($_POST['availableLicense']) && isset($_POST['addReservation'])){
+ $id = get_post('availableLicense');
+ if(isset($this->availableLicenses[$id]) && !in_array($this->availableLicenses[$id],$this->reservedLicenses)){
+ $this->reservedLicenses[$id] = $this->availableLicenses[$id]['softwareLicenseId'][0];
+ }
}
}
}
$del = array_diff($this->init_reservedLicenses, $this->reservedLicenses);
$add = array_diff($this->reservedLicenses, $this->init_reservedLicenses);
- foreach($del as $pool){
- $this->si->removeLicenseFromHost($pool, $this->cn);
+ foreach($del as $license){
+ $this->si->removeLicenseReservationFromHost($license, $this->cn);
if($this->si->is_error()){
msg_dialog::display(_("Error"),msgPool::siError($this->si->get_error()),ERROR_DIALOG);
}
}
- foreach($add as $pool){
- $this->si->addLicenseToHost($pool, $this->cn);
+ foreach($add as $license){
+ $this->si->reserverLicenseForHost($license, $this->cn);
if($this->si->is_error()){
msg_dialog::display(_("Error"),msgPool::siError($this->si->get_error()),ERROR_DIALOG);
}
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,
+ "plPriority" => 13,
"plSection" => array("administration"),
"plCategory" => array("opsi"),
"plProvidedAcls"=> array(
- "cn" => _("Name"),
- "description" => _("Description"))
+ "hostId" => _("Used by"),
+ "boundToHost" => _("License reservation"))
));
}
}