From: Gunnar Wrobel Date: Tue, 28 Apr 2009 20:57:02 +0000 (+0200) Subject: Comment the base definition and rely on the *local.php file. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a892f1c2bbf105af9043b6cc1896d82b9fec0d0c;p=horde.git Comment the base definition and rely on the *local.php file. --- diff --git a/koward/config/objects.php b/koward/config/objects.php index 163e9399b..6c158035c 100644 --- a/koward/config/objects.php +++ b/koward/config/objects.php @@ -1,209 +1,209 @@ 'Horde_Kolab_Server_Object', - 'label' => _("Object"), - 'list_label' => _("Objects"), - 'list_attributes' => array( - 'id' => array( - 'title' => _("Object id"), - 'width' => 80, - 'link_view'=> true, - ), - ), - 'attributes' => array( - 'override' => true, - 'fields' => array( - 'id' => array( - 'label' => _("Object ID"), - 'type' => 'text', - 'params' => array('regex' => '', 'size' => 40, 'maxlength' => 255) - ), - ), - ), -); +/* $objects['object'] = array( */ +/* 'class' => 'Horde_Kolab_Server_Object', */ +/* 'label' => _("Object"), */ +/* 'list_label' => _("Objects"), */ +/* 'list_attributes' => array( */ +/* 'id' => array( */ +/* 'title' => _("Object id"), */ +/* 'width' => 80, */ +/* 'link_view'=> true, */ +/* ), */ +/* ), */ +/* 'attributes' => array( */ +/* 'override' => true, */ +/* 'fields' => array( */ +/* 'id' => array( */ +/* 'label' => _("Object ID"), */ +/* 'type' => 'text', */ +/* 'params' => array('regex' => '', 'size' => 40, 'maxlength' => 255) */ +/* ), */ +/* ), */ +/* ), */ +/* ); */ -$objects['person'] = array( - 'class' => 'Horde_Kolab_Server_Object_Person', - 'label' => _("Person"), - 'list_label' => _("Persons"), - 'list_attributes' => array( - 'cn' => array( - 'title' => _("Common name"), - 'width' => 40, - 'link_view'=> true, - ), - 'sn' => array( - 'title' => _("Last name"), - 'width' => 40, - ), - ), - 'attributes' => array( - 'fields' => array( - 'cn' => array( - 'required' => false, - ), - 'userPassword' => array( - 'required' => true, - ), - ), - ), -); +/* $objects['person'] = array( */ +/* 'class' => 'Horde_Kolab_Server_Object_Person', */ +/* 'label' => _("Person"), */ +/* 'list_label' => _("Persons"), */ +/* 'list_attributes' => array( */ +/* 'cn' => array( */ +/* 'title' => _("Common name"), */ +/* 'width' => 40, */ +/* 'link_view'=> true, */ +/* ), */ +/* 'sn' => array( */ +/* 'title' => _("Last name"), */ +/* 'width' => 40, */ +/* ), */ +/* ), */ +/* 'attributes' => array( */ +/* 'fields' => array( */ +/* 'cn' => array( */ +/* 'required' => false, */ +/* ), */ +/* 'userPassword' => array( */ +/* 'required' => true, */ +/* ), */ +/* ), */ +/* ), */ +/* ); */ -$objects['organizationalperson'] = array( - 'class' => 'Horde_Kolab_Server_Object_Organizationalperson', - 'label' => _("Organizational person"), - 'list_label' => _("Organizational persons"), - 'list_attributes' => array( - 'cn' => array( - 'title' => _("Common name"), - 'width' => 40, - 'link_view'=> true, - ), - 'sn' => array( - 'title' => _("Last name"), - 'width' => 40, - ), - ), - 'attributes' => array( - 'fields' => array( - 'cn' => array( - 'required' => false, - ), - 'userPassword' => array( - 'required' => true, - ), - ), - ), -); +/* $objects['organizationalperson'] = array( */ +/* 'class' => 'Horde_Kolab_Server_Object_Organizationalperson', */ +/* 'label' => _("Organizational person"), */ +/* 'list_label' => _("Organizational persons"), */ +/* 'list_attributes' => array( */ +/* 'cn' => array( */ +/* 'title' => _("Common name"), */ +/* 'width' => 40, */ +/* 'link_view'=> true, */ +/* ), */ +/* 'sn' => array( */ +/* 'title' => _("Last name"), */ +/* 'width' => 40, */ +/* ), */ +/* ), */ +/* 'attributes' => array( */ +/* 'fields' => array( */ +/* 'cn' => array( */ +/* 'required' => false, */ +/* ), */ +/* 'userPassword' => array( */ +/* 'required' => true, */ +/* ), */ +/* ), */ +/* ), */ +/* ); */ -$objects['inetperson'] = array( - 'class' => 'Horde_Kolab_Server_Object_Inetorgperson', - 'label' => _("Inet person"), - 'list_label' => _("Inet persons"), - 'list_attributes' => array( - 'cn' => array( - 'title' => _("Common name"), - 'width' => 40, - 'link_view'=> true, - ), - 'sn' => array( - 'title' => _("Last name"), - 'width' => 40, - ), - ), - 'attributes' => array( - 'fields' => array( - 'cn' => array( - 'required' => false, - ), - 'userPassword' => array( - 'required' => true, - ), - ), - ), -); +/* $objects['inetperson'] = array( */ +/* 'class' => 'Horde_Kolab_Server_Object_Inetorgperson', */ +/* 'label' => _("Inet person"), */ +/* 'list_label' => _("Inet persons"), */ +/* 'list_attributes' => array( */ +/* 'cn' => array( */ +/* 'title' => _("Common name"), */ +/* 'width' => 40, */ +/* 'link_view'=> true, */ +/* ), */ +/* 'sn' => array( */ +/* 'title' => _("Last name"), */ +/* 'width' => 40, */ +/* ), */ +/* ), */ +/* 'attributes' => array( */ +/* 'fields' => array( */ +/* 'cn' => array( */ +/* 'required' => false, */ +/* ), */ +/* 'userPassword' => array( */ +/* 'required' => true, */ +/* ), */ +/* ), */ +/* ), */ +/* ); */ -$objects['user'] = array( - 'class' => 'Horde_Kolab_Server_Object_Kolab_User', - 'label' => _("User"), - 'list_label' => _("Users"), - 'list_attributes' => array( - 'sn' => array( - 'title' => _("Last name"), - 'width' => 20, - ), - 'givenName' => array( - 'title' => _("First name"), - 'width' => 20, - ), - 'mail' => array( - 'title' => _("E-mail"), - 'width' => 20, - 'link_view'=> true, - ), - 'uid' => array( - 'title' => _("User ID"), - 'width' => 20, - ), - ), -); +/* $objects['user'] = array( */ +/* 'class' => 'Horde_Kolab_Server_Object_Kolab_User', */ +/* 'label' => _("User"), */ +/* 'list_label' => _("Users"), */ +/* 'list_attributes' => array( */ +/* 'sn' => array( */ +/* 'title' => _("Last name"), */ +/* 'width' => 20, */ +/* ), */ +/* 'givenName' => array( */ +/* 'title' => _("First name"), */ +/* 'width' => 20, */ +/* ), */ +/* 'mail' => array( */ +/* 'title' => _("E-mail"), */ +/* 'width' => 20, */ +/* 'link_view'=> true, */ +/* ), */ +/* 'uid' => array( */ +/* 'title' => _("User ID"), */ +/* 'width' => 20, */ +/* ), */ +/* ), */ +/* ); */ -$objects['admin'] = array( - 'class' => 'Horde_Kolab_Server_Object_Kolab_Administrator', - 'label' => _("Administrator"), - 'list_label' => _("Administrators"), - 'attributes' => array( - ), -); +/* $objects['admin'] = array( */ +/* 'class' => 'Horde_Kolab_Server_Object_Kolab_Administrator', */ +/* 'label' => _("Administrator"), */ +/* 'list_label' => _("Administrators"), */ +/* 'attributes' => array( */ +/* ), */ +/* ); */ -$objects['kolabuser'] = array( - 'class' => 'Horde_Kolab_Server_Object_Kolab_User', - 'preferred' => true, - 'label' => _("Kolab user"), - 'list_label' => _("Kolab users"), - 'list_attributes' => array( - 'sn' => array( - 'title' => _("Last name"), - 'width' => 20, - ), - 'givenName' => array( - 'title' => _("First name"), - 'width' => 20, - ), - 'mail' => array( - 'title' => _("E-mail"), - 'width' => 20, - 'link_view'=> true, - ), - 'uid' => array( - 'title' => _("User ID"), - 'width' => 20, - ), - ), - 'attributes' => array( - 'hide' => array( - 'objectClass', - 'seeAlso', - 'x121Address', - 'registeredAddress', - 'destinationIndicator', - 'preferredDeliveryMethod', - 'telexNumber', - 'teletexTerminalIdentifier', - 'internationaliSDNNumber', - 'kolabEncryptedPassword', - 'kolabHomeMTA', - 'kolabDelegate', - ), - 'labels' => array( - 'mail' => _("Account ID"), - ), - 'fields' => array( - 'kolabSalutation' => array( - 'type' => 'enum', - 'params' => array('values' => array(_("Mr.") => _("Mr."), - _("Mrs.") => _("Mrs.")), - 'prompt' => true), - ), - 'gender' => array( - 'type' => 'enum', - 'params' => array('values' => array(_("1") => _("male"), - _("2") => _("female")), - 'prompt' => true), - ), - 'kolabMaritalStatus' => array( - 'type' => 'enum', - 'params' => array('values' => array(_("0") => _("single"), - _("1") => _("married")), - 'prompt' => true), - ), - 'userPassword' => array( - 'type' => 'passwordconfirm', - ), - ), - ), -); +/* $objects['kolabuser'] = array( */ +/* 'class' => 'Horde_Kolab_Server_Object_Kolab_User', */ +/* 'preferred' => true, */ +/* 'label' => _("Kolab user"), */ +/* 'list_label' => _("Kolab users"), */ +/* 'list_attributes' => array( */ +/* 'sn' => array( */ +/* 'title' => _("Last name"), */ +/* 'width' => 20, */ +/* ), */ +/* 'givenName' => array( */ +/* 'title' => _("First name"), */ +/* 'width' => 20, */ +/* ), */ +/* 'mail' => array( */ +/* 'title' => _("E-mail"), */ +/* 'width' => 20, */ +/* 'link_view'=> true, */ +/* ), */ +/* 'uid' => array( */ +/* 'title' => _("User ID"), */ +/* 'width' => 20, */ +/* ), */ +/* ), */ +/* 'attributes' => array( */ +/* 'hide' => array( */ +/* 'objectClass', */ +/* 'seeAlso', */ +/* 'x121Address', */ +/* 'registeredAddress', */ +/* 'destinationIndicator', */ +/* 'preferredDeliveryMethod', */ +/* 'telexNumber', */ +/* 'teletexTerminalIdentifier', */ +/* 'internationaliSDNNumber', */ +/* 'kolabEncryptedPassword', */ +/* 'kolabHomeMTA', */ +/* 'kolabDelegate', */ +/* ), */ +/* 'labels' => array( */ +/* 'mail' => _("Account ID"), */ +/* ), */ +/* 'fields' => array( */ +/* 'kolabSalutation' => array( */ +/* 'type' => 'enum', */ +/* 'params' => array('values' => array(_("Mr.") => _("Mr."), */ +/* _("Mrs.") => _("Mrs.")), */ +/* 'prompt' => true), */ +/* ), */ +/* 'gender' => array( */ +/* 'type' => 'enum', */ +/* 'params' => array('values' => array(_("1") => _("male"), */ +/* _("2") => _("female")), */ +/* 'prompt' => true), */ +/* ), */ +/* 'kolabMaritalStatus' => array( */ +/* 'type' => 'enum', */ +/* 'params' => array('values' => array(_("0") => _("single"), */ +/* _("1") => _("married")), */ +/* 'prompt' => true), */ +/* ), */ +/* 'userPassword' => array( */ +/* 'type' => 'passwordconfirm', */ +/* ), */ +/* ), */ +/* ), */ +/* ); */ if (file_exists(dirname(__FILE__) . '/objects.local.php')) { require_once(dirname(__FILE__) . '/objects.local.php'); diff --git a/koward/config/visible.php b/koward/config/visible.php index 9e52f538a..d8699092f 100644 --- a/koward/config/visible.php +++ b/koward/config/visible.php @@ -2,7 +2,6 @@ $visible['hide'] = array( 'objectClass', 'id', - 'cn', 'lnfn', 'fnln', 'seeAlso',