From aacf4b2c2db72c3d9efa5542a8c6f312fe230158 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 22 Sep 2009 12:43:22 +0000 Subject: [PATCH] Updated licenses git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14311 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../opsiLicenses/class_licenceGeneric.inc | 2 +- .../admin/opsiLicenses/class_opsiLicenses.inc | 31 +++++++------------ .../opsi/admin/opsiLicenses/tabs_licenses.inc | 7 +++++ 3 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 gosa-plugins/opsi/admin/opsiLicenses/tabs_licenses.inc diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_licenceGeneric.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_licenceGeneric.inc index 41ced8d76..eacafcd14 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_licenceGeneric.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_licenceGeneric.inc @@ -21,7 +21,7 @@ */ -class opsiLicens extends plugin { +class licenseGeneric extends plugin { // The variables this plugin takes care of. var $cn = ""; diff --git a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc index 564219a7c..69d28d08b 100644 --- a/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc +++ b/gosa-plugins/opsi/admin/opsiLicenses/class_opsiLicenses.inc @@ -159,13 +159,10 @@ class opsiLicenses extends plugin $acl = $this->ui->get_permissions($dn, "opsi/licenseGeneric"); if (preg_match('/d/', $acl)){ - - echo "
Delete ".$dn.""; - -# /* 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; + $this->dialog = new licenseTabs($this->config, $this->config->data['TABS']['OPSILICENSETABS'],$dn, "opsi"); + $this->dialog->set_acl_base($this->config->current['BASE']); + $this->dialog->delete(); + $this->dialog= NULL; } else { /* Normally this shouldn't be reached, send some extra @@ -186,11 +183,9 @@ class opsiLicenses extends plugin ***************/ if($s_action == "new" && !$this->dialog instanceOf tabs){ - - echo "
Delete ".$dn.""; - - # $this->dialog = new licensetabs($this->config, $this->config->data['TABS']['LICENSETABS'], "new"); - # $this->dialog->set_acl_base($this->config->current['BASE']); + $this->dn = "new"; + $this->dialog = new licenseTabs($this->config, $this->config->data['TABS']['OPSILICENSETABS'],$this->dn, "opsi"); + $this->dialog->set_acl_base($this->config->current['BASE']); } /*************** @@ -205,13 +200,11 @@ class opsiLicenses extends plugin $entry = $this->licenses[$s_entry]; $this->dn = $entry['dn']; - echo "
Edit ".$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); + /* Open the dialog */ + $this->dialog = new licenseTabs($this->config, $this->config->data['TABS']['OPSILICENSETABS'], + $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/tabs_licenses.inc b/gosa-plugins/opsi/admin/opsiLicenses/tabs_licenses.inc new file mode 100644 index 000000000..db2ca078d --- /dev/null +++ b/gosa-plugins/opsi/admin/opsiLicenses/tabs_licenses.inc @@ -0,0 +1,7 @@ + -- 2.30.2