diff --git a/contrib/fusiondirectory.conf b/contrib/fusiondirectory.conf index eb3801b7bbd1aa4313f8b2d07d778e917604e16d..5571000e000e619f2ff361061b92dca2f1de2bd3 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 c7a647aa010e2ee8f6fc3d7b6cfd3e8742f91c04..a4d0ed96b2a0b0529f32c2a37e307e7f5c7ff140 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 e1b223adc18f385f5e82e9cd3e945e4581138a06..75414240d776d4a32bce0cd247f99631ecb578a5 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") + ) + ); } }