Dolibarr / dolibarr

htdocs/partnership/partnership_note.php

Braces +12 added lines, -4 removed lines

@@ -66,10 +66,18 @@
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$result = restrictedArea($user, 'partnership', $object->id);
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
-if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
-if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
+if (empty($conf->partnership->enabled)) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') {
+	accessforbidden();
+}
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') {
+	accessforbidden();
+}
 
 
 /*

htdocs/partnership/class/partnershiputils.class.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 	public $error; //!< To return error code (or message)
 	public $errors = array(); //!< To return several error codes (or messages)
 
-	public $output;	// To store output of some cron methods
+	public $output; // To store output of some cron methods
 
 
 	/**
@@ -66,7 +66,7 @@ 
 	{
 		global $conf, $langs, $user;
 
-		$managedfor	= getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
+		$managedfor = getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 
 		if ($managedfor != 'member') {
 			return 0; // If option 'PARTNERSHIP_IS_MANAGED_FOR' = 'thirdparty', this cron job does nothing.

Braces +38 added lines, -13 removed lines

@@ -118,7 +118,9 @@ 
 
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
-					if (!empty($partnershipsprocessed[$obj->rowid])) continue;
+					if (!empty($partnershipsprocessed[$obj->rowid])) {
+						continue;
+					}
 
 					if ($somethingdoneonpartnership >= $MAXPERCALL) {
 						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
@@ -140,8 +142,11 @@ 
 							$error++;
 							$this->error = $object->error;
 							if (is_array($object->errors) && count($object->errors)) {
-								if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors);
-								else $this->errors = $object->errors;
+								if (is_array($this->errors)) {
+									$this->errors = array_merge($this->errors, $object->errors);
+								} else {
+									$this->errors = $object->errors;
+								}
 							}
 						} else {
 							$partnershipsprocessed[$object->id] = $object->ref;
@@ -159,7 +164,9 @@ 
 							// Define output language
 							$outputlangs = $langs;
 							$newlang = '';
-							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+								$newlang = GETPOST('lang_id', 'aZ09');
+							}
 							if (!empty($newlang)) {
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
@@ -184,7 +191,9 @@ 
 							if (!$result || $cmail->error) {
 								$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
 								$this->errors[] = $cmail->error;
-								if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+								if (is_array($cmail->errors) && count($cmail->errors) > 0) {
+									$this->errors += $cmail->errors;
+								}
 							}
 						}
 					}
@@ -198,12 +207,16 @@ 
 		if (!$error) {
 			$this->db->commit();
 			$this->output = $numofexpiredmembers.' expired partnership members found'."\n";
-			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail;
+			if ($erroremail) {
+				$this->output .= '. Got errors when sending some email : '.$erroremail;
+			}
 		} else {
 			$this->db->rollback();
 			$this->output = "Rollback after error\n";
 			$this->output .= $numofexpiredmembers.' expired partnership members found'."\n";
-			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail;
+			if ($erroremail) {
+				$this->output .= '. Got errors when sending some email : '.$erroremail;
+			}
 		}
 
 		return ($error ? 1 : 0);
@@ -276,7 +289,9 @@ 
 
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
-					if (!empty($partnershipsprocessed[$obj->rowid])) continue;
+					if (!empty($partnershipsprocessed[$obj->rowid])) {
+						continue;
+					}
 
 					if ($somethingdoneonpartnership >= $MAXPERCALL) {
 						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING);
@@ -321,7 +336,9 @@ 
 								// Define output language
 								$outputlangs = $langs;
 								$newlang = '';
-								if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+								if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+									$newlang = GETPOST('lang_id', 'aZ09');
+								}
 								if (!empty($newlang)) {
 									$outputlangs = new Translate("", $conf);
 									$outputlangs->setDefaultLang($newlang);
@@ -344,7 +361,9 @@ 
 								if (!$result || $cmail->error) {
 									$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
 									$this->errors[] = $cmail->error;
-									if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+									if (is_array($cmail->errors) && count($cmail->errors) > 0) {
+										$this->errors += $cmail->errors;
+									}
 								}
 							}
 						} elseif ($tmpcount > 4) { // Cancel Partnership
@@ -378,9 +397,15 @@ 
 			$this->output = "Rollback after error\n";
 		}
 		$this->output .= $numofexpiredmembers.' partnership checked'."\n";
-		if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail."\n";
-		if ($emailnotfound) $this->output .= '. Email not found for some partner : '.$emailnotfound."\n";
-		if ($websitenotfound) $this->output .= '. Website not found for some partner : '.$websitenotfound."\n";
+		if ($erroremail) {
+			$this->output .= '. Got errors when sending some email : '.$erroremail."\n";
+		}
+		if ($emailnotfound) {
+			$this->output .= '. Email not found for some partner : '.$emailnotfound."\n";
+		}
+		if ($websitenotfound) {
+			$this->output .= '. Website not found for some partner : '.$websitenotfound."\n";
+		}
 		$this->output .= "\nSQL used to find partnerships to scan: ".$sql;
 
 		return ($error ? 1 : 0);

htdocs/expedition/list.php

Spacing +5 added lines, -5 removed lines

@@ -215,7 +215,7 @@ 
 
 // If massaction is close
 if ($massaction == 'classifyclose') {
-	$error=0;
+	$error = 0;
 	$selectids = GETPOST('toselect', 'array');
 	foreach ($selectids as $selectid) {
 		//	$object->fetch($selectid);
@@ -420,7 +420,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."expeditiondet as ed, ".MAIN_DB_PREFIX."commandedet as cd WHERE ed.fk_expedition = e.rowid AND ed.fk_origin_line = cd.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -535,7 +535,7 @@ 
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 }
-if ($search_datedelivery_start)	{
+if ($search_datedelivery_start) {
 	$param .= '&search_datedelivery_startday='.urlencode(dol_print_date($search_datedelivery_start, '%d')).'&search_datedelivery_startmonth='.urlencode(dol_print_date($search_datedelivery_start, '%m')).'&search_datedelivery_startyear='.urlencode(dol_print_date($search_datedelivery_start, '%Y'));
 }
 if ($search_datedelivery_end) {
@@ -891,7 +891,7 @@ 
 
 	$shipment->id = $obj->rowid;
 	$shipment->ref = $obj->ref;
-	$shipment->shipping_method_id=$obj->fk_shipping_method;
+	$shipment->shipping_method_id = $obj->fk_shipping_method;
 
 	$companystatic->id = $obj->socid;
 	$companystatic->ref = $obj->name;
@@ -1027,7 +1027,7 @@ 
 		}
 		if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
 			// Get code using getLabelFromKey
-			$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
+			$code = $langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 			print '<td class="center tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("SendingMethod".strtoupper($code))).'">';
 			if ($shipment->shipping_method_id > 0) print $langs->trans("SendingMethod".strtoupper($code));
 			print '</td>';

Braces +3 added lines, -1 removed lines

@@ -1032,7 +1032,9 @@
 			// Get code using getLabelFromKey
 			$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 			print '<td class="center tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans("SendingMethod".strtoupper($code))).'">';
-			if ($shipment->shipping_method_id > 0) print $langs->trans("SendingMethod".strtoupper($code));
+			if ($shipment->shipping_method_id > 0) {
+				print $langs->trans("SendingMethod".strtoupper($code));
+			}
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;

htdocs/expedition/class/expeditionlinebatch.class.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
 	public $qty;
 	public $dluo_qty; // deprecated, use qty
 	public $entrepot_id;
-	public $fk_origin_stock;		// rowid in llx_product_batch table
+	public $fk_origin_stock; // rowid in llx_product_batch table
 	public $fk_expeditiondet;
 
 

Braces +3 added lines, -1 removed lines

@@ -112,7 +112,9 @@
 		global $user;
 
 		$error = 0;
-		if (!is_object($f_user)) $f_user = $user;
+		if (!is_object($f_user)) {
+			$f_user = $user;
+		}
 
 		$id_line_expdet = (int) $id_line_expdet;
 

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/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php

Spacing +1 added lines, -1 removed lines

@@ -289,7 +289,7 @@
 				dol_mkdir($conf->recruitment->dir_temp);
 				if (!is_writable($conf->recruitment->dir_temp)) {
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->recruitment->dir_temp);
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
 					return -1;
 				}
 

htdocs/hrm/evaluation_card.php

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.
@@ -465,7 +465,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')) {
@@ -521,14 +521,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;
 
@@ -544,21 +544,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++;
 			}
@@ -567,24 +567,24 @@ 
 			print '<table class="noborder 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);
 			foreach ($Tab as $t) {
 				$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>';
 			}
 

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();
+}
 
 
 /*

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/skill_tab.php

Braces +21 added lines, -7 removed lines

@@ -78,9 +78,15 @@ 
 $permissiontoadd  = $user->hasRight('hrm', 'all', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 
 // Security check (enable the most restrictive one)
-if ($user->socid > 0) accessforbidden();
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*
@@ -123,10 +129,14 @@ 
 				$skillAdded->fk_object = $id;
 				$skillAdded->objecttype = $objecttype;
 				$ret = $skillAdded->create($user);
-				if ($ret < 0) setEventMessages($skillAdded->error, null, 'errors');
+				if ($ret < 0) {
+					setEventMessages($skillAdded->error, null, 'errors');
+				}
 				//else unset($TSkillsToAdd);
 			}
-			if ($ret > 0) setEventMessages($langs->trans("SaveAddSkill"), null);
+			if ($ret > 0) {
+				setEventMessages($langs->trans("SaveAddSkill"), null);
+			}
 		}
 	} elseif ($action == 'saveSkill') {
 		if (!empty($TNote)) {
@@ -383,9 +393,13 @@ 
 	}
 
 	print '</table>';
-	if ($objecttype != 'user' && $permissiontoadd) print '<td><input class="button pull-right" type="submit" value="' . $langs->trans('SaveRank') . '"></td>';
+	if ($objecttype != 'user' && $permissiontoadd) {
+		print '<td><input class="button pull-right" type="submit" value="' . $langs->trans('SaveRank') . '"></td>';
+	}
 	print '</div>';
-	if ($objecttype != 'user' && $permissiontoadd) print '</form>';
+	if ($objecttype != 'user' && $permissiontoadd) {
+		print '</form>';
+	}
 
 
 	// liste des compétences liées

Spacing +38 added lines, -38 removed lines

@@ -29,14 +29,14 @@ 
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
-require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skillrank.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'other'));
@@ -71,7 +71,7 @@ 
 $hookmanager->initHooks(array('skilltab', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
 // Permissions
 $permissiontoread = $user->hasRight('hrm', 'all', 'read');
@@ -103,7 +103,7 @@ 
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = DOL_URL_ROOT.'/hrm/skill_list.php?id=' . ($id > 0 ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/hrm/skill_list.php?id='.($id > 0 ? $id : '__ID__');
 			}
 		}
 	}
@@ -131,7 +131,7 @@ 
 	} elseif ($action == 'saveSkill') {
 		if (!empty($TNote)) {
 			foreach ($TNote as $skillId => $rank) {
-				$TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . ((int) $id) . " AND objecttype='" . $db->escape($objecttype) . "' AND fk_skill = " . ((int) $skillId)));
+				$TSkills = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.((int) $id)." AND objecttype='".$db->escape($objecttype)."' AND fk_skill = ".((int) $skillId)));
 				if (is_array($TSkills) && !empty($TSkills)) {
 					foreach ($TSkills as $tmpObj) {
 						$tmpObj->rankorder = $rank;
@@ -140,7 +140,7 @@ 
 				}
 			}
 			setEventMessages($langs->trans("SaveLevelSkill"), null);
-			header("Location: " . DOL_URL_ROOT.'/hrm/skill_tab.php?id=' . $id. '&objecttype=job');
+			header("Location: ".DOL_URL_ROOT.'/hrm/skill_tab.php?id='.$id.'&objecttype=job');
 			exit;
 		}
 	} elseif ($action == 'confirm_deleteskill' && $confirm == 'yes') {
@@ -171,11 +171,11 @@ 
 
 	// view configuration
 	if ($objecttype == 'job') {
-		require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
 		$head = jobPrepareHead($object);
 		$listLink = dol_buildpath('/hrm/job_list.php', 1);
 	} elseif ($objecttype == "user") {
-		require_once DOL_DOCUMENT_ROOT . "/core/lib/usergroups.lib.php";
+		require_once DOL_DOCUMENT_ROOT."/core/lib/usergroups.lib.php";
 		$object->getRights();
 		$head = user_prepare_head($object);
 		$listLink = dol_buildpath('/user/list.php', 1);
@@ -191,7 +191,7 @@ 
 	}*/
 	// Confirmation to delete line
 	if ($action == 'ask_deleteskill') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&objecttype=' . $objecttype . '&lineid=' . $lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteskill', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&objecttype='.$objecttype.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteskill', '', 0, 1);
 	}
 	// Clone confirmation
 	/*if ($action == 'clone') {
@@ -216,15 +216,15 @@ 
 	// Object card
 	// ------------------------------------------------------------
 	if ($objecttype == 'job') {
-		$linkback = '<a href="' . dol_buildpath('/hrm/job_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<div class="refid">';
-		$morehtmlref.= $object->label;
+		$morehtmlref .= $object->label;
 		$morehtmlref .= '</div>';
 
 		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
 	} else {
-		$linkback = '<a href="' . $listLink . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+		$linkback = '<a href="'.$listLink.'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 		$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'&output=file&file='.urlencode(dol_sanitizeFileName($object->getFullName($langs).'.vcf')).'" class="refid" rel="noopener">';
 		$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
@@ -241,7 +241,7 @@ 
 	$TAllSkills = $static_skill->fetchAll();
 
 	// Array format for multiselectarray function
-	$TAllSkillsFormatted=array();
+	$TAllSkillsFormatted = array();
 	if (!empty($TAllSkills)) {
 		foreach ($TAllSkills as $k=>$v) {
 			$TAllSkillsFormatted[$k] = $v->label;
@@ -249,7 +249,7 @@ 
 	}
 
 	// table of skillRank linked to current object
-	$TSkillsJob = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object=' . ((int) $id) . " AND objecttype='" . $db->escape($objecttype) . "'"));
+	$TSkillsJob = $skill->fetchAll('ASC', 't.rowid', 0, 0, array('customsql' => 'fk_object='.((int) $id)." AND objecttype='".$db->escape($objecttype)."'"));
 
 	$TAlreadyUsedSkill = array();
 	if (is_array($TSkillsJob) && !empty($TSkillsJob)) {
@@ -269,11 +269,11 @@ 
 		//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
 		//unset($object->fields['fk_project']);				// Hide field already shown in banner
 		//unset($object->fields['fk_soc']);					// Hide field already shown in banner
-		$object->fields['label']['visible']=0; // Already in banner
-		include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+		$object->fields['label']['visible'] = 0; // Already in banner
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 		// Other attributes. Fields from hook formObjectOptions and Extrafields.
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 	} else {
 		// Login
 		print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
@@ -296,9 +296,9 @@ 
 		}
 		print '</tr>'."\n";
 
-		$object->fields['label']['visible']=0; // Already in banner
-		$object->fields['firstname']['visible']=0; // Already in banner
-		$object->fields['lastname']['visible']=0; // Already in banner
+		$object->fields['label']['visible'] = 0; // Already in banner
+		$object->fields['firstname']['visible'] = 0; // Already in banner
+		$object->fields['lastname']['visible'] = 0; // Already in banner
 		//include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
 
 		// Ref employee
@@ -326,19 +326,19 @@ 
 
 	if ($objecttype != 'user' && $permissiontoadd) {
 		// form pour ajouter des compétences
-		print '<form name="addSkill" method="post" action="' . $_SERVER['PHP_SELF'] . '">';
-		print '<input type="hidden" name="objecttype" value="' . $objecttype . '">';
-		print '<input type="hidden" name="id" value="' . $id . '">';
+		print '<form name="addSkill" method="post" action="'.$_SERVER['PHP_SELF'].'">';
+		print '<input type="hidden" name="objecttype" value="'.$objecttype.'">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="action" value="addSkill">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<div class="div-table-responsive-no-min">';
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
-		print '<tr><td style="width:90%">' . $langs->trans('AddSkill') . '</td><td style="width:10%"></td></tr>';
+		print '<tr><td style="width:90%">'.$langs->trans('AddSkill').'</td><td style="width:10%"></td></tr>';
 		print '<tr>';
 		print '<td>';
 		print img_picto('', 'shapes', 'class="pictofixedwidth"');
-		print $form->multiselectarray('fk_skill', array_diff_key($TAllSkillsFormatted, $TAlreadyUsedSkill), array(), 0, 0, 'widthcentpercentminusx') . '</td>';
-		print '<td><input class="button reposition" type="submit" value="' . $langs->trans('Add') . '"></td>';
+		print $form->multiselectarray('fk_skill', array_diff_key($TAllSkillsFormatted, $TAlreadyUsedSkill), array(), 0, 0, 'widthcentpercentminusx').'</td>';
+		print '<td><input class="button reposition" type="submit" value="'.$langs->trans('Add').'"></td>';
 		print '</tr>';
 		print '</table>';
 		print '</div>';
@@ -349,9 +349,9 @@ 
 	print '<div class="clearboth"></div>';
 
 	if ($objecttype != 'user' && $permissiontoadd) {
-		print '<form name="saveSkill" method="post" action="' . $_SERVER['PHP_SELF'] . '">';
-		print '<input type="hidden" name="objecttype" value="' . $objecttype . '">';
-		print '<input type="hidden" name="id" value="' . $id . '">';
+		print '<form name="saveSkill" method="post" action="'.$_SERVER['PHP_SELF'].'">';
+		print '<input type="hidden" name="objecttype" value="'.$objecttype.'">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="saveSkill">';
 	}
@@ -368,7 +368,7 @@ 
 	}
 	print '</tr>';
 	if (!is_array($TSkillsJob) || empty($TSkillsJob)) {
-		print '<tr><td><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
+		print '<tr><td><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 	} else {
 		$sk = new Skill($db);
 		foreach ($TSkillsJob as $skillElement) {
@@ -387,7 +387,7 @@ 
 			if ($objecttype != 'user' && $permissiontoadd) {
 				print '<td class="linecoledit"></td>';
 				print '<td class="linecoldelete">';
-				print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $skillElement->fk_object . '&amp;objecttype=' . $objecttype . '&amp;action=ask_deleteskill&amp;lineid=' . $skillElement->id . '">';
+				print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$skillElement->fk_object.'&amp;objecttype='.$objecttype.'&amp;action=ask_deleteskill&amp;lineid='.$skillElement->id.'">';
 				print img_delete();
 				print '</a>';
 			}
@@ -397,7 +397,7 @@ 
 	}
 
 	print '</table>';
-	if ($objecttype != 'user' && $permissiontoadd) print '<td><input class="button pull-right" type="submit" value="' . $langs->trans('SaveRank') . '"></td>';
+	if ($objecttype != 'user' && $permissiontoadd) print '<td><input class="button pull-right" type="submit" value="'.$langs->trans('SaveRank').'"></td>';
 	print '</div>';
 	if ($objecttype != 'user' && $permissiontoadd) print '</form>';