From 4ab476c7bba9d3c6c5ba1f111ce76dab4167adf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Bernigaud?= <come.bernigaud@laposte.net>
Date: Tue, 18 Jun 2013 14:53:26 +0200
Subject: [PATCH] Fixes: #2505 fixed tabs constructor calls
---
plugins/admin/acl/tabs_acl_role.inc | 4 +-
plugins/admin/departments/tabs_department.inc | 4 +-
plugins/admin/groups/tabs_group.inc | 4 +-
plugins/admin/ogroups/tabs_ogroups.inc | 68 +++++++++----------
plugins/admin/users/tabs_user.inc | 4 +-
5 files changed, 41 insertions(+), 43 deletions(-)
diff --git a/plugins/admin/acl/tabs_acl_role.inc b/plugins/admin/acl/tabs_acl_role.inc
index 60e39861e..df34127fb 100644
--- a/plugins/admin/acl/tabs_acl_role.inc
+++ b/plugins/admin/acl/tabs_acl_role.inc
@@ -23,10 +23,10 @@
class aclroletab extends tabs
{
- function aclroletab($config, $data, $dn, $cat = "", $copied_object = NULL)
+ function __construct($config, $data, $dn, $cat = "", $copied_object = NULL)
{
$data = array(array("CLASS" => "aclrole" , "NAME" => _("ACL Templates")));
- tabs::tabs($config, $data, $dn, "acl", $copied_object);
+ parent::__construct($config, $data, $dn, "acl", $copied_object);
}
function save($ignore_account = FALSE)
diff --git a/plugins/admin/departments/tabs_department.inc b/plugins/admin/departments/tabs_department.inc
index 5043ec5d6..5053bb7d2 100644
--- a/plugins/admin/departments/tabs_department.inc
+++ b/plugins/admin/departments/tabs_department.inc
@@ -26,9 +26,9 @@ class deptabs extends tabs
var $moved = FALSE;
var $base_name = "department";
- function deptabs($config, $data, $dn, $category, $copied_object = NULL)
+ function __construct($config, $data, $dn, $category, $copied_object = NULL)
{
- parent::tabs($config, $data, $dn, $category, $copied_object);
+ parent::__construct($config, $data, $dn, $category, $copied_object);
/* Detect the base class (The classs which extends from department)
*/
diff --git a/plugins/admin/groups/tabs_group.inc b/plugins/admin/groups/tabs_group.inc
index 219965f03..f4a226edb 100644
--- a/plugins/admin/groups/tabs_group.inc
+++ b/plugins/admin/groups/tabs_group.inc
@@ -23,9 +23,9 @@
class grouptabs extends tabs
{
- function grouptabs($config, $data, $dn, $cat = "", $copied_object = NULL)
+ function __construct($config, $data, $dn, $cat = "", $copied_object = NULL)
{
- tabs::tabs($config, $data, $dn, "group", $copied_object);
+ parent::__construct($config, $data, $dn, "group", $copied_object);
$this->addSpecialTabs();
}
diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 9bc2a226d..5980d9efe 100644
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -26,6 +26,39 @@ class ogrouptabs extends tabs
var $acl_category;
var $dynamic_tabs;
+ function __construct($config, $data, $dn, $category = "ogroup", $copied_object = NULL)
+ {
+ parent::__construct($config, $data, $dn, $category, $copied_object);
+ $this->base = $this->by_object['ogroup']->base;
+ $this->acl_category = $category;
+
+ /* Add references/acls/snapshots */
+ $this->dynamic_tabs = array(
+ "/T/" => array(
+ 'termservice' => _('Devices'),
+ 'termstartup' => _('Startup'),
+ ),
+ "/[WT]/" => array(
+ 'termgroup' => _('Systems'),
+ ),
+ "/W/" => array(
+ 'workservice' => _('Devices'),
+ ),
+ "/[SW]/" => array(
+ 'workstartup' => _('Workstartup'),
+ 'debconfStartup' => _('Debconf'),
+ 'faiStartup' => _('FAI'),
+ 'faiSummary' => _('FAI summary'),
+ 'argonautClient' => _('Argonaut client'),
+ ),
+ "/O/" => array(
+ 'opsiClient' => _('OPSI'),
+ ),
+ );
+ $this->reload($this->by_object['ogroup']->gosaGroupObjects);
+ $this->addSpecialTabs();
+ }
+
function reload($dd)
{
$objects = preg_replace('/[\[\]]/', '', $dd);
@@ -213,41 +246,6 @@ class ogrouptabs extends tabs
return $str;
}
- function ogrouptabs($config, $data, $dn, $category = "ogroup", $copied_object = NULL)
- {
-
- tabs::tabs($config, $data, $dn, $category, $copied_object);
- $this->base = $this->by_object['ogroup']->base;
- $this->acl_category = $category;
-
- /* Add references/acls/snapshots */
- $this->dynamic_tabs = array(
- "/T/" => array(
- 'termservice' => _('Devices'),
- 'termstartup' => _('Startup'),
- ),
- "/[WT]/" => array(
- 'termgroup' => _('Systems'),
- ),
- "/W/" => array(
- 'workservice' => _('Devices'),
- ),
- "/[SW]/" => array(
- 'workstartup' => _('Workstartup'),
- 'debconfStartup' => _('Debconf'),
- 'faiStartup' => _('FAI'),
- 'faiSummary' => _('FAI summary'),
- 'argonautClient' => _('Argonaut client'),
- ),
- "/O/" => array(
- 'opsiClient' => _('OPSI'),
- ),
- );
- $this->reload($this->by_object['ogroup']->gosaGroupObjects);
- $this->addSpecialTabs();
- }
-
-
function check($ignore_account = FALSE)
{
return parent::check(FALSE);
diff --git a/plugins/admin/users/tabs_user.inc b/plugins/admin/users/tabs_user.inc
index 94bfb6f7c..1dc818bc8 100644
--- a/plugins/admin/users/tabs_user.inc
+++ b/plugins/admin/users/tabs_user.inc
@@ -21,9 +21,9 @@
class usertabs extends tabs
{
- function usertabs($config, $data, $dn, $cat = '', $copied_object = NULL)
+ function __construct($config, $data, $dn, $cat = '', $copied_object = NULL)
{
- parent::tabs($config, $data, $dn, 'user', $copied_object);
+ parent::__construct($config, $data, $dn, 'user', $copied_object);
/* Add references/acls/snapshots */
$this->addSpecialTabs();
--
GitLab