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

Merge pull request #6204 from gnovaro/patch-1

Browse Source 
var to public
This commit is contained in:
Laurent Destailleur 2016-12-23 00:45:58 +01:00 committed by GitHub
commit bf08407222
1 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,6 @@
require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php'; require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
/** /**
* Class to manage Dolibarr users * Class to manage Dolibarr users
*/ */
@ -43,90 +42,90 @@ class User extends CommonObject
public $table_element='user'; public $table_element='user';
protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id=0; public $id=0;
var $ldap_sid; public $ldap_sid;
var $search_sid; public $search_sid;
var $employee; public $employee;
var $gender; public $gender;
var $email; public $email;
var $skype; public $skype;
var $job; public $job;
var $signature; public $signature;
var $address; public $address;
var $zip; public $zip;
var $town; public $town;
var $state_id; public $state_id;
var $state_code; public $state_code;
var $state; public $state;
var $office_phone; public $office_phone;
var $office_fax; public $office_fax;
var $user_mobile; public $user_mobile;
var $admin; public $admin;
var $login; public $login;
var $api_key; public $api_key;
var $entity; public $entity;
//! Clear password in memory //! Clear password in memory
var $pass; public $pass;
//! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0) //! Clear password in database (defined if DATABASE_PWD_ENCRYPTED=0)
var $pass_indatabase; public $pass_indatabase;
//! Encrypted password in database (always defined) //! Encrypted password in database (always defined)
var $pass_indatabase_crypted; public $pass_indatabase_crypted;
var $datec; public $datec;
var $datem; public $datem;
//! If this is defined, it is an external user //! If this is defined, it is an external user
/** /**
* @deprecated * @deprecated
* @see socid * @see socid
*/ */
var $societe_id; public $societe_id;
/** /**
* @deprecated * @deprecated
* @see contactid * @see contactid
*/ */
var $contact_id; public $contact_id;
var $socid; public $socid;
var $contactid; public $contactid;
var $fk_member; public $fk_member;
var $fk_user; public $fk_user;
var $clicktodial_url; public $clicktodial_url;
var $clicktodial_login; public $clicktodial_login;
var $clicktodial_password; public $clicktodial_password;
var $clicktodial_poste; public $clicktodial_poste;
var $datelastlogin; public $datelastlogin;
var $datepreviouslogin; public $datepreviouslogin;
var $statut; public $statut;
var $photo; public $photo;
var $lang; public $lang;
var $rights; // Array of permissions user->rights->permx public $rights; // Array of permissions user->rights->permx
var $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */ public $all_permissions_are_loaded; /**< \private all_permissions_are_loaded */
private $_tab_loaded=array(); // Array of cache of already loaded permissions private $_tab_loaded=array(); // Array of cache of already loaded permissions
var $nb_rights; // Number of rights granted to the user public $nb_rights; // Number of rights granted to the user
var $conf; // To store personal config public $conf; // To store personal config
var $oldcopy; // To contains a clone of this when we need to save old properties of object var $oldcopy; // To contains a clone of this when we need to save old properties of object
var $users; // To store all tree of users hierarchy public $users; // To store all tree of users hierarchy
var $parentof; // To store an array of all parents for all ids. public $parentof; // To store an array of all parents for all ids.
var $accountancy_code; // Accountancy code in prevision of the complete accountancy module public $accountancy_code; // Accountancy code in prevision of the complete accountancy module
var $thm; // Average cost of employee - Used for valuation of time spent public $thm; // Average cost of employee - Used for valuation of time spent
var $tjm; // Average cost of employee public $tjm; // Average cost of employee
var $salary; // Monthly salary - Denormalized value from llx_user_employment public $salary; // Monthly salary - Denormalized value from llx_user_employment
var $salaryextra; // Monthly salary extra - Denormalized value from llx_user_employment public $salaryextra; // Monthly salary extra - Denormalized value from llx_user_employment
var $weeklyhours; // Weekly hours - Denormalized value from llx_user_employment public $weeklyhours; // Weekly hours - Denormalized value from llx_user_employment
var $color; // Define background color for user in agenda public $color; // Define background color for user in agenda
var $dateemployment; // Define date of employment by company public $dateemployment; // Define date of employment by company
/** /**
* Constructor de la classe * Constructor de la classe