Updated listing table summary

[gosa.git] / gosa-plugins / opsi / admin / opsiLicenses / class_licenseGeneric.inc

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc
index 297dea7e602f6562f13d1b52dfb3b71fdb09cdee..775adf0a6c9cdce1ebf0f58df3e2ecf496877269 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenseGeneric.inc
@@ -103,6 +103,7 @@ class licenseGeneric extends plugin
 
   function execute()
   {
+    plugin::execute();
     // Handle initialization failures.
     if(isset($_POST['retry_init'])) $this->init();
     if(!$this->init_successfull){
@@ -143,6 +144,16 @@ class licenseGeneric extends plugin
     $smarty->assign("notUsedHosts", array_diff($this->getHosts(), $this->usedByHost));
     $smarty->assign("boundToHost", $this->boundToHost[0]);
     $smarty->assign("licenseKey", $this->licenseKey[0]);
+
+    // w3c fix, do not show empty options.
+    $tmp = $this->usedByHost;
+    if(isset($tmp[0]) && empty($tmp[0])) unset($tmp[0]);
+    $smarty->assign('usedByHost', $tmp);
+
+    foreach(array("notificationDate","expirationDate","conclusionDate") as $date) {
+      $smarty->assign($date."Writeable", $this->acl_is_writeable($date));
+    }
+
     return($smarty->fetch(get_template_path('licenseGeneric.tpl',TRUE,dirname(__FILE__))));
   }
 
@@ -212,15 +223,15 @@ class licenseGeneric extends plugin
     // Very simple date input checks
     if(!empty($this->expirationDate) && 
        !preg_match("/^[0-9]{2}\.[0-9]{2}\.[0-9]{4}$/",$this->expirationDate)){
-      $message[] = msgPool::invalid(_("Expiration date"),$this->expirationDate,"","2009-02-23");
+      $message[] = msgPool::invalid(_("Expiration date"),$this->expirationDate,"","23.02.2009");
     }
     if(!empty($this->conclusionDate) && 
        !preg_match("/^[0-9]{2}\.[0-9]{2}\.[0-9]{4}$/",$this->conclusionDate)){
-      $message[] = msgPool::invalid(_("Expiration date"),$this->conclusionDate,"","2009-02-23");
+      $message[] = msgPool::invalid(_("Expiration date"),$this->conclusionDate,"","23.02.2009");
     }
     if(!empty($this->notificationDate) && 
        !preg_match("/^[0-9]{2}\.[0-9]{2}\.[0-9]{4}$/",$this->notificationDate)){
-      $message[] = msgPool::invalid(_("Expiration date"),$this->notificationDate,"","2009-02-23");
+      $message[] = msgPool::invalid(_("Expiration date"),$this->notificationDate,"","23.02.2009");
     }
 
     if(empty($this->cn)){
@@ -266,12 +277,22 @@ class licenseGeneric extends plugin
           "plDescription" => _("License generic"),
           "plSelfModify"  => FALSE,
           "plDepends"     => array(),
-          "plPriority"    => 1,
+          "plPriority"    => 8,
           "plSection"     => array("administration"),
           "plCategory"    => array("opsi"),
           "plProvidedAcls"=> array(
-            "cn"                => _("Name"),
-            "description" => _("Description"))
+            "cn"                  => _("Name"),
+            "partner"             => _("Partner"),
+            "licenseKey"          => _("License key"),
+            "licenseModel"        => _("License model"),
+            "licensePoolId"       => _("License pool id"),
+            "maximumInstallations"=> _("Maximum installations"),
+            "boundToHost"         => _("Reserved for host"),
+            "usedByHost"          => _("Usage"),
+            "notificationDate"    => _("Notification date"),
+            "conclusionDate"      => _("Conclusion date"),
+            "expirationDate"      => _("Expiration date"),
+            "description"         => _("Description"))
           ));
   }
 }