Dolibarr / dolibarr

htdocs/user/class/user.class.php

Spacing +52 added lines, -52 removed lines

@@ -594,8 +594,8 @@ 
 			$sql .= " WHERE u.rowid = ".((int) $id);
 		} else {
 			if ($entity < 0) {
-				if ((! isModEnabled('multicompany') || ! getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) && (! empty($user->entity))) {
-					$sql .= " WHERE u.entity IN (0, " . ((int) $conf->entity) . ")";
+				if ((!isModEnabled('multicompany') || !getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE')) && (!empty($user->entity))) {
+					$sql .= " WHERE u.entity IN (0, ".((int) $conf->entity).")";
 				} else {
 					$sql .= " WHERE u.entity IS NOT NULL"; // multicompany is on in transverse mode or user making fetch is on entity 0, so user is allowed to fetch anywhere into database
 				}
@@ -607,7 +607,7 @@ 
 					if ($entity != '' && $entity == 0) {    // If $entity = 0
 						$sql .= " WHERE u.entity = 0";
 					} else {                                // if $entity is -1 or > 0
-						$sql .= " WHERE u.entity IN (0, " . ((int) ($entity > 0 ? $entity : $conf->entity)) . ")";
+						$sql .= " WHERE u.entity IN (0, ".((int) ($entity > 0 ? $entity : $conf->entity)).")";
 					}
 				}
 			}
@@ -668,11 +668,11 @@ 
 				$this->pass_indatabase = $obj->pass;
 				$this->pass_indatabase_crypted = $obj->pass_crypted;
 				$this->pass = $obj->pass;
-				$this->pass_temp	= $obj->pass_temp;
+				$this->pass_temp = $obj->pass_temp;
 				$this->datelastpassvalidation = $obj->datelastpassvalidation;
 				$this->api_key = dolDecrypt($obj->api_key);
 
-				$this->address 		= $obj->address;
+				$this->address = $obj->address;
 				$this->zip 			= $obj->zip;
 				$this->town 		= $obj->town;
 
@@ -695,11 +695,11 @@ 
 
 				$this->job = $obj->job;
 				$this->signature = $obj->signature;
-				$this->admin		= $obj->admin;
+				$this->admin = $obj->admin;
 				$this->note_public = $obj->note_public;
 				$this->note_private = $obj->note_private;
 
-				$this->statut		= $obj->status;			// deprecated
+				$this->statut		= $obj->status; // deprecated
 				$this->status		= $obj->status;
 
 				$this->photo		= $obj->photo;
@@ -837,7 +837,7 @@ 
 			require_once DOL_DOCUMENT_ROOT.'/core/class/defaultvalues.class.php';
 
 			$defaultValues = new DefaultValues($this->db);
-			$result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,'.$this->id.') AND (entity:in:'.(isset($this->entity) ? $this->entity : $conf->entity).','.$conf->entity.')');	// User 0 (all) + me (if defined)
+			$result = $defaultValues->fetchAll('', '', 0, 0, '(t.user_id:in:0,'.$this->id.') AND (entity:in:'.(isset($this->entity) ? $this->entity : $conf->entity).','.$conf->entity.')'); // User 0 (all) + me (if defined)
 			//$result = $defaultValues->fetchAll('', '', 0, 0, array('t.user_id'=>array(0, $this->id), 'entity'=>array((isset($this->entity) ? $this->entity : $conf->entity), $conf->entity)));	// User 0 (all) + me (if defined)
 
 			if (!is_array($result) && $result < 0) {
@@ -954,16 +954,16 @@ 
 		// Special case for external user
 		if (!empty($this->socid)) {
 			if ($module == 'societe' && ($permlevel1 == 'creer' || $permlevel1 == 'write')) {
-				return 0;	// An external user never has the permission ->societe->write to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->write to see all thirdparties (always restricted to himself)
 			}
 			if ($module == 'societe' && $permlevel1 == 'client' && $permlevel2 == 'voir') {
-				return 0;	// An external user never has the permission ->societe->client->voir to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->client->voir to see all thirdparties (always restricted to himself)
 			}
 			if ($module == 'societe' && $permlevel1 == 'export') {
-				return 0;	// An external user never has the permission ->societe->export to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->export to see all thirdparties (always restricted to himself)
 			}
 			if ($module == 'societe' && ($permlevel1 == 'supprimer' || $permlevel1 == 'delete')) {
-				return 0;	// An external user never has the permission ->societe->delete to see all thirdparties (always restricted to himself)
+				return 0; // An external user never has the permission ->societe->delete to see all thirdparties (always restricted to himself)
 			}
 		}
 
@@ -1111,7 +1111,7 @@ 
 			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity = ".((int) $entity);
 			if (!empty($whereforadd) && $whereforadd != 'allmodules') {
-				$sql .= " AND (".$whereforadd.")";	// Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized
+				$sql .= " AND (".$whereforadd.")"; // Note: parenthesis are important because whereforadd can contains OR. Also note that $whereforadd is already sanitized
 			}
 
 			$sqldelete = "DELETE FROM ".$this->db->prefix()."user_rights";
@@ -1247,7 +1247,7 @@ 
 			$sql .= " FROM ".$this->db->prefix()."rights_def";
 			$sql .= " WHERE entity IN (".$this->db->sanitize($entity, 0, 0, 0, 0).")";
 			if (!empty($wherefordel) && $wherefordel != 'allmodules') {
-				$sql .= " AND (".$wherefordel.")";	// Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized
+				$sql .= " AND (".$wherefordel.")"; // Note: parenthesis are important because wherefordel can contains OR. Also note that $wherefordel is already sanitized
 			}
 
 			// avoid admin to remove his own important rights
@@ -1426,12 +1426,12 @@ 
 					$sql .= " AND r.entity = ".((int) $conf->entity);
 				}
 			} else {
-				$sql .= " AND gr.entity = ".((int) $conf->entity);	// Only groups created in current entity
+				$sql .= " AND gr.entity = ".((int) $conf->entity); // Only groups created in current entity
 				// The entity on the table gu=usergroup_user should be useless and should never be used because it is already into gr and r.
 				// but when using MULTICOMPANY_TRANSVERSE_MODE, we may have inserted record that make rubbish result here due to the duplicate record of
 				// other entities, so we are forced to add a filter on gu here
 				$sql .= " AND gu.entity IN (0,".$conf->entity.")";
-				$sql .= " AND r.entity = ".((int) $conf->entity);	// Only permission of modules enabled in current entity
+				$sql .= " AND r.entity = ".((int) $conf->entity); // Only permission of modules enabled in current entity
 			}
 			// End of strange business rule
 			$sql .= " AND gr.fk_usergroup = gu.fk_usergroup";
@@ -1984,7 +1984,7 @@ 
 		$this->civility_code = $member->civility_code;
 		$this->lastname     = $member->lastname;
 		$this->firstname    = $member->firstname;
-		$this->gender		= $member->gender;
+		$this->gender = $member->gender;
 		$this->email        = $member->email;
 		$this->fk_member    = $member->id;
 		$this->address      = $member->address;
@@ -2127,45 +2127,45 @@ 
 		$this->lastname						= trim((string) $this->lastname);
 		$this->firstname					= trim((string) $this->firstname);
 		$this->ref_employee					= trim((string) $this->ref_employee);
-		$this->national_registration_number	= trim((string) $this->national_registration_number);
+		$this->national_registration_number = trim((string) $this->national_registration_number);
 		$this->employee						= ($this->employee > 0 ? $this->employee : 0);
 		$this->login						= trim((string) $this->login);
-		$this->gender						= trim((string) $this->gender);
+		$this->gender = trim((string) $this->gender);
 
 		$this->pass							= trim((string) $this->pass);
-		$this->api_key						= trim((string) $this->api_key);
-		$this->datestartvalidity			= empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
-		$this->dateendvalidity				= empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+		$this->api_key = trim((string) $this->api_key);
+		$this->datestartvalidity = empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
+		$this->dateendvalidity = empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
 
-		$this->address						= trim((string) $this->address);
-		$this->zip							= trim((string) $this->zip);
-		$this->town							= trim((string) $this->town);
+		$this->address = trim((string) $this->address);
+		$this->zip = trim((string) $this->zip);
+		$this->town = trim((string) $this->town);
 
-		$this->state_id						= ($this->state_id > 0 ? $this->state_id : 0);
+		$this->state_id = ($this->state_id > 0 ? $this->state_id : 0);
 		$this->country_id					= ($this->country_id > 0 ? $this->country_id : 0);
-		$this->office_phone					= trim((string) $this->office_phone);
+		$this->office_phone = trim((string) $this->office_phone);
 		$this->office_fax					= trim((string) $this->office_fax);
-		$this->user_mobile					= trim((string) $this->user_mobile);
-		$this->personal_mobile				= trim((string) $this->personal_mobile);
-		$this->email						= trim((string) $this->email);
-		$this->personal_email				= trim((string) $this->personal_email);
-
-		$this->job							= trim((string) $this->job);
-		$this->signature					= trim((string) $this->signature);
-		$this->note_public					= trim((string) $this->note_public);
-		$this->note_private					= trim((string) $this->note_private);
-		$this->openid						= trim((string) $this->openid);
-		$this->admin						= ($this->admin > 0 ? $this->admin : 0);
-
-		$this->accountancy_code_user_general	= trim((string) $this->accountancy_code_user_general);
+		$this->user_mobile = trim((string) $this->user_mobile);
+		$this->personal_mobile = trim((string) $this->personal_mobile);
+		$this->email = trim((string) $this->email);
+		$this->personal_email = trim((string) $this->personal_email);
+
+		$this->job = trim((string) $this->job);
+		$this->signature = trim((string) $this->signature);
+		$this->note_public = trim((string) $this->note_public);
+		$this->note_private = trim((string) $this->note_private);
+		$this->openid = trim((string) $this->openid);
+		$this->admin = ($this->admin > 0 ? $this->admin : 0);
+
+		$this->accountancy_code_user_general = trim((string) $this->accountancy_code_user_general);
 		$this->accountancy_code				= trim((string) $this->accountancy_code);
-		$this->color						= trim((string) $this->color);
-		$this->dateemployment				= empty($this->dateemployment) ? '' : $this->dateemployment;
+		$this->color = trim((string) $this->color);
+		$this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment;
 		$this->dateemploymentend			= empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
 
-		$this->birth						= empty($this->birth) ? '' : $this->birth;
-		$this->fk_warehouse					= (int) $this->fk_warehouse;
-		$this->fk_establishment				= (int) $this->fk_establishment;
+		$this->birth = empty($this->birth) ? '' : $this->birth;
+		$this->fk_warehouse = (int) $this->fk_warehouse;
+		$this->fk_establishment = (int) $this->fk_establishment;
 
 		$this->setUpperOrLowerCase();
 
@@ -2930,7 +2930,7 @@ 
 		$sql .= " WHERE fk_user  = ".((int) $this->id);
 		$sql .= " AND fk_usergroup = ".((int) $group);
 		if (empty($entity)) {
-			$sql .= " AND entity IN (0, 1)";	// group may be in entity 0 (so $entity=0) and link with user into entity 1.
+			$sql .= " AND entity IN (0, 1)"; // group may be in entity 0 (so $entity=0) and link with user into entity 1.
 		} else {
 			$sql .= " AND entity = ".((int) $entity);
 		}
@@ -3191,7 +3191,7 @@ 
 				$linkclose .= ' alt="'.dolPrintHTMLForAttribute($label).'"';
 			}
 			$linkclose .= ($label ? ' title="'.dolPrintHTMLForAttribute($label).'"' : ' title="tocomplete"');
-			$linkclose .= $dataparams . ' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
+			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -3430,11 +3430,11 @@ 
 		global $conf;
 		$dn = '';
 		if ($mode == 0) {
-			$dn = getDolGlobalString('LDAP_KEY_USERS') . "=".$info[getDolGlobalString('LDAP_KEY_USERS')]."," . getDolGlobalString('LDAP_USER_DN');
+			$dn = getDolGlobalString('LDAP_KEY_USERS')."=".$info[getDolGlobalString('LDAP_KEY_USERS')].",".getDolGlobalString('LDAP_USER_DN');
 		} elseif ($mode == 1) {
 			$dn = getDolGlobalString('LDAP_USER_DN');
 		} elseif ($mode == 2) {
-			$dn = getDolGlobalString('LDAP_KEY_USERS') . "=".$info[getDolGlobalString('LDAP_KEY_USERS')];
+			$dn = getDolGlobalString('LDAP_KEY_USERS')."=".$info[getDolGlobalString('LDAP_KEY_USERS')];
 		}
 		return $dn;
 	}
@@ -3649,7 +3649,7 @@ 
 		$this->iplastlogin = '127.0.0.1';
 		$this->datepreviouslogin = $now;
 		$this->ippreviouslogin = '127.0.0.1';
-		$this->statut = 1;		// deprecated
+		$this->statut = 1; // deprecated
 		$this->status = 1;
 
 		$this->entity = 1;
@@ -4242,8 +4242,8 @@ 
 					$sql .= " WHERE t.entity IS NOT NULL"; // Show all users
 				} else {
 					$sql .= " WHERE t.entity = 0 OR EXISTS (";
-					$sql .= " SELECT ug.rowid FROM " . $this->db->prefix() . "usergroup_user as ug";
-					$sql .= " WHERE ug.fk_user = t.rowid AND ug.entity IN (" . getEntity('usergroup') . "))";
+					$sql .= " SELECT ug.rowid FROM ".$this->db->prefix()."usergroup_user as ug";
+					$sql .= " WHERE ug.fk_user = t.rowid AND ug.entity IN (".getEntity('usergroup')."))";
 				}
 			} else {
 				$sql .= " WHERE t.entity IN (".getEntity('user').")";