From 1c1fc75ef1a9b5038b3583e7f5734feb8a38f0d5 Mon Sep 17 00:00:00 2001
From: Benoit Mortier <benoit.mortier@opensides.be>
Date: Wed, 7 Nov 2012 10:09:10 +0100
Subject: [PATCH] Fixes: #1223 New tab system
---
contrib/fusiondirectory.conf | 25 ---------
plugins/personal/generic/class_user.inc | 2 +
plugins/personal/posix/class_posixAccount.inc | 51 ++++++++++---------
3 files changed, 28 insertions(+), 50 deletions(-)
diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf
index eb3801b7b..5571000e0 100644
--- a/contrib/fusiondirectory.conf
+++ b/contrib/fusiondirectory.conf
@@ -113,25 +113,6 @@
<tab class="aclRole" name="ACL Role" />
</aclroletab>
- <!-- User dialog -->
- <usertabs>
- <tab class="user" name="Generic" />
- <tab class="posixAccount" name="Unix" />
- <tab class="environment" name="Environment" />
- <tab class="mailAccount" name="Mail" />
- <tab class="sambaAccount" name="Samba" />
- <tab class="quotaAccount" name="Quota" />
- <tab class="supannAccount" name="Supann" />
- <tab class="netatalkAccount" name="Netatalk" />
- <tab class="netgroupAccount" name="NIS Netgroup" />
- <tab class="connectivity" name="Connectivity" />
- <tab class="gofaxAccount" name="Fax" />
- <tab class="phoneAccount" name="Phone" />
- <tab class="scalixAccount" name="Scalix" />
- <tab class="nagiosAccount" name="Nagios" />
- <tab class="novaAccount" name="Nova" />
- </usertabs>
-
<!-- Group dialog -->
<grouptabs>
<tab class="group" name="Generic" />
@@ -192,16 +173,10 @@
<servertabs>
<tab class="ServerService" name="Services" />
- <tab class="netgroupSystem" name="NIS Netgroup" />
</servertabs>
- <workstationtabs>
- <tab class="netgroupSystem" name="NIS Netgroup" />
- </workstationtabs>
-
<componenttabs>
<tab class="componentGeneric" name="Generic" />
- <tab class="netgroupSystem" name="NIS Netgroup" />
</componenttabs>
<netgrouptabs>
diff --git a/plugins/personal/generic/class_user.inc b/plugins/personal/generic/class_user.inc
index c7a647aa0..a4d0ed96b 100644
--- a/plugins/personal/generic/class_user.inc
+++ b/plugins/personal/generic/class_user.inc
@@ -1638,6 +1638,8 @@ class user extends plugin
"plSection" => array("personal" => _("My account")),
"plCategory" => array("users" => array("description" => _("Users"),
"objectClass" => "gosaAccount")),
+ "plObjectType" => array("user" => array("description" => _("User"),
+ "filter" => "objectClass=gosaAccount")),
"plProvidedAcls" => array(
diff --git a/plugins/personal/posix/class_posixAccount.inc b/plugins/personal/posix/class_posixAccount.inc
index e1b223adc..75414240d 100644
--- a/plugins/personal/posix/class_posixAccount.inc
+++ b/plugins/personal/posix/class_posixAccount.inc
@@ -1675,31 +1675,32 @@ class posixAccount extends plugin
static function plInfo()
{
- return (array(
- "plDescription" => _("POSIX account"),
- "plSelfModify" => TRUE,
- "plDepends" => array("user"),
- "plPriority" => 2,
- "plSection" => array("personal" => _("My account")),
- "plCategory" => array("users"),
- "plOptions" => array(),
-
- "plProvidedAcls" => array(
-
- "homeDirectory" => _("Home directory"),
- "loginShell" => _("Shell"),
- "uidNumber" => _("User ID"),
- "gidNumber" => _("Group ID"),
-
- "mustchangepassword"=> _("Force password change on login"),
- "shadowMin" => _("Shadow min"),
- "shadowMax" => _("Shadow max"),
- "shadowWarning" => _("Shadow warning"),
- "shadowInactive" => _("Shadow inactive"),
- "shadowExpire" => _("Shadow expire"),
- "sshPublickey" => _("Public SSH key"),
- "trustModel" => _("System trust model")))
- );
+ return array(
+ "plShortName" => _("Unix"),
+ "plDescription" => _("POSIX account"),
+ "plSelfModify" => TRUE,
+ "plDepends" => array("user"),
+ "plPriority" => 2,
+ "plSection" => array("personal" => _("My account")),
+ "plCategory" => array("users"),
+ "plObjectType" => array("user"),
+
+ "plProvidedAcls" => array(
+ "homeDirectory" => _("Home directory"),
+ "loginShell" => _("Shell"),
+ "uidNumber" => _("User ID"),
+ "gidNumber" => _("Group ID"),
+
+ "mustchangepassword"=> _("Force password change on login"),
+ "shadowMin" => _("Shadow min"),
+ "shadowMax" => _("Shadow max"),
+ "shadowWarning" => _("Shadow warning"),
+ "shadowInactive" => _("Shadow inactive"),
+ "shadowExpire" => _("Shadow expire"),
+ "sshPublickey" => _("Public SSH key"),
+ "trustModel" => _("System trust model")
+ )
+ );
}
}
--
GitLab