diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeecompany.php b/trunk/conf/LSobjects/config.LSobjects.LSeecompany.php index d14fba73..b7abe92c 100644 --- a/trunk/conf/LSobjects/config.LSobjects.LSeecompany.php +++ b/trunk/conf/LSobjects/config.LSobjects.LSeecompany.php @@ -28,7 +28,7 @@ $GLOBALS['LSobjects']['LSeecompany'] = array ( 'rdn' => 'ou', 'orderby' => 'displayValue', // Valeurs possibles : 'displayValue' ou 'subDn' 'container_dn' => 'ou=companies', - 'select_display_attrs' => '%{ou}', + 'display_name_format' => '%{ou}', 'label' => _('Sociétés'), 'attrs' => array ( diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeegroup.php b/trunk/conf/LSobjects/config.LSobjects.LSeegroup.php index adc57bfc..eefc0c72 100644 --- a/trunk/conf/LSobjects/config.LSobjects.LSeegroup.php +++ b/trunk/conf/LSobjects/config.LSobjects.LSeegroup.php @@ -37,7 +37,7 @@ $GLOBALS['LSobjects']['LSeegroup'] = array ( 'ou' => 'groups' ) ), - 'select_display_attrs' => '%{cn}', + 'display_name_format' => '%{cn}', 'label' => _('Groupes'), 'attrs' => array ( diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php index d4ae7c3b..6e4ed4f9 100644 --- a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php +++ b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php @@ -45,7 +45,7 @@ $GLOBALS['LSobjects']['LSeepeople'] = array ( 'after_modify' => 'valid', //'after_create' => 'createMaildirByFTP', //'after_delete' => 'removeMaildirByFTP', - 'select_display_attrs' => '%{cn}', + 'display_name_format' => '%{cn}', 'label' => _('Utilisateurs'), // LSrelation diff --git a/trunk/includes/class/class.LSattr_html_select_object.php b/trunk/includes/class/class.LSattr_html_select_object.php index e54b0d48..24c7ca65 100644 --- a/trunk/includes/class/class.LSattr_html_select_object.php +++ b/trunk/includes/class/class.LSattr_html_select_object.php @@ -143,7 +143,7 @@ class LSattr_html_select_object extends LSattr_html{ $obj = new $conf['object_type'](); foreach($DNs as $dn) { if($obj -> loadData($dn)) { - $retInfos[$dn] = $obj -> getDisplayValue($conf['display_attribute']); + $retInfos[$dn] = $obj -> getDisplayName($conf['display_attribute']); } } } diff --git a/trunk/includes/class/class.LSldapObject.php b/trunk/includes/class/class.LSldapObject.php index 32d431e3..251e0135 100644 --- a/trunk/includes/class/class.LSldapObject.php +++ b/trunk/includes/class/class.LSldapObject.php @@ -124,8 +124,8 @@ class LSldapObject { * * @retval string Format d'affichage de l'objet. */ - function getDisplayAttributes() { - return $this -> config['select_display_attrs']; + function getDisplayNameFormat() { + return $this -> config['display_name_format']; } /** @@ -142,9 +142,9 @@ class LSldapObject { * * @retval string Valeur descriptive d'affichage de l'objet */ - function getDisplayValue($spe='',$full=false) { + function getDisplayName($spe='',$full=false) { if ($spe=='') { - $spe = $this -> getDisplayAttributes(); + $spe = $this -> getDisplayNameFormat(); } $val = $this -> getFData($spe,&$this -> attrs,'getDisplayValue'); if ($GLOBALS['LSsession'] -> haveSubDn() && $full) { @@ -873,7 +873,7 @@ class LSldapObject { $retInfos=array(); if (!$displayFormat) { - $displayFormat = $this -> getDisplayAttributes(); + $displayFormat = $this -> getDisplayNameFormat(); } // Attributes $attrs = getFieldInFormat($displayFormat); diff --git a/trunk/index_ajax.php b/trunk/index_ajax.php index e3dd7c99..31954844 100644 --- a/trunk/index_ajax.php +++ b/trunk/index_ajax.php @@ -196,7 +196,7 @@ if (!isset($_ERRORS)) { $list = $objRel -> $relationConf['list_function']($object); if (is_array($list)&&(!empty($list))) { foreach($list as $o) { - $data['html'].= "