Dolibarr / dolibarr

htdocs/debugbar/class/DataCollector/DolPhpCollector.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
 	{
 		$messages = $this->messages;
 
-		usort($messages, function ($itemA, $itemB) {
+		usort($messages, function($itemA, $itemB) {
 			if ($itemA['time'] === $itemB['time']) {
 				return 0;
 			}
@@ -119,7 +119,7 @@ 
 			if ($type = $severity & (2 ** $i)) {
 				$label = $this->friendlyErrorType($type);
 				$this->messages[] = [
-					'message' => $message . ' (' . $fileName . ':' . $line . ')',
+					'message' => $message.' ('.$fileName.':'.$line.')',
 					'message_html' => null,
 					'is_string' => true,
 					'label' => $label,

htdocs/hrm/evaluation_card.php

Braces +3 added lines, -1 removed lines

@@ -97,7 +97,9 @@
 if (!isModEnabled("hrm")) {
 	accessforbidden();
 }
-if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) accessforbidden();
+if (!$permissiontoread || ($action === 'create' && !$permissiontoadd)) {
+	accessforbidden();
+}
 
 
 /*

Spacing +34 added lines, -34 removed lines

@@ -40,7 +40,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 = GETPOST('id', 'int');
@@ -51,7 +51,7 @@ 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'evaluationcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid = GETPOST('lineid', 'int');
 
 // Initialize technical objects
 $object = new Evaluation($db);
@@ -169,7 +169,7 @@ 
 	if ($action == 'close') {
 		// save evaldet lines to user;
 		$sk = new SkillRank($db);
-		$SkillrecordsForActiveUser = $sk->fetchAll('ASC', 'fk_skill', 0, 0, array("customsql"=>"fk_object = ".$object->fk_user ." AND objecttype ='".SkillRank::SKILLRANK_TYPE_USER."'"), 'AND');
+		$SkillrecordsForActiveUser = $sk->fetchAll('ASC', 'fk_skill', 0, 0, array("customsql"=>"fk_object = ".$object->fk_user." AND objecttype ='".SkillRank::SKILLRANK_TYPE_USER."'"), 'AND');
 
 		$errors = 0;
 		// we go through the evaldets of the eval
@@ -212,7 +212,7 @@ 
 		}
 	}
 
-	if ($action == 'reopen' ) {
+	if ($action == 'reopen') {
 		// no update here we just change the evaluation status
 		$object->setStatut(Evaluation::STATUS_VALIDATED);
 	}
@@ -259,7 +259,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().'">';
@@ -423,9 +423,9 @@ 
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">'."\n";
 
-	$object->fields['label']['visible']=0; // Already in banner
-	$object->fields['fk_user']['visible']=0; // Already in banner
-	$object->fields['fk_job']['visible']=0; // Already in banner
+	$object->fields['label']['visible'] = 0; // Already in banner
+	$object->fields['fk_user']['visible'] = 0; // Already in banner
+	$object->fields['fk_job']['visible'] = 0; // Already in banner
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 	// Other attributes. Fields from hook formObjectOptions and Extrafields.
@@ -463,7 +463,7 @@ 
 			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
-		$conf->modules_parts['tpl']['hrm']='/hrm/core/tpl/'; // Pour utilisation du tpl hrm sur cet écran
+		$conf->modules_parts['tpl']['hrm'] = '/hrm/core/tpl/'; // Pour utilisation du tpl hrm sur cet écran
 
 		print '<div class="div-table-responsive-no-min">';
 		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline')) {
@@ -524,14 +524,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;
 
@@ -547,21 +547,21 @@ 
 				$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]->required_rank = '<span title="'.$obj->required_rank_desc.'" class="radio_js_bloc_number TNote_1">' . $obj->required_rank . '</span>';
+				$Tab[$num]->userRankForSkill = '<span title="'.$obj->userRankForSkillDesc.'" class="radio_js_bloc_number TNote_1">'.$obj->userRankForSkill.'</span>';
+				$Tab[$num]->required_rank = '<span title="'.$obj->required_rank_desc.'" class="radio_js_bloc_number TNote_1">'.$obj->required_rank.'</span>';
 
 				if ($obj->userRankForSkill > $obj->required_rank) {
-					$title=$langs->trans('MaxlevelGreaterThanShort');
+					$title = $langs->trans('MaxlevelGreaterThanShort');
 					$class .= 'veryhappy diffnote';
 				} elseif ($obj->userRankForSkill == $obj->required_rank) {
-					$title=$langs->trans('MaxLevelEqualToShort');
+					$title = $langs->trans('MaxLevelEqualToShort');
 					$class .= 'happy diffnote';
 				} elseif ($obj->userRankForSkill < $obj->required_rank) {
-					$title=$langs->trans('MaxLevelLowerThanShort');
+					$title = $langs->trans('MaxLevelLowerThanShort');
 					$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++;
 			}
@@ -572,12 +572,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);
@@ -585,12 +585,12 @@ 
 				$sk->fetch($t->skill_id);
 
 				print '<tr>';
-				print ' <td>' . Skill::typeCodeToLabel($t->skill_type) . '</td>';
-				print ' <td>' . $sk->getNomUrl(1) . '</td>';
-				print ' <td>' . $t->description . '</td>';
-				print ' <td align="center">' . $t->userRankForSkill . '</td>';
-				print ' <td align="center">' . $t->required_rank . '</td>';
-				print ' <td>' . $t->result . '</td>';
+				print ' <td>'.Skill::typeCodeToLabel($t->skill_type).'</td>';
+				print ' <td>'.$sk->getNomUrl(1).'</td>';
+				print ' <td>'.$t->description.'</td>';
+				print ' <td align="center">'.$t->userRankForSkill.'</td>';
+				print ' <td align="center">'.$t->required_rank.'</td>';
+				print ' <td>'.$t->result.'</td>';
 				print '</tr>';
 			}
 

htdocs/hrm/evaluation_note.php

Spacing +4 added lines, -4 removed lines

@@ -28,9 +28,9 @@ 
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_evaluation.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluation.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_evaluation.lib.php';
 
 
 // Load translation files required by the page
@@ -61,7 +61,7 @@ 
 
 // Permissions
 $permissionnote   = $user->rights->hrm->evaluation->write; // Used by the include of actions_setnotes.inc.php
-$permissiontoread = $user->rights->hrm->evaluation->read;  // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoread = $user->rights->hrm->evaluation->read; // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();

htdocs/hrm/admin/admin_hrm.php

Braces +6 added lines, -2 removed lines

@@ -46,8 +46,12 @@
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', 0);
-if (!isModEnabled('hrm')) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
 
 
 /*

htdocs/hrm/admin/admin_establishment.php

Braces +6 added lines, -2 removed lines

@@ -40,8 +40,12 @@
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', 0);
-if (!isModEnabled('hrm')) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
 
 $sortorder     = GETPOST('sortorder', 'aZ09comma');
 $sortfield     = GETPOST('sortfield', 'aZ09comma');

htdocs/hrm/establishment/info.php

Braces +6 added lines, -2 removed lines

@@ -86,8 +86,12 @@
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
-if (!isModEnabled('hrm')) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
+if (!isModEnabled('hrm')) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
 
 
 /*

htdocs/hrm/lib/hrm.lib.php

Spacing +4 added lines, -4 removed lines

@@ -44,7 +44,7 @@ 
 
 	$h = 0;
 	$head = array();
-	$head[$h][0] = DOL_URL_ROOT . "/admin/hrm.php";
+	$head[$h][0] = DOL_URL_ROOT."/admin/hrm.php";
 	$head[$h][1] = $langs->trans("Settings");
 	$head[$h][2] = 'settings';
 	$h++;
@@ -54,7 +54,7 @@ 
 	$head[$h][2] = 'establishments';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/skill_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/skill_extrafields.php';
 	$head[$h][1] = $langs->trans("SkillsExtraFields");
 	$nbExtrafields = $extrafields->attributes['hrm_skill']['count'];
 	if ($nbExtrafields > 0) {
@@ -63,7 +63,7 @@ 
 	$head[$h][2] = 'skillsAttributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/job_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/job_extrafields.php';
 	$head[$h][1] = $langs->trans("JobsExtraFields");
 	$nbExtrafields = $extrafields->attributes['hrm_job']['count'];
 	if ($nbExtrafields > 0) {
@@ -72,7 +72,7 @@ 
 	$head[$h][2] = 'jobsAttributes';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/evaluation_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/hrm/admin/evaluation_extrafields.php';
 	$head[$h][1] = $langs->trans("EvaluationsExtraFields");
 	$nbExtrafields = $extrafields->attributes['hrm_evaluation']['count'];
 	if ($nbExtrafields > 0) {

htdocs/hrm/position_list.php

Braces +6 added lines, -2 removed lines

@@ -139,7 +139,9 @@ 
 $permissiontodelete = $user->rights->hrm->all->delete;
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
@@ -147,7 +149,9 @@ 
 if (!isModEnabled('hrm')) {
 	accessforbidden('Module hrm not enabled');
 }
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -221,7 +221,7 @@ 
 $sql .= $object->getFieldList('t');
 $sql .= ',';
 $sql .= $userstatic->getFieldList('u', array('rowid'));
-$sql .= ', u.email, u.statut, u.photo, u.login';		// Add more field not yet into the user->fields
+$sql .= ', u.email, u.statut, u.photo, u.login'; // Add more field not yet into the user->fields
 $sql .= ', j.rowid as job_id, j.label as job_label';
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -265,7 +265,7 @@ 
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
 					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
@@ -564,7 +564,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.' ' : ''))."\n";
 		$totalarray['nbfield']++;

htdocs/hrm/evaluation_list.php

Braces +6 added lines, -2 removed lines

@@ -144,13 +144,17 @@
 }
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
 //if ($user->socid > 0) accessforbidden();
 //$socid = 0; if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
 //if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 

Spacing +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -267,7 +267,7 @@ 
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
 					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
@@ -284,7 +284,7 @@ 
 }
 
 if (empty($permissiontoreadall)) {
-	$sql.= " AND t.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
+	$sql .= " AND t.fk_user IN(".$db->sanitize(implode(", ", $user->getAllChildIds(1))).") ";
 }
 
 //$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
@@ -580,7 +580,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']++;