lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: doxygen

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-30 11:16:45 +01:00
parent 750944d718
commit 8248ab4f9a
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/user/class/user.class.php
View File

@ -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->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->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->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') if ($conf->global->LDAP_SERVER_TYPE == 'egroupware')
{ {
@ -1994,7 +1994,7 @@ class User extends CommonObject
$this->firstname='SPECIMEN'; $this->firstname='SPECIMEN';
$this->note='This is a note'; $this->note='This is a note';
$this->email='email@specimen.com'; $this->email='email@specimen.com';
$this->skype='tom.hanson'; $this->skype='tom.hanson';
$this->office_phone='0999999999'; $this->office_phone='0999999999';
$this->office_fax='0999999998'; $this->office_fax='0999999998';
$this->user_mobile='0999999997'; $this->user_mobile='0999999997';
@ -2223,16 +2223,15 @@ class User extends CommonObject
/** /**
* Reconstruit l'arborescence hierarchique des users sous la forme d'un tableau * 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: * Set and return this->users that is an array sorted according to tree with arrays of:
* id = id du user * id = id user
* id_parent = id du user parent * lastname
* id_children = tableau des id enfant * firstname
* name = nom du user
* fullname = nom avec chemin complet du user * 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. * @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) function get_full_tree($deleteafterid=0)
{ {

2
htdocs/user/hierarchy.php
View File

@ -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(); $user_arbo = $userstatic->get_full_tree();
// Define fulltree array // Define fulltree array