Dolibarr / dolibarr

htdocs/hrm/class/skill.class.php

Spacing +6 added lines, -6 removed lines

@@ -139,7 +139,7 @@ 
 	/**
 	 * @var int|string
 	 */
-	public $date_validite;  // Note: misspelled!
+	public $date_validite; // Note: misspelled!
 	/**
 	 * @var float
 	 */
@@ -270,7 +270,7 @@ 
 
 		$error = 0;
 
-		require_once __DIR__ . '/skilldet.class.php';
+		require_once __DIR__.'/skilldet.class.php';
 
 		$this->db->begin();
 
@@ -290,11 +290,11 @@ 
 		// Create level of skills
 		while ($i <= $maxNumberSkill) {
 			$skilldet = new Skilldet($this->db);
-			$skilldet->description = $defaultSkillDesc . " " . $i;
+			$skilldet->description = $defaultSkillDesc." ".$i;
 			$skilldet->rankorder = $i;
 			$skilldet->fk_skill = $this->id;
 
-			$result =  $skilldet->create($user);
+			$result = $skilldet->create($user);
 
 			if ($result <= 0) {
 				$error++;
@@ -437,7 +437,7 @@ 
 	public function fetchLines()
 	{
 		$this->lines = array();
-		require_once __DIR__ . '/skilldet.class.php';
+		require_once __DIR__.'/skilldet.class.php';
 		$skilldet = new Skilldet($this->db);
 		$this->lines = $skilldet->fetchAll('ASC', '', 0, 0, '(fk_skill:=:'.$this->id.')');
 
@@ -1026,7 +1026,7 @@ 
 		if (getDolGlobalString('hrm_SKILL_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('hrm_SKILL_ADDON') . ".php";
+			$file = getDolGlobalString('hrm_SKILL_ADDON').".php";
 			$classname = getDolGlobalString('hrm_SKILL_ADDON');
 
 			// Include file with class

htdocs/hrm/evaluation_card.php

Spacing +24 added lines, -24 removed lines

@@ -51,7 +51,7 @@ 
  */
 
 // Load translation files required by the page
-$langs->loadLangs(array('hrm', 'other', 'products'));  // why products?
+$langs->loadLangs(array('hrm', 'other', 'products')); // why products?
 
 // Get parameters
 $id = GETPOSTINT('id');
@@ -289,7 +289,7 @@ 
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewEval"), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("NewEval"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -545,14 +545,14 @@ 
 		$sql .= '  skdet_user.description as "userRankForSkillDesc",';
 		$sql .= '  skdet_required.description as "required_rank_desc"';
 
-		$sql .= '  FROM ' . MAIN_DB_PREFIX . 'hrm_evaluation as e';
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_evaluationdet as ed ON  e.rowid = ed.fk_evaluation';
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_job as j ON e.fk_job = j.rowid';
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skill as sk ON ed.fk_skill = sk.rowid';
-		$sql .= '  INNER JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_user ON (skdet_user.fk_skill = sk.rowid AND skdet_user.rankorder = ed.rankorder)';
+		$sql .= '  FROM '.MAIN_DB_PREFIX.'hrm_evaluation as e';
+		$sql .= '  LEFT JOIN '.MAIN_DB_PREFIX.'hrm_evaluationdet as ed ON  e.rowid = ed.fk_evaluation';
+		$sql .= '  LEFT JOIN '.MAIN_DB_PREFIX.'hrm_job as j ON e.fk_job = j.rowid';
+		$sql .= '  LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skill as sk ON ed.fk_skill = sk.rowid';
+		$sql .= '  INNER JOIN '.MAIN_DB_PREFIX.'hrm_skilldet as skdet_user ON (skdet_user.fk_skill = sk.rowid AND skdet_user.rankorder = ed.rankorder)';
 		//$sql .= "  LEFT JOIN " . MAIN_DB_PREFIX . "hrm_skillrank as skr ON (j.rowid = skr.fk_object AND skr.fk_skill = ed.fk_skill AND skr.objecttype = 'job')";
-		$sql .= '  LEFT JOIN ' . MAIN_DB_PREFIX . 'hrm_skilldet as skdet_required ON (skdet_required.fk_skill = sk.rowid AND skdet_required.rankorder = ed.required_rank)';
-		$sql .= " WHERE e.rowid =" . ((int) $object->id);
+		$sql .= '  LEFT JOIN '.MAIN_DB_PREFIX.'hrm_skilldet as skdet_required ON (skdet_required.fk_skill = sk.rowid AND skdet_required.rankorder = ed.required_rank)';
+		$sql .= " WHERE e.rowid =".((int) $object->id);
 
 		//      echo $sql;
 
@@ -568,7 +568,7 @@ 
 				$Tab[$num]->skill_id = $obj->fk_skill;
 				$Tab[$num]->skilllabel = $obj->skilllabel;
 				$Tab[$num]->description = $obj->description;
-				$Tab[$num]->userRankForSkill = '<span title="'.$obj->userRankForSkillDesc.'" class="radio_js_bloc_number TNote_1">' . $obj->userRankForSkill . '</span>';
+				$Tab[$num]->userRankForSkill = '<span title="'.$obj->userRankForSkillDesc.'" class="radio_js_bloc_number TNote_1">'.$obj->userRankForSkill.'</span>';
 
 				$required_rank = $obj->required_rank;
 				$required_rank_desc = $obj->required_rank_desc;
@@ -579,7 +579,7 @@ 
 					$required_rank_desc = $langs->trans('SkillNotRequired');
 				}
 
-				$Tab[$num]->required_rank = '<span title="'.$required_rank_desc.'" class="radio_js_bloc_number TNote_1">' . $required_rank . '</span>';
+				$Tab[$num]->required_rank = '<span title="'.$required_rank_desc.'" class="radio_js_bloc_number TNote_1">'.$required_rank.'</span>';
 
 				if ($obj->userRankForSkill < 0 || $obj->required_rank < 0) {
 					$title = $langs->trans('NA');
@@ -595,7 +595,7 @@ 
 					$class .= 'sad';
 				}
 
-				$Tab[$num]->result = '<span title="'.$title.'" class="classfortooltip ' . $class . ' note">&nbsp;</span>';
+				$Tab[$num]->result = '<span title="'.$title.'" class="classfortooltip '.$class.' note">&nbsp;</span>';
 
 				$num++;
 			}
@@ -606,12 +606,12 @@ 
 			print '<table id="tablelines" class="noborder noshadow centpercent">';
 
 			print '<tr class="liste_titre">';
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("TypeSkill") . ' </th>';
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Label") . '</th>';
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Description") . '</th>';
-			print '<th style="width:auto;text-align:center" class="liste_titre">' . $langs->trans("EmployeeRank") . '</th>';
-			print '<th style="width:auto;text-align:center" class="liste_titre">' . $langs->trans("RequiredRank") . '</th>';
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Result") . ' ' .$form->textwithpicto('', GetLegendSkills(), 1) .'</th>';
+			print '<th style="width:auto;text-align:auto" class="liste_titre">'.$langs->trans("TypeSkill").' </th>';
+			print '<th style="width:auto;text-align:auto" class="liste_titre">'.$langs->trans("Label").'</th>';
+			print '<th style="width:auto;text-align:auto" class="liste_titre">'.$langs->trans("Description").'</th>';
+			print '<th style="width:auto;text-align:center" class="liste_titre">'.$langs->trans("EmployeeRank").'</th>';
+			print '<th style="width:auto;text-align:center" class="liste_titre">'.$langs->trans("RequiredRank").'</th>';
+			print '<th style="width:auto;text-align:auto" class="liste_titre">'.$langs->trans("Result").' '.$form->textwithpicto('', GetLegendSkills(), 1).'</th>';
 			print '</tr>';
 
 			$sk = new Skill($db);
@@ -619,12 +619,12 @@ 
 				$sk->fetch($t->skill_id);
 
 				print '<tr>';
-				print ' <td>' . dolPrintHTML(Skill::typeCodeToLabel($t->skill_type)) . '</td>';
-				print ' <td class="tdoverflowmax200">' . $sk->getNomUrl(1) . '</td>';
-				print ' <td class="tdoverflowmax200" title="'.dolPrintHTMLForAttribute($t->description).'">' . dolPrintHTML($t->description) . '</td>';
-				print ' <td class="center">' . $t->userRankForSkill . '</td>';
-				print ' <td class="center">' . $t->required_rank . '</td>';
-				print ' <td>' . $t->result . '</td>';
+				print ' <td>'.dolPrintHTML(Skill::typeCodeToLabel($t->skill_type)).'</td>';
+				print ' <td class="tdoverflowmax200">'.$sk->getNomUrl(1).'</td>';
+				print ' <td class="tdoverflowmax200" title="'.dolPrintHTMLForAttribute($t->description).'">'.dolPrintHTML($t->description).'</td>';
+				print ' <td class="center">'.$t->userRankForSkill.'</td>';
+				print ' <td class="center">'.$t->required_rank.'</td>';
+				print ' <td>'.$t->result.'</td>';
 				print '</tr>';
 			}
 

htdocs/hrm/evaluation_list.php

Spacing +3 added lines, -3 removed lines

@@ -91,7 +91,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	$sortfield = "t.ref"; 		// Set here default search field. By default 1st field in definition.
+	$sortfield = "t.ref"; // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
 	$sortorder = "DESC";
@@ -498,7 +498,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -588,7 +588,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;

htdocs/hrm/compare.php

Spacing +33 added lines, -33 removed lines

@@ -36,13 +36,13 @@ 
 
 // Load Dolibarr environment
 require_once '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm.lib.php';
 
 
 /**
@@ -164,7 +164,7 @@ 
 						</tr>
 						<tr>
 							<td><?php
-							echo $langs->trans('OrJobToCompare') . '</td><td>';
+							echo $langs->trans('OrJobToCompare').'</td><td>';
 							$j = new Job($db);
 							$jobs = $j->fetchAll();
 							$TJobs = array();
@@ -221,7 +221,7 @@ 
 				<?php if ($fk_usergroup1 > 0 || $fk_usergroup2 > 0 || $fk_job > 0) {
 						$TUser1 = $TUser2 = array();
 
-						$userlist1 = displayUsersListWithPicto($TUser1, $fk_usergroup1, 'list1');	// This fill also the $TUser1
+						$userlist1 = displayUsersListWithPicto($TUser1, $fk_usergroup1, 'list1'); // This fill also the $TUser1
 
 						$TSkill1 = getSkillForUsers($TUser1);
 
@@ -232,8 +232,8 @@ 
 						$job->fetch($fk_job);
 						$userlist2 = '<ul>
 											<li>
-												<h3>' . $job->label . '</h3>
-												<p>' . $job->description . '</p>
+												<h3>' . $job->label.'</h3>
+												<p>' . $job->description.'</p>
 											</li>
 										</ul>';
 					} else {
@@ -260,13 +260,13 @@ 
 						echo $userlist1;
 						echo '</td>';
 
-						echo '<td id="" style="width:20%; padding-left: 10px;" valign="top">' . skillList($TMergedSkills) . '</td>';
+						echo '<td id="" style="width:20%; padding-left: 10px;" valign="top">'.skillList($TMergedSkills).'</td>';
 
-						echo '<td id="" style="width:10%" valign="top">' . rate($TMergedSkills, 'rate1') . '</td>';
+						echo '<td id="" style="width:10%" valign="top">'.rate($TMergedSkills, 'rate1').'</td>';
 
-						echo '<td id="" style="width:10%" valign="top">' . diff($TMergedSkills) . '</td>';
+						echo '<td id="" style="width:10%" valign="top">'.diff($TMergedSkills).'</td>';
 
-						echo '<td id="" style="width:10%; padding-right: 10px;" valign="top">' . rate($TMergedSkills, 'rate2') . '</td>';
+						echo '<td id="" style="width:10%; padding-right: 10px;" valign="top">'.rate($TMergedSkills, 'rate2').'</td>';
 
 						echo '<td id="list-user-right" style="width:25%; padding-left: 10px; border-left: 1px solid #ccc;" class="valigntop">';
 						echo $userlist2;
@@ -320,8 +320,8 @@ 
 			$class .= ' sad';
 		}
 
-		$out .= '<li fk_skill="' . $id . '" class="' . $class . '" style="text-align:center;">
-	      <span class="' . $class . '">&nbsp;</span>
+		$out .= '<li fk_skill="'.$id.'" class="'.$class.'" style="text-align:center;">
+	      <span class="' . $class.'">&nbsp;</span>
 	    </li>';
 	}
 
@@ -360,8 +360,8 @@ 
 			$trad = $langs->trans('HighestRank');
 		}
 
-		$out .= '<li fk_skill="' . $id . '" class="center">
-	      <p class="nowraponall"><span class="' . $class . ' classfortooltip" title="' . $trad . '">' . $note . '</span>' . ($how_many > 0 ? '<span class="bubble classfortooltip" title="' . $langs->trans('HowManyUserWithThisMaxNote') . '">' . $how_many . '</span>' : '') . '</p>
+		$out .= '<li fk_skill="'.$id.'" class="center">
+	      <p class="nowraponall"><span class="' . $class.' classfortooltip" title="'.$trad.'">'.$note.'</span>'.($how_many > 0 ? '<span class="bubble classfortooltip" title="'.$langs->trans('HowManyUserWithThisMaxNote').'">'.$how_many.'</span>' : '').'</p>
 	    </li>';
 	}
 
@@ -381,9 +381,9 @@ 
 	$out = '<ul class="competence">';
 
 	foreach ($TMergedSkills as $id => &$sk) {
-		$out .= '<li fk_skill="' . $id . '">
-	      <h3>' . $sk->label . '</h3>
-	      <p>' . $sk->description . '</p>
+		$out .= '<li fk_skill="'.$id.'">
+	      <h3>' . $sk->label.'</h3>
+	      <p>' . $sk->description.'</p>
 	    </li>';
 	}
 
@@ -443,17 +443,17 @@ 
 
 	$out = '';
 	if ($fk_usergroup > 0) {
-		$list = $namelist . '_excluded_id';
+		$list = $namelist.'_excluded_id';
 
 		$excludedIdsList = GETPOST($list);
 
-		$sql = "SELECT u.rowid FROM " . MAIN_DB_PREFIX . "user u
-		LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ugu ON (u.rowid = ugu.fk_user)
+		$sql = "SELECT u.rowid FROM ".MAIN_DB_PREFIX."user u
+		LEFT JOIN " . MAIN_DB_PREFIX."usergroup_user as ugu ON (u.rowid = ugu.fk_user)
 		WHERE u.statut > 0 AND ugu.entity = ".((int) $conf->entity);
-		$sql .= " AND ugu.fk_usergroup=" . ((int) $fk_usergroup);
+		$sql .= " AND ugu.fk_usergroup=".((int) $fk_usergroup);
 
 		$res = $db->query($sql);
-		$out .= '<ul name="' . $namelist . '">';
+		$out .= '<ul name="'.$namelist.'">';
 
 		$TExcludedId = explode(',', $excludedIdsList);
 
@@ -489,19 +489,19 @@ 
 			$evaluation = $static_eval->getLastEvaluationForUser($user->id);
 
 			if (!empty($evaluation) && !empty($evaluation->date_eval)) {
-				$desc .= $langs->trans('DateLastEval') . ' : ' . dol_print_date($evaluation->date_eval);
+				$desc .= $langs->trans('DateLastEval').' : '.dol_print_date($evaluation->date_eval);
 			} else {
 				$desc .= $langs->trans('NoEval');
 			}
 
 			if (!empty($user->array_options['options_DDA'])) {
-				$desc .= '<br>' . $langs->trans('Seniority') . ' : ' . dol_print_date(strtotime($user->array_options['options_DDA']));
+				$desc .= '<br>'.$langs->trans('Seniority').' : '.dol_print_date(strtotime($user->array_options['options_DDA']));
 			}
 
-			$out .= '<li fk_user="' . $user->id . '" class="' . $class . '">
-		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, '', 1) . '
-		      <h3>' . $name . '</h3>
-		      <p>' . $desc . '</p>
+			$out .= '<li fk_user="'.$user->id.'" class="'.$class.'">
+		      ' . $form->showphoto('userphoto', $user, 0, 0, 0, 'photoref', 'small', 1, 0, '', 1).'
+		      <h3>' . $name.'</h3>
+		      <p>' . $desc.'</p>
 		    </li>';
 		}
 

htdocs/admin/tools/ui/class/documentation.class.php

Spacing +3 added lines, -3 removed lines

@@ -282,7 +282,7 @@ 
 
 		$arrayofcss[] = 'admin/tools/ui/css/documentation.css';
 
-		top_htmlhead('',  $title, 0, 0, $arrayofjs, $arrayofcss);
+		top_htmlhead('', $title, 0, 0, $arrayofjs, $arrayofcss);
 
 		print '<body class="dolibarr-doc'.(GETPOST('hidenavmenu') ? "-bis" : "").'">';
 	}
@@ -489,7 +489,7 @@ 
 	 */
 	public function showCode($lines = array(), $option = 'html')
 	{
-		require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		print '<div class="documentation-code">';
 
 		if (isset($lines[0])) {
@@ -498,7 +498,7 @@ 
 			}
 		}
 
-		$content = implode("\n", $lines) . "\n";
+		$content = implode("\n", $lines)."\n";
 		$doleditor = new DolEditor(md5($content), $content, '', 0, 'Basic', 'In', true, false, 'ace', 0, '99%', 1);
 		print $doleditor->Create(1, '', false, '', $option);
 		print '</div>';

htdocs/user/card.php

Spacing +14 added lines, -14 removed lines

@@ -95,7 +95,7 @@ 
 $dateendvalidity = dol_mktime(0, 0, 0, GETPOSTINT('dateendvaliditymonth'), GETPOSTINT('dateendvalidityday'), GETPOSTINT('dateendvalidityyear'));
 $dateofbirth = dol_mktime(0, 0, 0, GETPOSTINT('dateofbirthmonth'), GETPOSTINT('dateofbirthday'), GETPOSTINT('dateofbirthyear'));
 
-$childids = $user->getAllChildIds(1);	// For test on hrm fields (like salary visibility)
+$childids = $user->getAllChildIds(1); // For test on hrm fields (like salary visibility)
 
 $object = new User($db);
 $extrafields = new ExtraFields($db);
@@ -159,8 +159,8 @@ 
 if ($id > 0) {
 	// $user is the current logged user, $id is the user we want to edit
 	$permissiontoedit = ((($user->id == $id) && $user->hasRight("user", "self", "write")) || (($user->id != $id) && $user->hasRight("user", "user", "write"))) && (empty($user->socid) || $user->socid == $object->socid);
-	$permissiontoeditpasswordandsee = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password") && $user->admin))&& (empty($user->socid) || $user->socid == $object->socid);
-	$permissiontoeditpasswordandsend = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password")))&& (empty($user->socid) || $user->socid == $object->socid);
+	$permissiontoeditpasswordandsee = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password") && $user->admin)) && (empty($user->socid) || $user->socid == $object->socid);
+	$permissiontoeditpasswordandsend = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password"))) && (empty($user->socid) || $user->socid == $object->socid);
 }
 
 $passwordismodified = false;
@@ -448,7 +448,7 @@ 
 			if (!$error) {
 				$object->fetch($id);
 
-				$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+				$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 
 				$db->begin();
 
@@ -573,7 +573,7 @@ 
 						}
 					}
 
-					$ret = $object->update($user);		// This may include call to setPassword if password has changed
+					$ret = $object->update($user); // This may include call to setPassword if password has changed
 					if ($ret < 0) {
 						$error++;
 						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -687,7 +687,7 @@ 
 				$object->fetch($id);
 
 				if (GETPOST("password", "password")) {	// If pass is empty, we do not change it.
-					$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+					$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 
 					$ret = $object->setPassword($user, GETPOST("password", "password"));
 					if (is_int($ret) && $ret < 0) {
@@ -704,7 +704,7 @@ 
 	) {
 		$object->fetch($id);
 
-		$newpassword = $object->setPassword($user, '');	// This will generate a new password
+		$newpassword = $object->setPassword($user, ''); // This will generate a new password
 		if (is_int($newpassword) && $newpassword < 0) {
 			// Echec
 			setEventMessages($langs->trans("ErrorFailedToSetNewPassword"), null, 'errors');
@@ -832,7 +832,7 @@ 
 						$action = "";
 
 						$mesg = $langs->trans("ErrorProductAlreadyExists", $clone->ref);
-						$mesg .= ' <a href="' . $_SERVER["PHP_SELF"] . '?ref=' . $clone->ref . '">' . $langs->trans("ShowCardHere") . '</a>.';
+						$mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$clone->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
 						setEventMessages($mesg, null, 'errors');
 					} else {
 						setEventMessages(empty($clone->error) ? '' : $langs->trans($clone->error), $clone->errors, 'errors');
@@ -846,7 +846,7 @@ 
 				} else {
 					$db->commit();
 					$db->close();
-					header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 					exit;
 				}
 			} else {
@@ -1550,7 +1550,7 @@ 
 			$ldap = new Ldap();
 			$result = $ldap->connectBind();
 			if ($result > 0) {
-				$userSearchFilter = '(' . getDolGlobalString('LDAP_FILTER_CONNECTION').'('.$ldap->getUserIdentifier().'='.$object->login.'))';
+				$userSearchFilter = '('.getDolGlobalString('LDAP_FILTER_CONNECTION').'('.$ldap->getUserIdentifier().'='.$object->login.'))';
 				$entries = $ldap->fetch($object->login, $userSearchFilter);
 				if (!$entries) {
 					setEventMessages($ldap->error, $ldap->errors, 'errors');
@@ -2058,7 +2058,7 @@ 
 				print '<td>';
 				if (!empty($object->api_key)) {
 					print '<span class="opacitymedium">';
-					print showValueWithClipboardCPButton($object->api_key, 1, $langs->transnoentities("Hidden"));		// TODO Add an option to also reveal the hash, not only copy paste
+					print showValueWithClipboardCPButton($object->api_key, 1, $langs->transnoentities("Hidden")); // TODO Add an option to also reveal the hash, not only copy paste
 					print '</span>';
 				}
 
@@ -2124,7 +2124,7 @@ 
 						$langs->load("mails");
 						$params['attr']['title'] = $langs->trans('NoEMail');
 					}
-					print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle', '', $canSendMail, $params);
+					print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle', '', $canSendMail, $params);
 				}
 
 				if ($permissiontoedit && (!isModEnabled('multicompany') || !$user->entity || ($object->entity == $conf->entity) || (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $object->entity == 1))) {
@@ -2189,13 +2189,13 @@ 
 				if ($user->id != $id && $permissiontodisable && $object->statut == 0 &&
 				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $object->entity == 1))) {
 					unset($params['attr']['title']);
-					print dolGetButtonAction($langs->trans('Reactivate'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=enable&token='.newToken(), '', true, $params);
+					print dolGetButtonAction($langs->trans('Reactivate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken(), '', true, $params);
 				}
 				// Disable user
 				if ($user->id != $id && $permissiontodisable && $object->statut == 1 &&
 				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $object->entity == 1))) {
 					unset($params['attr']['title']);
-					print dolGetButtonAction($langs->trans('DisableUser'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=disable&token='.newToken(), '', true, $params);
+					print dolGetButtonAction($langs->trans('DisableUser'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable&token='.newToken(), '', true, $params);
 				} else {
 					if ($user->id == $id) {
 						$params['attr']['title'] = $langs->trans('CantDisableYourself');

htdocs/core/modules/hrm/doc/pdf_standard_evaluation.modules.php

Spacing +7 added lines, -7 removed lines

@@ -155,7 +155,7 @@ 
 		}
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -245,7 +245,7 @@ 
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
 				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
-					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -286,7 +286,7 @@ 
 					$tab_top = 65;
 
 					$pdf->SetFont('', 'B', $default_font_size);
-					$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes") . ":", 0, 'L', false, 0, 12, $tab_top);
+					$pdf->MultiCell(190, 4, $outputlangs->transnoentities("Notes").":", 0, 'L', false, 0, 12, $tab_top);
 					$tab_top += 4;
 					$pdf->SetFont('', '', $default_font_size - 1);
 					$pdf->writeHTMLCell(190, 3, $this->posxnotes + 1, $tab_top + 1, dol_htmlentitiesbr($object->note_public), 0, 1);
@@ -454,7 +454,7 @@ 
 				// Page footer
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				$pdf->Close();
@@ -551,7 +551,7 @@ 
 		} elseif ($objectligne->rankorder < 0) {
 			$result = $outputlangs->transnoentitiesnoconv("NA");
 		} elseif ($objectligne->required_rank != 0 && $objectligne->rankorder != 0) {
-			$result = $objectligne->rankorder . "/" . $objectligne->required_rank;
+			$result = $objectligne->rankorder."/".$objectligne->required_rank;
 		}
 		$pdf->MultiCell($this->posxresult - 210 - 0.8 - 4, 4, $result, 0, 'C', true);
 
@@ -564,7 +564,7 @@ 
 		$comment = $skill->label;
 
 		if (!empty($skill->description)) {
-			$comment .= '<br>' . $outputlangs->trans("Description").': '.$skill->description;
+			$comment .= '<br>'.$outputlangs->trans("Description").': '.$skill->description;
 		}
 		$pdf->writeHTMLCell($this->posxrankemp - $this->posxskill - 0.8, 4, $this->posxskill - 1, $curY, $comment, 0, 1);
 
@@ -646,7 +646,7 @@ 
 			// employee information
 			$employee = new User($this->db);
 			$employee->fetch($object->fk_user);
-			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities('Employee').' : '.$outputlangs->convToOutputCharset(ucfirst($employee->firstname) . ' ' . strtoupper($employee->lastname));
+			$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities('Employee').' : '.$outputlangs->convToOutputCharset(ucfirst($employee->firstname).' '.strtoupper($employee->lastname));
 
 			// Position
 			include_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';