diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeecompany.php b/trunk/conf/LSobjects/config.LSobjects.LSeecompany.php
index b7abe92c..8a8d3627 100644
--- a/trunk/conf/LSobjects/config.LSobjects.LSeecompany.php
+++ b/trunk/conf/LSobjects/config.LSobjects.LSeecompany.php
@@ -26,7 +26,7 @@ $GLOBALS['LSobjects']['LSeecompany'] = array (
'lscompany'
),
'rdn' => 'ou',
- 'orderby' => 'displayValue', // Valeurs possibles : 'displayValue' ou 'subDn'
+ 'orderby' => 'displayName', // Valeurs possibles : 'displayName' ou 'subDn'
'container_dn' => 'ou=companies',
'display_name_format' => '%{ou}',
'label' => _('Sociétés'),
diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeegroup.php b/trunk/conf/LSobjects/config.LSobjects.LSeegroup.php
index eefc0c72..9fab5d90 100644
--- a/trunk/conf/LSobjects/config.LSobjects.LSeegroup.php
+++ b/trunk/conf/LSobjects/config.LSobjects.LSeegroup.php
@@ -26,7 +26,7 @@ $GLOBALS['LSobjects']['LSeegroup'] = array (
'posixGroup'
),
'rdn' => 'cn',
- 'orderby' => 'displayValue', // Valeurs possibles : 'displayValue' ou 'subDn'
+ 'orderby' => 'displayName', // Valeurs possibles : 'displayName' ou 'subDn'
'container_dn' => 'ou=groups',
'container_auto_create' => array(
'objectclass' => array(
diff --git a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php
index 6e4ed4f9..6c752efb 100644
--- a/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php
+++ b/trunk/conf/LSobjects/config.LSobjects.LSeepeople.php
@@ -27,7 +27,7 @@ $GLOBALS['LSobjects']['LSeepeople'] = array (
'posixAccount',
'sambaSamAccount',
),
- 'orderby' => 'displayValue', // Valeurs possibles : 'displayValue' ou 'subDn'
+ 'orderby' => 'displayName', // Valeurs possibles : 'displayName' ou 'subDn'
'rdn' => 'uid',
'container_dn' => 'ou=people',
diff --git a/trunk/css/black/LSselect.css b/trunk/css/black/LSselect.css
index 611fbc7f..74cec621 100644
--- a/trunk/css/black/LSselect.css
+++ b/trunk/css/black/LSselect.css
@@ -8,7 +8,7 @@
width: 570px;
}
-.sortBy_displayValue, .sortBy_subDn {
+.sortBy_displayName, .sortBy_subDn {
cursor: pointer;
}
diff --git a/trunk/css/default/LSselect.css b/trunk/css/default/LSselect.css
index 611fbc7f..74cec621 100644
--- a/trunk/css/default/LSselect.css
+++ b/trunk/css/default/LSselect.css
@@ -8,7 +8,7 @@
width: 570px;
}
-.sortBy_displayValue, .sortBy_subDn {
+.sortBy_displayName, .sortBy_subDn {
cursor: pointer;
}
diff --git a/trunk/includes/class/class.LSattr_html_select_object.php b/trunk/includes/class/class.LSattr_html_select_object.php
index 24c7ca65..b96fe104 100644
--- a/trunk/includes/class/class.LSattr_html_select_object.php
+++ b/trunk/includes/class/class.LSattr_html_select_object.php
@@ -56,12 +56,12 @@ class LSattr_html_select_object extends LSattr_html{
/**
* Effectue les tâches nécéssaires au moment du rafraichissement du formulaire
*
- * Récupère un array du type array('DNs' => 'displayValue') à partir d'une
+ * Récupère un array du type array('DNs' => 'displayName') à partir d'une
* liste de DNs.
*
* @param[in] $data mixed La valeur de l'attribut (liste de DNs)
*
- * @retval mixed La valeur formatée de l'attribut (array('DNs' => 'displayValue'))
+ * @retval mixed La valeur formatée de l'attribut (array('DNs' => 'displayName'))
**/
function refreshForm($data,$fromDNs=false) {
return $this -> getFormValues($data,$fromDNs);
diff --git a/trunk/includes/class/class.LSformElement_select_object.php b/trunk/includes/class/class.LSformElement_select_object.php
index c227cc16..30d9647e 100644
--- a/trunk/includes/class/class.LSformElement_select_object.php
+++ b/trunk/includes/class/class.LSformElement_select_object.php
@@ -138,7 +138,7 @@ class LSformElement_select_object extends LSformElement {
*
* @param[in] $pattern Pattern de recherche
*
- * @retval array(dn -> displayValue) Les objets trouvés
+ * @retval array(dn -> displayName) Les objets trouvés
*/
function searchAdd ($pattern) {
if (is_array($this -> params['selectable_object'])) {
diff --git a/trunk/includes/class/class.LSsession.php b/trunk/includes/class/class.LSsession.php
index 0d181181..206de5cf 100644
--- a/trunk/includes/class/class.LSsession.php
+++ b/trunk/includes/class/class.LSsession.php
@@ -266,7 +266,7 @@ class LSsession {
$this -> loadLSaccess();
}
- $GLOBALS['Smarty'] -> assign('LSsession_username',$this -> LSuserObject -> getDisplayValue());
+ $GLOBALS['Smarty'] -> assign('LSsession_username',$this -> LSuserObject -> getDisplayName());
if ($_POST['LSsession_topDn']) {
if ($this -> validSubDnLdapServer($_POST['LSsession_topDn'])) {
@@ -472,7 +472,7 @@ class LSsession {
$this -> rdn = $_POST['LSsession_user'];
$this -> loadLSprofiles();
$this -> loadLSaccess();
- $GLOBALS['Smarty'] -> assign('LSsession_username',$this -> LSuserObject -> getDisplayValue());
+ $GLOBALS['Smarty'] -> assign('LSsession_username',$this -> LSuserObject -> getDisplayName());
$_SESSION['LSsession']=get_object_vars($this);
return true;
}
@@ -605,15 +605,15 @@ class LSsession {
else {
$basedn = NULL;
}
- if ($LSoject_config['displayValue']) {
- $displayValue = $LSoject_config['displayValue'];
+ if ($LSoject_config['displayName']) {
+ $displayName = $LSoject_config['displayName'];
}
else {
- $displayValue = NULL;
+ $displayName = NULL;
}
if( $this -> loadLSobject($LSobject_name) ) {
if ($subdnobject = new $LSobject_name()) {
- $tbl_return = $subdnobject -> getSelectArray(NULL,$basedn,$displayValue);
+ $tbl_return = $subdnobject -> getSelectArray(NULL,$basedn,$displayName);
if (is_array($tbl_return)) {
$return=array_merge($return,$tbl_return);
}
diff --git a/trunk/includes/js/LSselect.js b/trunk/includes/js/LSselect.js
index c9fb6991..bdf83fe7 100644
--- a/trunk/includes/js/LSselect.js
+++ b/trunk/includes/js/LSselect.js
@@ -35,8 +35,8 @@ var LSselect = new Class({
el.addEvent('click',this.onChangePageClick.bindWithEvent(this,el));
}, this);
- $$('.sortBy_displayValue').each(function(el) {
- el.addEvent('click',this.sortBy.bind(this,'displayValue'));
+ $$('.sortBy_displayName').each(function(el) {
+ el.addEvent('click',this.sortBy.bind(this,'displayName'));
}, this);
$$('.sortBy_subDn').each(function(el) {
diff --git a/trunk/select.php b/trunk/select.php
index 9a6afeb9..324f5f72 100644
--- a/trunk/select.php
+++ b/trunk/select.php
@@ -127,7 +127,7 @@ if($LSsession -> startLSsession()) {
$sort=false;
if ((isset($_REQUEST['orderby']))) {
- $possible_values= array('displayValue','subDn');
+ $possible_values= array('displayName','subDn');
if (in_array($_REQUEST['orderby'],$possible_values)) {
$sort=true;
if ($orderby==$_REQUEST['orderby']) {
@@ -221,7 +221,7 @@ if($LSsession -> startLSsession()) {
$objectList[]=array(
'dn' => $objDn,
- 'displayValue' => $objName,
+ 'displayName' => $objName,
'subDn' => $subDn_name
);
}
diff --git a/trunk/templates/default/select_table.tpl b/trunk/templates/default/select_table.tpl
index 4d359d79..5b2a4f82 100644
--- a/trunk/templates/default/select_table.tpl
+++ b/trunk/templates/default/select_table.tpl
@@ -1,14 +1,14 @@
|
- {if $LSobject_list_orderby == 'displayValue'}{$LSobject_list_objectname}{else}{$LSobject_list_objectname}{/if} |
+ {if $LSobject_list_orderby == 'displayName'}{$LSobject_list_objectname}{else}{$LSobject_list_objectname}{/if} |
{if $LSobject_list_subDn}{if $LSobject_list_orderby == 'subDn'}{$label_level}{else}{$label_level}{/if} | {/if}
{assign var='bis' value=false}
{foreach from=$LSobject_list item=object}
|
- {$object.displayValue} |
+ {$object.displayName} |
{if $LSobject_list_subDn}{$object.subDn} | {/if}
{foreachelse}
diff --git a/trunk/templates/default/viewList.tpl b/trunk/templates/default/viewList.tpl
index 4424c8b2..ff710ad6 100644
--- a/trunk/templates/default/viewList.tpl
+++ b/trunk/templates/default/viewList.tpl
@@ -26,14 +26,14 @@
- {if $LSobject_list_orderby == 'displayValue'}{$LSobject_list_objectname}{else}{$LSobject_list_objectname}{/if} |
+ {if $LSobject_list_orderby == 'displayName'}{$LSobject_list_objectname}{else}{$LSobject_list_objectname}{/if} |
{if $LSobject_list_subDn}{if $LSobject_list_orderby == 'subDn'}{$label_level}{else}{$label_level}{/if} | {/if}
{$_Actions} |
{assign var='bis' value=false}
{foreach from=$LSobject_list item=object}
- {$object.displayValue} |
+ {$object.displayName} |
{if $LSobject_list_subDn}{$object.subDn} | {/if}
{if $object.actions!=''}
diff --git a/trunk/view.php b/trunk/view.php
index 9cfe9e96..0bc4bdaf 100644
--- a/trunk/view.php
+++ b/trunk/view.php
@@ -244,7 +244,7 @@ if($LSsession -> startLSsession()) {
$sort=false;
if ((isset($_REQUEST['orderby']))) {
- $possible_values= array('displayValue','subDn');
+ $possible_values= array('displayName','subDn');
if (in_array($_REQUEST['orderby'],$possible_values)) {
$sort=true;
if ($orderby==$_REQUEST['orderby']) {
@@ -352,7 +352,7 @@ if($LSsession -> startLSsession()) {
$objectList[]=array(
'dn' => $objDn,
- 'displayValue' => $objName,
+ 'displayName' => $objName,
'subDn' => $subDn_name
);
}
|