Updated licenses

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

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc
index 631b132e10e1c7d564b439e6cdcf7359e97ac6de..564219a7cedfd70f426ae981358a90f792356668 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc
+++ b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc
@@ -128,6 +128,12 @@ class opsiLicenses extends plugin
         }
 
         if(count($this->dns)){
+
+          $dns_names = array();
+          foreach($this->dns as $dn){
+            $dns_names[] = LDAP::fix($dn);
+          }
+
           $smarty->assign("info", msgPool::deleteInfo($dns_names,_("License")));
           $smarty->assign("multiple", true);
           return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
@@ -154,10 +160,12 @@ class opsiLicenses extends plugin
         $acl = $this->ui->get_permissions($dn, "opsi/licenseGeneric");
         if (preg_match('/d/', $acl)){
 
-          /* Delete request is permitted, perform LDAP action */
-          $this->dialog= new licensetabs($this->config,$this->config->data['TABS']['LICENSETABS'], $dn);
-          $this->dialog->delete();
-          $this->dialog= NULL;
+          echo "<br><b>Delete ".$dn."</b>";
+
+#         /* Delete request is permitted, perform LDAP action */
+#         $this->dialog= new licensetabs($this->config,$this->config->data['TABS']['LICENSETABS'], $dn);
+#         $this->dialog->delete();
+#         $this->dialog= NULL;
         } else {
 
           /* Normally this shouldn't be reached, send some extra
@@ -178,8 +186,11 @@ class opsiLicenses extends plugin
      ***************/
 
     if($s_action == "new" && !$this->dialog instanceOf tabs){
-      $this->dialog = new licensetabs($this->config, $this->config->data['TABS']['LICENSETABS'], "new");
-      $this->dialog->set_acl_base($this->config->current['BASE']);
+
+      echo "<br><b>Delete ".$dn."</b>";
+
+ #    $this->dialog = new licensetabs($this->config, $this->config->data['TABS']['LICENSETABS'], "new");
+ #    $this->dialog->set_acl_base($this->config->current['BASE']);
     }
     
     /***************
@@ -194,11 +205,13 @@ class opsiLicenses extends plugin
         $entry = $this->licenses[$s_entry];
         $this->dn = $entry['dn'];
 
-        /* Open the dialog */
-        $this->dialog = new licensetabs($this->config, $this->config->data['TABS']['LICENSETABS'], 
-            $entry['dn'], "opsi");
-        $this->dialog->set_acl_base($this->config->current['BASE']);
-        set_object_info($this->dn);
+        echo "<br><b>Edit ".$dn."</b>";
+
+#       /* Open the dialog */
+#       $this->dialog = new licensetabs($this->config, $this->config->data['TABS']['LICENSETABS'], 
+#           $entry['dn'], "opsi");
+#       $this->dialog->set_acl_base($this->config->current['BASE']);
+#       set_object_info($this->dn);
       }
     }
 

diff --git a/gosa-plugins/opsi/admin/opsiLicenses/remove.tpl b/gosa-plugins/opsi/admin/opsiLicenses/remove.tpl
index 76cf2886048496cded2d85e038a4f30b5b3f5e24..8ac3a6b271d5e7cb591a0c7b5095560d723aaeb1 100644 (file)
--- a/gosa-plugins/opsi/admin/opsiLicenses/remove.tpl
+++ b/gosa-plugins/opsi/admin/opsiLicenses/remove.tpl
@@ -11,8 +11,8 @@
 </p>
 
 <p class="plugbottom">
-       <input type=submit name="delete_multiple_roles_confirm" value="{msgPool type=delButton}">
+       <input type=submit name="delete_multiple_licenses_confirm" value="{msgPool type=delButton}">
                &nbsp;
-       <input type=submit name="delete_multiple_roles_cancel" value="{msgPool type=cancelButton}">
+       <input type=submit name="delete_multiple_licenses_cancel" value="{msgPool type=cancelButton}">
 </p>