From 8248ab4f9a49c180ccc69e5665b269c9f8655e20 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 30 Oct 2014 11:16:45 +0100 Subject: [PATCH] Fix: doxygen --- htdocs/user/class/user.class.php | 17 ++++++++--------- htdocs/user/hierarchy.php | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php index 6f15bf82faa..3c3ab62e22f 100644 --- a/htdocs/user/class/user.class.php +++ b/htdocs/user/class/user.class.php @@ -1941,7 +1941,7 @@ class User extends CommonObject if ($this->office_fax && ! empty($conf->global->LDAP_FIELD_FAX)) $info[$conf->global->LDAP_FIELD_FAX] = $this->office_fax; if ($this->note && ! empty($conf->global->LDAP_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_FIELD_DESCRIPTION] = $this->note; if ($this->email && ! empty($conf->global->LDAP_FIELD_MAIL)) $info[$conf->global->LDAP_FIELD_MAIL] = $this->email; - if ($this->skype && ! empty($conf->global->LDAP_FIELD_SKYPE)) $info[$conf->global->LDAP_FIELD_SKYPE] = $this->skype; + if ($this->skype && ! empty($conf->global->LDAP_FIELD_SKYPE)) $info[$conf->global->LDAP_FIELD_SKYPE] = $this->skype; if ($conf->global->LDAP_SERVER_TYPE == 'egroupware') { @@ -1994,7 +1994,7 @@ class User extends CommonObject $this->firstname='SPECIMEN'; $this->note='This is a note'; $this->email='email@specimen.com'; - $this->skype='tom.hanson'; + $this->skype='tom.hanson'; $this->office_phone='0999999999'; $this->office_fax='0999999998'; $this->user_mobile='0999999997'; @@ -2223,16 +2223,15 @@ class User extends CommonObject /** * Reconstruit l'arborescence hierarchique des users sous la forme d'un tableau - * Renvoi un tableau de tableau('id','id_parent',...) trie selon arbre et avec: - * id = id du user - * id_parent = id du user parent - * id_children = tableau des id enfant - * name = nom du user + * Set and return this->users that is an array sorted according to tree with arrays of: + * id = id user + * lastname + * firstname * fullname = nom avec chemin complet du user - * fullpath = chemin complet compose des id + * fullpath = chemin complet compose des id: "_grandparentid_parentid_id" * * @param int $deleteafterid Removed all users including the leaf $deleteafterid (and all its child) in user tree. - * @return array Array of users. this->users and this->parentof are set. + * @return array Array of users $this->users. Note: $this->parentof is also set. */ function get_full_tree($deleteafterid=0) { diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php index 3c330f3a712..0d6c2f9a7b8 100644 --- a/htdocs/user/hierarchy.php +++ b/htdocs/user/hierarchy.php @@ -62,7 +62,7 @@ print_fiche_titre($langs->trans("ListOfUsers"). ' ('.$langs->trans("HierarchicVi -// Charge tableau des categories +// Load hierarchy of users $user_arbo = $userstatic->get_full_tree(); // Define fulltree array