Dolibarr / dolibarr

htdocs/eventorganization/conferenceorbooth_card.php

Spacing +2 added lines, -2 removed lines

@@ -172,7 +172,7 @@ 
 $formproject = new FormProjets($db);
 
 $title = $langs->trans("ConferenceOrBooth");
-$help_url='EN:Module_Event_Organization';
+$help_url = 'EN:Module_Event_Organization';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-eventorganization page-card');
 
@@ -650,7 +650,7 @@ 
 				if (empty($fac->paye)) {
 					$key = 'paymentlink_'.$fac->id;
 
-					print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')) . ' '. $fac->ref.'</span><br>';
+					print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')).' '.$fac->ref.'</span><br>';
 
 					$sourcetouse = 'boothlocation';
 					$reftouse = $fac->id;

htdocs/eventorganization/conferenceorbooth_document.php

Spacing +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 $form = new Form($db);
 
 $title = $langs->trans("ConferenceOrBooth").' - '.$langs->trans("Files");
-$help_url='EN:Module_Event_Organization';
+$help_url = 'EN:Module_Event_Organization';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-eventorganization page-card_documents');
 

htdocs/eventorganization/eventorganizationindex.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 $formfile = new FormFile($db);
 
 $title = $langs->trans('EventOrganizationArea');
-$help_url='EN:Module_Event_Organization';
+$help_url = 'EN:Module_Event_Organization';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-eventorganization page-index');
 

htdocs/eventorganization/conferenceorbooth_contact.php

Spacing +1 added lines, -1 removed lines

@@ -149,7 +149,7 @@
 $userstatic = new User($db);
 
 $title = $langs->trans('ConferenceOrBooth')." - ".$langs->trans('ContactsAddresses');
-$help_url='EN:Module_Event_Organization';
+$help_url = 'EN:Module_Event_Organization';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-eventorganization page-card_contact');
 

htdocs/eventorganization/conferenceorboothattendee_card.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeecard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOSTINT('lineid');
+$lineid = GETPOSTINT('lineid');
 $mode = GETPOST('mode', 'alpha');
 
 $conf_or_booth_id = GETPOSTINT('conforboothid');
@@ -205,7 +205,7 @@ 
 $formproject = new FormProjets($db);
 
 $title = $langs->trans("ConferenceOrBoothAttendee");
-$help_url='EN:Module_Event_Organization';
+$help_url = 'EN:Module_Event_Organization';
 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'mod-eventorganization page-attendee-card');
 

htdocs/webportal/class/html.formlistwebportal.class.php

Spacing +75 added lines, -75 removed lines

@@ -26,9 +26,9 @@ 
  * \brief      File of class with all html predefined components for WebPortal
  */
 
-require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/discount.class.php';
-require_once DOL_DOCUMENT_ROOT . '/webportal/class/html.formwebportal.class.php';
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webportal/class/html.formwebportal.class.php';
 
 /**
  *    Class to manage generation of HTML components
@@ -135,10 +135,10 @@ 
 		}
 
 		// load module libraries
-		dol_include_once('/webportal/class/webportal' . $elementEn . '.class.php');
+		dol_include_once('/webportal/class/webportal'.$elementEn.'.class.php');
 
 		// Initialize a technical objects
-		$objectclass = 'WebPortal' . ucfirst($elementEn);
+		$objectclass = 'WebPortal'.ucfirst($elementEn);
 		$object = new $objectclass($this->db);
 
 		// set form list
@@ -148,18 +148,18 @@ 
 		$this->sortfield = GETPOST('sortfield', 'aZ09comma');
 		$this->sortorder = GETPOST('sortorder', 'aZ09comma');
 		$this->page = GETPOSTISSET('page') ? GETPOSTINT('page') : 1;
-		$this->titleKey = $objectclass . 'ListTitle';
+		$this->titleKey = $objectclass.'ListTitle';
 
 		// Initialize array of search criteria
 		//$search_all = GETPOST('search_all', 'alphanohtml');
 		$search = array();
 		foreach ($object->fields as $key => $val) {
-			if (GETPOST('search_' . $key, 'alpha') !== '') {
-				$search[$key] = GETPOST('search_' . $key, 'alpha');
+			if (GETPOST('search_'.$key, 'alpha') !== '') {
+				$search[$key] = GETPOST('search_'.$key, 'alpha');
 			}
 			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-				$postDateStart = GETPOST('search_' . $key . '_dtstart', 'alphanohtml');
-				$postDateEnd = GETPOST('search_' . $key . '_dtend', 'alphanohtml');
+				$postDateStart = GETPOST('search_'.$key.'_dtstart', 'alphanohtml');
+				$postDateEnd = GETPOST('search_'.$key.'_dtend', 'alphanohtml');
 				// extract date YYYY-MM-DD for year, month and day
 				$dateStartArr = explode('-', $postDateStart);
 				$dateEndArr = explode('-', $postDateEnd);
@@ -167,13 +167,13 @@ 
 					$dateStartYear = (int) $dateStartArr[0];
 					$dateStartMonth = (int) $dateStartArr[1];
 					$dateStartDay = (int) $dateStartArr[2];
-					$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, $dateStartMonth, $dateStartDay, $dateStartYear);
+					$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, $dateStartMonth, $dateStartDay, $dateStartYear);
 				}
 				if (count($dateEndArr) == 3) {
 					$dateEndYear = (int) $dateEndArr[0];
 					$dateEndMonth = (int) $dateEndArr[1];
 					$dateEndDay = (int) $dateEndArr[2];
-					$search[$key . '_dtend'] = dol_mktime(23, 59, 59, $dateEndMonth, $dateEndDay, $dateEndYear);
+					$search[$key.'_dtend'] = dol_mktime(23, 59, 59, $dateEndMonth, $dateEndDay, $dateEndYear);
 				}
 			}
 		}
@@ -188,7 +188,7 @@ 
 			// If $val['visible']==0, then we never show the field
 			if (!empty($val['visible'])) {
 				$visible = (int) dol_eval($val['visible'], 1);
-				$arrayfields['t.' . $key] = array(
+				$arrayfields['t.'.$key] = array(
 					'label' => $val['label'],
 					'checked' => (($visible < 0) ? 0 : 1),
 					'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
@@ -227,8 +227,8 @@ 
 			foreach ($object->fields as $key => $val) {
 				$search[$key] = '';
 				if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-					$search[$key . '_dtstart'] = '';
-					$search[$key . '_dtend'] = '';
+					$search[$key.'_dtstart'] = '';
+					$search[$key.'_dtend'] = '';
 				}
 			}
 			$this->search = $search;
@@ -283,7 +283,7 @@ 
 		$offset = $limit * ($page - 1);
 		if (!$sortfield) {
 			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.
+			$sortfield = 't.'.key($object->fields); // Set here default search field. By default 1st field in definition.
 		}
 		if (!$sortorder) {
 			$sortorder = 'DESC';
@@ -304,18 +304,18 @@ 
 
 		$sqlfields = $sql; // $sql fields to remove for count total
 
-		$sql .= " FROM " . $this->db->prefix() . $object->table_element . " as t";
+		$sql .= " FROM ".$this->db->prefix().$object->table_element." as t";
 		// Add table from hooks
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		$sql .= $hookmanager->resPrint;
 		if ($object->ismultientitymanaged == 1) {
-			$sql .= " WHERE t.entity IN (" . getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)) . ")";
+			$sql .= " WHERE t.entity IN (".getEntity($object->element, (GETPOSTINT('search_current_entity') ? 0 : 1)).")";
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
 		// filter on logged third-party
-		$sql .= " AND t.fk_soc = " . ((int) $socid);
+		$sql .= " AND t.fk_soc = ".((int) $socid);
 		// discard record with status draft
 		$sql .= " AND t.fk_statut <> 0";
 
@@ -332,17 +332,17 @@ 
 					$mode_search = 2;
 				}
 				if ($search[$key] != '') {
-					$sql .= natural_search("t." . $this->db->escape($key), $search[$key], (($key == 'status' || $key == 'fk_statut') ? ($search[$key] < 0 ? 1 : 2) : $mode_search));
+					$sql .= natural_search("t.".$this->db->escape($key), $search[$key], (($key == 'status' || $key == 'fk_statut') ? ($search[$key] < 0 ? 1 : 2) : $mode_search));
 				}
 			} else {
 				if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$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." . $this->db->escape($columnName) . " >= '" . $this->db->idate($search[$key]) . "'";
+							$sql .= " AND t.".$this->db->escape($columnName)." >= '".$this->db->idate($search[$key])."'";
 						}
 						if (preg_match('/_dtend$/', $key)) {
-							$sql .= " AND t." . $this->db->escape($columnName) . " <= '" . $this->db->idate($search[$key]) . "'";
+							$sql .= " AND t.".$this->db->escape($columnName)." <= '".$this->db->idate($search[$key])."'";
 						}
 					}
 				}
@@ -360,7 +360,7 @@ 
 		$nbtotalofrecords = 0;
 		if (!getDolGlobalInt('MAIN_DISABLE_FULL_SCANLIST')) {
 			/* The fast and low memory method to get and count full list converts the sql into a sql count */
-			$sqlforcount = preg_replace('/^' . preg_quote($sqlfields, '/') . '/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
+			$sqlforcount = preg_replace('/^'.preg_quote($sqlfields, '/').'/', 'SELECT COUNT(*) as nbtotalofrecords', $sql);
 			$sqlforcount = preg_replace('/GROUP BY .*$/', '', $sqlforcount);
 			$resql = $this->db->query($sqlforcount);
 			if ($resql) {
@@ -413,21 +413,21 @@ 
 		}
 
 		$param = '';
-		$param .= '&contextpage=' . urlencode($contextpage);
-		$param .= '&limit=' . $limit;
+		$param .= '&contextpage='.urlencode($contextpage);
+		$param .= '&limit='.$limit;
 		foreach ($search as $key => $val) {
 			if (is_array($search[$key])) {
 				foreach ($search[$key] as $skey) {
 					if ($skey != '') {
-						$param .= '&search_' . $key . '[]=' . urlencode($skey);
+						$param .= '&search_'.$key.'[]='.urlencode($skey);
 					}
 				}
 			} elseif (preg_match('/(_dtstart|_dtend)$/', $key) && !empty($val)) {
-				$param .= '&search_' . $key . 'month=' . (GETPOSTINT('search_' . $key . 'month'));
-				$param .= '&search_' . $key . 'day=' . (GETPOSTINT('search_' . $key . 'day'));
-				$param .= '&search_' . $key . 'year=' . (GETPOSTINT('search_' . $key . 'year'));
+				$param .= '&search_'.$key.'month='.(GETPOSTINT('search_'.$key.'month'));
+				$param .= '&search_'.$key.'day='.(GETPOSTINT('search_'.$key.'day'));
+				$param .= '&search_'.$key.'year='.(GETPOSTINT('search_'.$key.'year'));
 			} elseif ($search[$key] != '') {
-				$param .= '&search_' . $key . '=' . urlencode($search[$key]);
+				$param .= '&search_'.$key.'='.urlencode($search[$key]);
 			}
 		}
 		// Add $param from hooks
@@ -436,29 +436,29 @@ 
 		$param .= $hookmanager->resPrint;
 
 		$url_file = $context->getControllerUrl($context->controller);
-		$html .= '<form method="POST" id="searchFormList" action="' . $url_file . '">' . "\n";
+		$html .= '<form method="POST" id="searchFormList" action="'.$url_file.'">'."\n";
 		$html .= $context->getFormToken();
 		$html .= '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 		$html .= '<input type="hidden" name="action" value="list">';
-		$html .= '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
-		$html .= '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
-		$html .= '<input type="hidden" name="page" value="' . $page . '">';
-		$html .= '<input type="hidden" name="contextpage" value="' . $contextpage . '">';
+		$html .= '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+		$html .= '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+		$html .= '<input type="hidden" name="page" value="'.$page.'">';
+		$html .= '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 		// pagination
-		$pagination_param = $param . '&sortfield=' . $sortfield . '&sortorder=' . $sortorder;
-		$html .= '<nav id="webportal-' . $elementEn . '-pagination">';
+		$pagination_param = $param.'&sortfield='.$sortfield.'&sortorder='.$sortorder;
+		$html .= '<nav id="webportal-'.$elementEn.'-pagination">';
 		$html .= '<ul>';
-		$html .= '<li><strong>' . $langs->trans($titleKey) . '</strong> (' . $nbtotalofrecords . ')</li>';
+		$html .= '<li><strong>'.$langs->trans($titleKey).'</strong> ('.$nbtotalofrecords.')</li>';
 		$html .= '</ul>';
 
 		/* Generate pagination list */
-		$html .= static::generatePageListNav($url_file . $pagination_param, $nbpages, $page);
+		$html .= static::generatePageListNav($url_file.$pagination_param, $nbpages, $page);
 
 		$html .= '</nav>';
 
 		// table with search filters and column titles
-		$html .= '<table id="webportal-' . $elementEn . '-list" responsive="scroll" role="grid">';
+		$html .= '<table id="webportal-'.$elementEn.'-list" responsive="scroll" role="grid">';
 		// title and desc for table
 		//if ($titleKey != '') {
 		//    $html .= '<caption id="table-collapse-responsive">';
@@ -482,22 +482,22 @@ 
 		$html .= '</td>';
 		// }
 		foreach ($object->fields as $key => $val) {
-			if (!empty($arrayfields['t.' . $key]['checked'])) {
-				$html .= '<td data-label="' . $arrayfields['t.' . $key]['label'] . '" data-col="'.dol_escape_htmltag($key).'" >';
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				$html .= '<td data-label="'.$arrayfields['t.'.$key]['label'].'" data-col="'.dol_escape_htmltag($key).'" >';
 				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-					$html .= $this->form->selectarray('search_' . $key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', '');
+					$html .= $this->form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', '');
 				} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-					$postDateStart = GETPOST('search_' . $key . '_dtstart', 'alphanohtml');
-					$postDateEnd = GETPOST('search_' . $key . '_dtend', 'alphanohtml');
+					$postDateStart = GETPOST('search_'.$key.'_dtstart', 'alphanohtml');
+					$postDateEnd = GETPOST('search_'.$key.'_dtend', 'alphanohtml');
 
 					$html .= '<div class="grid">';
-					$html .= $this->form->inputDate('search_' . $key . '_dtstart', $postDateStart ? $postDateStart : '', $langs->trans('From'));
+					$html .= $this->form->inputDate('search_'.$key.'_dtstart', $postDateStart ? $postDateStart : '', $langs->trans('From'));
 					$html .= '</div>';
 					$html .= '<div class="grid">';
-					$html .= $this->form->inputDate('search_' . $key . '_dtend', $postDateEnd ? $postDateEnd : '', $langs->trans('to'));
+					$html .= $this->form->inputDate('search_'.$key.'_dtend', $postDateEnd ? $postDateEnd : '', $langs->trans('to'));
 					$html .= '</div>';
 				} else {
-					$html .= '<input type="text" name="search_' . $key . '" value="' . dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '') . '">';
+					$html .= '<input type="text" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 				}
 				$html .= '</td>';
 			}
@@ -508,19 +508,19 @@ 
 		$html .= $hookmanager->resPrint;
 		// Remain to pay
 		if (!empty($arrayfields['remain_to_pay']['checked'])) {
-			$html .= '<td data-label="' . $arrayfields['remain_to_pay']['label'] . '">';
+			$html .= '<td data-label="'.$arrayfields['remain_to_pay']['label'].'">';
 			$html .= '</td>';
 		}
 		// Download link
 		if (!empty($arrayfields['download_link']['checked'])) {
-			$html .= '<td data-label="' . $arrayfields['download_link']['label'] . '">';
+			$html .= '<td data-label="'.$arrayfields['download_link']['label'].'">';
 			$html .= '</td>';
 		}
 		$html .= '</tr>';
 		// Signature link
 		if ($elementEn == "propal" && getDolGlobalString("PROPOSAL_ALLOW_ONLINESIGN") != 0) {
 			if (!empty($arrayfields['signature_link']['checked'])) {
-				$html .= '<td data-label="' . $arrayfields['signature_link']['label'] . '">';
+				$html .= '<td data-label="'.$arrayfields['signature_link']['label'].'">';
 				$html .= '</td>';
 			}
 		}
@@ -537,16 +537,16 @@ 
 		$totalarray['nbfield']++;
 		// }
 		foreach ($object->fields as $key => $val) {
-			$tableKey = 't.' . $key;
+			$tableKey = 't.'.$key;
 			if (!empty($arrayfields[$tableKey]['checked'])) {
 				$tableOrder = '';
 				if (array_key_exists($tableKey, $sortList)) {
 					$tableOrder = strtolower($sortList[$tableKey]);
 				}
-				$url_param = $url_file . '&sortfield=' . $tableKey . '&sortorder=' . ($tableOrder == 'desc' ? 'asc' : 'desc') . $param;
-				$html .= '<th data-col="'.dol_escape_htmltag($key).'"  scope="col"' . ($tableOrder != '' ? ' table-order="' . $tableOrder . '"' : '') . '>';
-				$html .= '<a href="' . $url_param . '">';
-				$html .= $langs->trans($arrayfields['t.' . $key]['label']);
+				$url_param = $url_file.'&sortfield='.$tableKey.'&sortorder='.($tableOrder == 'desc' ? 'asc' : 'desc').$param;
+				$html .= '<th data-col="'.dol_escape_htmltag($key).'"  scope="col"'.($tableOrder != '' ? ' table-order="'.$tableOrder.'"' : '').'>';
+				$html .= '<a href="'.$url_param.'">';
+				$html .= $langs->trans($arrayfields['t.'.$key]['label']);
 				$html .= '</a>';
 				$html .= '</th>';
 				$totalarray['nbfield']++;
@@ -627,13 +627,13 @@ 
 					$remaintopay = 0;
 				}
 				if ($object->type == Facture::TYPE_CREDIT_NOTE && $obj->paye == 1 && $discount) {
-					$remaincreditnote = $discount->getAvailableDiscounts($companyStatic, '', 'rc.fk_facture_source=' . $object->id);
+					$remaincreditnote = $discount->getAvailableDiscounts($companyStatic, '', 'rc.fk_facture_source='.$object->id);
 					$remaintopay = -$remaincreditnote;
 				}
 			}
 
 			// Show line of result
-			$html .= '<tr data-rowid="' . $object->id . '">';
+			$html .= '<tr data-rowid="'.$object->id.'">';
 			// if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 			$html .= '<td class="nowraponall">';
 			$html .= '</td>';
@@ -642,8 +642,8 @@ 
 			}
 			// }
 			foreach ($object->fields as $key => $val) {
-				if (!empty($arrayfields['t.' . $key]['checked'])) {
-					$html .= '<td class="nowraponall" data-label="' . $arrayfields['t.' . $key]['label'] . '">';
+				if (!empty($arrayfields['t.'.$key]['checked'])) {
+					$html .= '<td class="nowraponall" data-label="'.$arrayfields['t.'.$key]['label'].'">';
 					if ($key == 'status' || $key == 'fk_statut') {
 						if ($elementEn == 'invoice') {
 							// specific to get invoice status (depends on payment)
@@ -664,21 +664,21 @@ 
 					}
 					if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 						if (!$i) {
-							$totalarray['pos'][$totalarray['nbfield']] = 't.' . $key;
+							$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 						}
 						if (!isset($totalarray['val'])) {
 							$totalarray['val'] = array();
 						}
-						if (!isset($totalarray['val']['t.' . $key])) {
-							$totalarray['val']['t.' . $key] = 0;
+						if (!isset($totalarray['val']['t.'.$key])) {
+							$totalarray['val']['t.'.$key] = 0;
 						}
-						$totalarray['val']['t.' . $key] += $object->$key;
+						$totalarray['val']['t.'.$key] += $object->$key;
 					}
 				}
 			}
 			// Remain to pay
 			if (!empty($arrayfields['remain_to_pay']['checked'])) {
-				$html .= '<td class="nowraponall" data-label="' . $arrayfields['remain_to_pay']['label'] . '">';
+				$html .= '<td class="nowraponall" data-label="'.$arrayfields['remain_to_pay']['label'].'">';
 				$html .= $this->form->showOutputFieldForObject($object, $arrayfields['remain_to_pay'], 'remain_to_pay', $remaintopay, '');
 				//$html .= price($remaintopay);
 				$html .= '</td>';
@@ -689,9 +689,9 @@ 
 			// Download link
 			if (!empty($arrayfields['download_link']['checked'])) {
 				$element = $object->element;
-				$html .= '<td class="nowraponall" data-label="' . $arrayfields['download_link']['label'] . '">';
+				$html .= '<td class="nowraponall" data-label="'.$arrayfields['download_link']['label'].'">';
 				$filename = dol_sanitizeFileName($obj->ref);
-				$filedir = $conf->{$element}->multidir_output[$obj->element_entity] . '/' . dol_sanitizeFileName($obj->ref);
+				$filedir = $conf->{$element}->multidir_output[$obj->element_entity].'/'.dol_sanitizeFileName($obj->ref);
 				$html .= $this->form->getDocumentsLink($element, $filename, $filedir);
 				$html .= '</td>';
 				if (!$i) {
@@ -701,7 +701,7 @@ 
 			// Signature link
 			if ($elementEn == "propal" && getDolGlobalString("PROPOSAL_ALLOW_ONLINESIGN") != 0) {
 				if (!empty($arrayfields['signature_link']['checked'])) {
-					$html .= '<td class="nowraponall" data-label="' . $arrayfields['signature_link']['label'] . '">';
+					$html .= '<td class="nowraponall" data-label="'.$arrayfields['signature_link']['label'].'">';
 					if ($object->fk_statut == Propal::STATUS_VALIDATED) {
 						$html .= $this->form->getSignatureLink('proposal', $object);
 					}
@@ -740,7 +740,7 @@ 
 					$html .= '</td>';
 				} else {
 					if ($i == 1) {
-						$html .= '<td>' . $langs->trans("Total") . '</td>';
+						$html .= '<td>'.$langs->trans("Total").'</td>';
 					} else {
 						$html .= '<td></td>';
 					}
@@ -757,7 +757,7 @@ 
 					$colspan++;
 				}
 			}
-			$html .= '<tr><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
+			$html .= '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 		}
 
 		$html .= '</tbody>';
@@ -797,7 +797,7 @@ 
 		$html = '<ul class="pages-nav-list">';
 
 		if ($currentPage > 1) {
-			$html .= '<li><a class="pages-nav-list__icon --prev" aria-label="' . dol_escape_htmltag($langs->trans('AriaPrevPage')) . '" href="' . $url . $pSep . 'page=' . ($currentPage - 1) . '" ' . ($currentPage <= 1 ? ' disabled' : '') . '></a></li>';
+			$html .= '<li><a class="pages-nav-list__icon --prev" aria-label="'.dol_escape_htmltag($langs->trans('AriaPrevPage')).'" href="'.$url.$pSep.'page='.($currentPage - 1).'" '.($currentPage <= 1 ? ' disabled' : '').'></a></li>';
 		}
 
 		$maxPaginItem = min($nbPages, 5);
@@ -805,21 +805,21 @@ 
 		$maxPageNum = min($nbPages, $currentPage + 3);
 
 		if ($minPageNum > 1) {
-			$html .= '<li><a class="pages-nav-list__link ' . ($currentPage == 1 ? '--active' : '') . '" aria-label="' . dol_escape_htmltag($langs->trans('AriaPageX', 1)) . '" href="' . $url . $pSep . 'page=1" >1</a></li>';
+			$html .= '<li><a class="pages-nav-list__link '.($currentPage == 1 ? '--active' : '').'" aria-label="'.dol_escape_htmltag($langs->trans('AriaPageX', 1)).'" href="'.$url.$pSep.'page=1" >1</a></li>';
 			$html .= '<li>&hellip;</li>';
 		}
 
 		for ($p = $minPageNum; $p <= $maxPageNum; $p++) {
-			$html .= '<li><a class="pages-nav-list__link ' . ($currentPage === $p ? '--active' : '') . '" aria-label="' . dol_escape_htmltag($langs->trans('AriaPageX', $p)) . '"  href="' . $url . $pSep . 'page=' . $p . '">' . $p . '</a></li>';
+			$html .= '<li><a class="pages-nav-list__link '.($currentPage === $p ? '--active' : '').'" aria-label="'.dol_escape_htmltag($langs->trans('AriaPageX', $p)).'"  href="'.$url.$pSep.'page='.$p.'">'.$p.'</a></li>';
 		}
 
 		if ($maxPaginItem < $nbPages) {
 			$html .= '<li>&hellip;</li>';
-			$html .= '<li><a class="pages-nav-list__link ' . ($currentPage == $nbPages ? '--active' : '') . '" aria-label="' . dol_escape_htmltag($langs->trans('AriaPageX', $nbPages)) . '" href="' . $url . $pSep . 'page=' . $nbPages . '">' . $nbPages . '</a></li>';
+			$html .= '<li><a class="pages-nav-list__link '.($currentPage == $nbPages ? '--active' : '').'" aria-label="'.dol_escape_htmltag($langs->trans('AriaPageX', $nbPages)).'" href="'.$url.$pSep.'page='.$nbPages.'">'.$nbPages.'</a></li>';
 		}
 
 		if ($currentPage < $nbPages) {
-			$html .= '<li><a class="pages-nav-list__icon --next" aria-label="' . dol_escape_htmltag($langs->trans('AriaNextPage')) . '" href="' . $url . $pSep . 'page=' . ($currentPage + 1) . '" ' . ($currentPage >= $nbPages ? ' disabled' : '') . '></a></li>';
+			$html .= '<li><a class="pages-nav-list__icon --next" aria-label="'.dol_escape_htmltag($langs->trans('AriaNextPage')).'" href="'.$url.$pSep.'page='.($currentPage + 1).'" '.($currentPage >= $nbPages ? ' disabled' : '').'></a></li>';
 		}
 
 		$html .= '</ul>';

htdocs/hrm/skill_card.php

Spacing +100 added lines, -100 removed lines

@@ -29,15 +29,15 @@ 
 
 // 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 . '/hrm/class/skill.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.'/hrm/class/skill.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', 'products'));  // why products?
+$langs->loadLangs(array('hrm', 'other', 'products')); // why products?
 
 // Get parameters
 $id = GETPOSTINT('id');
@@ -48,7 +48,7 @@ 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'skillcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOSTINT('lineid');
+$lineid = GETPOSTINT('lineid');
 
 // Initialize a technical objects
 $object = new Skill($db);
@@ -66,8 +66,8 @@ 
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val) {
-	if (GETPOST('search_' . $key, 'alpha')) {
-		$search[$key] = GETPOST('search_' . $key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 }
 
@@ -76,13 +76,13 @@ 
 }
 
 // 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');
 $permissiontoadd    = $user->hasRight('hrm', 'all', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->hasRight('hrm', 'all', 'delete');
-$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/skill';
+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/skill';
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
@@ -119,7 +119,7 @@ 
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = DOL_URL_ROOT.'/hrm/skill_card.php?id=' . ($id > 0 ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/hrm/skill_card.php?id='.($id > 0 ? $id : '__ID__');
 			}
 		}
 	}
@@ -152,16 +152,16 @@ 
 
 
 	// Actions when linking object each other
-	include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
 	// Actions when printing a doc from card
-	include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// Action to move up and down lines of object
 	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
 
 	// Action to build doc
-	include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
 	if ($action == 'set_thirdparty' && $permissiontoadd) {
 		$object->setValueFrom('fk_soc', GETPOSTINT('fk_soc'), '', '', 'date', '', $user, $triggermodname);
@@ -173,8 +173,8 @@ 
 	// Actions to send emails
 	$triggersendname = 'HRM_SKILL_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_SKILL_TO';
-	$trackid = 'skill' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+	$trackid = 'skill'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	if ($action == 'confirm_clone' && $confirm != 'yes') {
 		$action = '';
@@ -203,25 +203,25 @@ 
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewSkill"), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("NewSkill"), '', 'object_'.$object->picto);
 
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	$backtopage .= (strpos($backtopage, '?') > 0 ? '&' : '?') ."objecttype=job";
+	$backtopage .= (strpos($backtopage, '?') > 0 ? '&' : '?')."objecttype=job";
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
 	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
 	print dol_get_fiche_head(array(), '');
 
-	print '<table class="border centpercent tableforfieldcreate">' . "\n";
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
@@ -231,15 +231,15 @@ 
 	//@todo je stop ici ... à continuer  (affichage des 5 skilled input pour create action
 	//print $object->showInputField($val, $key, $value, '', '['']', '', 0);
 
-	print '</table>' . "\n";
+	print '</table>'."\n";
 
 	print dol_get_fiche_end();
 
 	print '<div class="center">';
-	print '<input type="submit" class="button" name="add" value="' . dol_escape_htmltag($langs->trans("Create")) . '">';
+	print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
 	print '&nbsp; ';
 
-	print '<input type="' . ($backtopage ? "submit" : "button") . '" class="button button-cancel" name="cancel" value="' . dol_escape_htmltag($langs->trans("Cancel")) . '"' . ($backtopage ? '' : ' onclick="history.go(-1)"') . '>'; // Cancel for create does not post form if we don't know the backtopage
+	print '<input type="'.($backtopage ? "submit" : "button").'" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'"'.($backtopage ? '' : ' onclick="history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
 
 	print '</form>';
@@ -250,25 +250,25 @@ 
 // Part to edit record
 // and skilldet edition
 if (($id || $ref) && $action == 'edit') {
-	print load_fiche_titre($langs->trans("Skill"), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("Skill"), '', 'object_'.$object->picto);
 
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="' . $object->id . '">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
 	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
 	print dol_get_fiche_head();
 
-	print '<table class="border centpercent tableforfieldedit">' . "\n";
+	print '<table class="border centpercent tableforfieldedit">'."\n";
 
 	// Common attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
 
 	// Other attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
@@ -291,7 +291,7 @@ 
 				continue;
 			}
 
-			print '<table class="border centpercent =">' . "\n";
+			print '<table class="border centpercent =">'."\n";
 			$sk->fields = dol_sort_array($sk->fields, 'position');
 			foreach ($sk->fields as $key => $val) {
 				if (abs($val['visible']) != 1 && abs($val['visible']) != 3 && abs($val['visible']) != 4) {
@@ -302,7 +302,7 @@ 
 					continue; // We don't want this field
 				}
 
-				print '<tr class="field_' . $key . '"><td';
+				print '<tr class="field_'.$key.'"><td';
 				print ' class="titlefieldcreate';
 				if (isset($val['notnull']) && $val['notnull'] > 0) {
 					print ' fieldrequired';
@@ -337,7 +337,7 @@ 
 				if (empty($skilldetArray)) {
 					$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $sk->$key;
 				} else {
-					$value=$skilldetArray[$sk->id];
+					$value = $skilldetArray[$sk->id];
 				}
 				//
 				//              } elseif ($val['type'] == 'price') {
@@ -350,7 +350,7 @@ 
 					print $sk->showOutputField($val, $key, $value, '', '', '', 0);
 				} else {
 					/** @var Skilldet $sk */
-					print $sk->showInputField($val, $key, $value, "", "line[" . $sk->id . "]", "", "");
+					print $sk->showInputField($val, $key, $value, "", "line[".$sk->id."]", "", "");
 				}
 				print '</td>';
 				print '</tr>';
@@ -362,8 +362,8 @@ 
 
 	print dol_get_fiche_end();
 
-	print '<div class="center"><input type="submit" class="button button-save" name="save" value="' . $langs->trans("Save") . '">';
-	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
 	print '</form>';
@@ -381,11 +381,11 @@ 
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteSkill'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteSkill'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
 	// Confirmation clone
 	if ($action === 'clone') {
@@ -408,7 +408,7 @@ 
 			// array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
 		);
 		*/
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
@@ -426,11 +426,11 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?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);
 
@@ -438,10 +438,10 @@ 
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">' . "\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
-	$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';
@@ -461,7 +461,7 @@ 
 	// Buttons for actions
 
 	if ($action != 'presend' && $action != 'editline') {
-		print '<div class="tabsAction">' . "\n";
+		print '<div class="tabsAction">'."\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if ($reshook < 0) {
@@ -471,19 +471,19 @@ 
 		if (empty($reshook)) {
 			// Back to draft
 			if ($object->status == $object::STATUS_VALIDATED) {
-				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=confirm_setdraft&confirm=yes&token=' . newToken(), '', $permissiontoadd);
+				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
 			}
 
-			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 			// Clone
 			if ($permissiontoadd) {
 				print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER["PHP_SELF"].'?action=clone&token='.newToken().'&id='.$object->id, '');
 			}
 			// Delete (need delete permission, or if draft, just need create/modify permission)
-			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=delete&token=' . newToken(), '', $permissiontodelete);
+			print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete);
 		}
-		print '</div>' . "\n";
+		print '</div>'."\n";
 	}
 }
 
@@ -491,12 +491,12 @@ 
 //*---------------------------------------------------------------------------
 
 if ($action != "create" && $action != "edit") {
-	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 	// load hrm libraries
-	require_once __DIR__ . '/class/skilldet.class.php';
+	require_once __DIR__.'/class/skilldet.class.php';
 
 	// for other modules
 	//dol_include_once('/othermodule/class/otherobject.class.php');
@@ -533,8 +533,8 @@ 
 
 	// Default sort order (if not yet defined by previous GETPOST)
 	if (!$sortfield) {
-		reset($objectline->fields);                    // Reset is required to avoid key() to return null.
-		$sortfield = "t." . key($objectline->fields); // Set here default search field. By default 1st field in definition.
+		reset($objectline->fields); // Reset is required to avoid key() to return null.
+		$sortfield = "t.".key($objectline->fields); // Set here default search field. By default 1st field in definition.
 	}
 	if (!$sortorder) {
 		$sortorder = "ASC";
@@ -544,12 +544,12 @@ 
 	$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 	$search = array();
 	foreach ($objectline->fields as $key => $val) {
-		if (GETPOST('search_' . $key, 'alpha') !== '') {
-			$search[$key] = GETPOST('search_' . $key, 'alpha');
+		if (GETPOST('search_'.$key, 'alpha') !== '') {
+			$search[$key] = GETPOST('search_'.$key, 'alpha');
 		}
 		if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_' . $key . '_dtstartmonth'), GETPOSTINT('search_' . $key . '_dtstartday'), GETPOSTINT('search_' . $key . '_dtstartyear'));
-			$search[$key . '_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_' . $key . '_dtendmonth'), GETPOSTINT('search_' . $key . '_dtendday'), GETPOSTINT('search_' . $key . '_dtendyear'));
+			$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+			$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 		}
 	}
 
@@ -557,7 +557,7 @@ 
 	$fieldstosearchall = array();
 	foreach ($objectline->fields as $key => $val) {
 		if (!empty($val['searchall'])) {
-			$fieldstosearchall['t.' . $key] = $val['label'];
+			$fieldstosearchall['t.'.$key] = $val['label'];
 		}
 	}
 
@@ -567,7 +567,7 @@ 
 		// If $val['visible']==0, then we never show the field
 		if (!empty($val['visible'])) {
 			$visible = (int) dol_eval($val['visible'], 1, 1, '1');
-			$arrayfields['t.' . $key] = array(
+			$arrayfields['t.'.$key] = array(
 				'label' => $val['label'],
 				'checked' => (($visible < 0) ? 0 : 1),
 				'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
@@ -599,9 +599,9 @@ 
 	// --------------------------------------------------------------------
 	$sql = 'SELECT ';
 	$sql .= $objectline->getFieldList('t');
-	$sql .= " FROM " . MAIN_DB_PREFIX . $objectline->table_element . " as t";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$objectline->table_element." as t";
 	if ($objectline->ismultientitymanaged == 1) {
-		$sql .= " WHERE t.entity IN (" . getEntity($objectline->element) . ")";
+		$sql .= " WHERE t.entity IN (".getEntity($objectline->element).")";
 	} else {
 		$sql .= " WHERE 1 = 1 ";
 	}
@@ -611,41 +611,41 @@ 
 	$nbtotalofrecords = $db->num_rows($resql);
 	$num = $db->num_rows($resql);
 
-	print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '">' . "\n";
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
-	print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
-	print '<input type="hidden" name="page" value="' . $page . '">';
-	print '<input type="hidden" name="contextpage" value="' . $contextpage . '">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 	if (!empty($id)) {
-		print '<input type="hidden" name="id" value="' . $id . '">';
+		print '<input type="hidden" name="id" value="'.$id.'">';
 	}
 
-	$param_fk = "&fk_skill=" . $id . "&fk_user_creat=" . (!empty($user->rowid) ? $user->rowid : 0);
-	$backtopage = dol_buildpath('/hrm/skill_card.php', 1) . '?id=' . $id;
+	$param_fk = "&fk_skill=".$id."&fk_user_creat=".(!empty($user->rowid) ? $user->rowid : 0);
+	$backtopage = dol_buildpath('/hrm/skill_card.php', 1).'?id='.$id;
 	$param = "";
 	$massactionbutton = "";
 	//$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/skilldet_card.php', 1) . '?action=create&backtopage=' . urlencode($_SERVER['PHP_SELF']) . $param_fk . '&backtopage=' . $backtopage, '', $permissiontoadd);
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_' . $object->picto, 0, '', '', 0, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, '', '', 0, 0, 0, 1);
 
 	// Add code for pre mass action (confirmation or email presend form)
 	$topicmail = "SendSkilldetRef";
 	$modelmail = "skilldet";
 	$objecttmp = new Skilldet($db);
-	$trackid = 'xxxx' . $object->id;
+	$trackid = 'xxxx'.$object->id;
 	//include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($search_all) {
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
 		}
-		print '<div class="divsearchfieldfilter">' . $langs->trans("FilterOnInto", $search_all) . implode(', ', $fieldstosearchall) . '</div>';
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
 	}
 
 	$moreforfilter = '';
@@ -672,7 +672,7 @@ 
 	//  $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
-	print '<table class="tagtable nobottomiftotal liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
+	print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 	// Fields title label
@@ -689,13 +689,13 @@ 
 		//      } elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		//          $cssforfield .= ($cssforfield ? ' ' : '') . 'right';
 		//      }
-		if (!empty($arrayfields['t.' . $key]['checked'])) {
-			print getTitleFieldOfList($arrayfields['t.' . $key]['label'], 0, $_SERVER['PHP_SELF'], 't.' . $key, '', $param, (!empty($cssforfield) ? 'class="' . $cssforfield . '"' : ''), $sortfield, $sortorder, (!empty($cssforfield) ? $cssforfield . ' ' : '')) . "\n";
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, (!empty($cssforfield) ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, (!empty($cssforfield) ? $cssforfield.' ' : ''))."\n";
 		}
 	}
 	//print '<td></td>';
 	print '<td></td>';
-	print '</tr>' . "\n";
+	print '</tr>'."\n";
 
 
 	// Display all ranks of skill
@@ -738,14 +738,14 @@ 
 			//          }
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-			if (!empty($arrayfields['t.' . $key]['checked'])) {
-				print '<td' . (empty($cssforfield) ? '' : ' class="' . $cssforfield . '"') . '>';
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td'.(empty($cssforfield) ? '' : ' class="'.$cssforfield.'"').'>';
 				if ($key == 'status') {
 					print $objectline->getLibStatut(5);
 				} elseif ($key == 'rowid') {
 					print $objectline->showOutputField($val, $key, $objectline->id, '');
 					// ajout pencil
-					print '<a class="timeline-btn" href="' . DOL_MAIN_URL_ROOT . '/comm/action/skilldet_card.php?action=edit&id=' . $objectline->id . '"><i class="fa fa-pencil" title="' . $langs->trans("Modify") . '" ></i></a>';
+					print '<a class="timeline-btn" href="'.DOL_MAIN_URL_ROOT.'/comm/action/skilldet_card.php?action=edit&id='.$objectline->id.'"><i class="fa fa-pencil" title="'.$langs->trans("Modify").'" ></i></a>';
 				} else {
 					print $objectline->showOutputField($val, $key, $objectline->$key, '');
 				}
@@ -757,15 +757,15 @@ 
 				}
 				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 					if (!$i) {
-						$totalarray['pos'][$totalarray['nbfield']] = 't.' . $key;
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 					}
 					if (!isset($totalarray['val'])) {
 						$totalarray['val'] = array();
 					}
-					if (!isset($totalarray['val']['t.' . $key])) {
-						$totalarray['val']['t.' . $key] = 0;
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
 					}
-					$totalarray['val']['t.' . $key] += $objectline->$key;
+					$totalarray['val']['t.'.$key] += $objectline->$key;
 				}
 			}
 		}
@@ -798,7 +798,7 @@ 
 			$totalarray['nbfield']++;
 		}
 
-		print '</tr>' . "\n";
+		print '</tr>'."\n";
 
 		$i++;
 	}
@@ -813,7 +813,7 @@ 
 				$colspan++;
 			}
 		}
-		print '<tr><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 	}
 
 	if (!empty($resql)) {
@@ -824,10 +824,10 @@ 
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $objectline); // Note that $action and $objectline may have been modified by hook
 	print $hookmanager->resPrint;
 
-	print '</table>' . "\n";
-	print '</div>' . "\n";
+	print '</table>'."\n";
+	print '</div>'."\n";
 
-	print '</form>' . "\n";
+	print '</form>'."\n";
 
 	//  if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	//      $hidegeneratedfilelistifempty = 1;
@@ -862,9 +862,9 @@ 
 	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/skill_agenda.php?id='.$object->id);
 
 	// List of actions on element
-	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 	$formactions = new FormActions($db);
-	$somethingshown = $formactions->showactions($object, $object->element . '@' . $object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+	$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
 
 	print '</div></div>';
 }

htdocs/hrm/position.php

Spacing +124 added lines, -124 removed lines

@@ -27,33 +27,33 @@ 
 
 // 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 . '/hrm/class/position.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.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.'/hrm/class/position.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
 
 // Load translation files required by the page
 $langs->loadLangs(array("hrm", "other", 'products'));
 
-$action 	 = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction  = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files  = GETPOSTINT('show_files'); // Show files area generated by bulk actions ?
-$confirm 	 = GETPOST('confirm', 'alpha'); // Result of a confirmation
-$cancel 	 = GETPOST('cancel', 'alpha'); // We click on a Cancel button
-$toselect 	 = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'jobpositionlist'; // To manage different context of search
 $optioncss 	 = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 $backtopage  = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
-$id		 = GETPOSTINT('id');
-$ref 	 = GETPOST('ref', 'alpha');
+$id = GETPOSTINT('id');
+$ref = GETPOST('ref', 'alpha');
 $fk_job  = (GETPOSTISSET('fk_job') ? GETPOSTINT('fk_job') : $id);
 $fk_user = GETPOSTINT('fk_user');
 //$start_date = date('Y-m-d', GETPOST('date_startyear', 'int').'-'.GETPOST('date_startmonth', 'int').'-'.GETPOST('date_startday', 'int'));
@@ -64,7 +64,7 @@ 
 $limit 	     = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
 $sortfield   = GETPOST('sortfield', 'aZ09comma');
 $sortorder   = GETPOST('sortorder', 'aZ09comma');
-$page 	     = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOSTINT("page");
 if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 	// If $page is not defined, or '' or -1 or if we click on clear filters
 	$page = 0;
@@ -78,7 +78,7 @@ 
 $object = new Job($db);
 $objectposition = new Position($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('jobpositioncard', 'globalcard')); // Note that conf->hooks_modules contains array
 
 
@@ -90,8 +90,8 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($objectposition->fields);                    // Reset is required to avoid key() to return null.
-	$sortfield = "t." . key($objectposition->fields); // Set here default search field. By default 1st field in definition.
+	reset($objectposition->fields); // Reset is required to avoid key() to return null.
+	$sortfield = "t.".key($objectposition->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -101,12 +101,12 @@ 
 $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
 $search = array();
 foreach ($objectposition->fields as $key => $val) {
-	if (GETPOST('search_' . $key, 'alpha') !== '') {
-		$search[$key] = GETPOST('search_' . $key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
 	if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-		$search[$key . '_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_' . $key . '_dtstartmonth'), GETPOSTINT('search_' . $key . '_dtstartday'), GETPOSTINT('search_' . $key . '_dtstartyear'));
-		$search[$key . '_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_' . $key . '_dtendmonth'), GETPOSTINT('search_' . $key . '_dtendday'), GETPOSTINT('search_' . $key . '_dtendyear'));
+		$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOSTINT('search_'.$key.'_dtstartmonth'), GETPOSTINT('search_'.$key.'_dtstartday'), GETPOSTINT('search_'.$key.'_dtstartyear'));
+		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOSTINT('search_'.$key.'_dtendmonth'), GETPOSTINT('search_'.$key.'_dtendday'), GETPOSTINT('search_'.$key.'_dtendyear'));
 	}
 }
 
@@ -114,7 +114,7 @@ 
 $fieldstosearchall = array();
 foreach ($objectposition->fields as $key => $val) {
 	if (!empty($val['searchall'])) {
-		$fieldstosearchall['t.' . $key] = $val['label'];
+		$fieldstosearchall['t.'.$key] = $val['label'];
 	}
 }
 
@@ -124,7 +124,7 @@ 
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
 		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
-		$arrayfields['t.' . $key] = array(
+		$arrayfields['t.'.$key] = array(
 			'label' => $val['label'],
 			'checked' => (($visible < 0) ? 0 : 1),
 			'enabled' => (abs($visible) != 3 && (bool) dol_eval($val['enabled'], 1)),
@@ -134,7 +134,7 @@ 
 	}
 }
 // Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $objectposition->fields = dol_sort_array($objectposition->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -143,13 +143,13 @@ 
 
 
 // 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');
 $permissiontoadd = $user->hasRight('hrm', 'all', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->hasRight('hrm', 'all', 'delete');
-$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/position';
+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/position';
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
@@ -179,7 +179,7 @@ 
 	$backurlforlist = dol_buildpath('/hrm/position_list.php', 1);
 	$idBacktoPage = GETPOST('fk_job', 'aZ09');
 	if ($idBacktoPage > 0) {
-		$backtopage = dol_buildpath('/hrm/position.php', 1) . '?id=' . $idBacktoPage;
+		$backtopage = dol_buildpath('/hrm/position.php', 1).'?id='.$idBacktoPage;
 	}
 	if (empty($backtopage) || ($cancel && empty($id))) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
@@ -187,9 +187,9 @@ 
 				$backtopage = $backurlforlist;
 			} else {
 				if ($fk_job > 0) {
-					$backtopage = dol_buildpath('/hrm/position.php', 1) . '?fk_job=' . ($fk_job > 0 ? $fk_job : '__ID__');
+					$backtopage = dol_buildpath('/hrm/position.php', 1).'?fk_job='.($fk_job > 0 ? $fk_job : '__ID__');
 				} else {
-					$backtopage = dol_buildpath('/hrm/position_card.php', 1) . '?id=__ID__';
+					$backtopage = dol_buildpath('/hrm/position_card.php', 1).'?id=__ID__';
 				}
 			}
 		}
@@ -202,15 +202,15 @@ 
 	$object = new Position($db);
 
 	// Selection of new fields
-	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-				$search[$key . '_dtstart'] = '';
-				$search[$key . '_dtend'] = '';
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
 			}
 		}
 		$toselect = array();
@@ -225,9 +225,9 @@ 
 	$objectclass = 'Position';
 	$objectlabel = 'Position';
 	$uploaddir = $conf->hrm->dir_output;
-	include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-	include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
 	$object = $job;
 }
@@ -249,29 +249,29 @@ 
 	$object = new Position($db);
 	// Fetch optionals attributes and labels
 	$extrafields->fetch_name_optionals_label($object->table_element);
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Position")), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Position")), '', 'object_'.$object->picto);
 
-	print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
 	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
 	print dol_get_fiche_head(array(), '');
 
-	print '<table class="border centpercent tableforfieldcreate">' . "\n";
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 
 	// Other attributes
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
-	print '</table>' . "\n";
+	print '</table>'."\n";
 
 	print dol_get_fiche_end();
 
@@ -283,10 +283,10 @@ 
 }
 if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
 	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
 	// Part to show record
@@ -299,10 +299,10 @@ 
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . dol_buildpath('/hrm/position_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($fk_job) ? '&fk_job=' . $fk_job : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.dol_buildpath('/hrm/position_list.php', 1).'?restore_lastsearch_values=1'.(!empty($fk_job) ? '&fk_job='.$fk_job : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'fk_job', $linkback, 1, 'rowid', 'rowid', $morehtmlref);
@@ -311,17 +311,17 @@ 
 	print '<div class="fichecenter">';
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
-	print '<table class="border centpercent tableforfield">' . "\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
 	//$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';
 
 	print '</table>';
 	print '</div>';
@@ -344,7 +344,7 @@ 
 	// Add fields from extrafields
 	if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key . " as options_" . $key . ', ' : '');
+			$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key.', ' : '');
 		}
 	}
 	// Add fields from hooks
@@ -352,20 +352,20 @@ 
 	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 	$sql = preg_replace('/,\s*$/', '', $sql);
-	$sql .= " FROM " . MAIN_DB_PREFIX . $object->table_element . " as t";
+	$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 	if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $object->table_element . "_extrafields as ef on (t.rowid = ef.fk_object)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 	}
 	// Add table from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 	if ($object->ismultientitymanaged == 1) {
-		$sql .= " WHERE t.entity IN (" . getEntity($object->element) . ")";
+		$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 	} else {
 		$sql .= " WHERE 1 = 1";
 	}
-	$sql .= " AND t.fk_job =  " . ((int) $fk_job) . " ";
+	$sql .= " AND t.fk_job =  ".((int) $fk_job)." ";
 
 	foreach ($search as $key => $val) {
 		if (array_key_exists($key, $object->fields)) {
@@ -387,10 +387,10 @@ 
 				$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 				if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 					if (preg_match('/_dtstart$/', $key)) {
-						$sql .= " AND t." . $columnName . " >= '" . $db->idate($search[$key]) . "'";
+						$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
 					}
 					if (preg_match('/_dtend$/', $key)) {
-						$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+						$sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'";
 					}
 				}
 			}
@@ -401,7 +401,7 @@ 
 	}
 	//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
 	// Add where from extra fields
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -440,15 +440,15 @@ 
 	if ($num == 1 && getDolGlobalString('MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE') && $search_all && !$page) {
 		$obj = $db->fetch_object($resql);
 		$id = $obj->rowid;
-		header("Location: " . dol_buildpath('/hrm/position.php', 1) . '?id=' . $id);
+		header("Location: ".dol_buildpath('/hrm/position.php', 1).'?id='.$id);
 		exit;
 	}
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	$param = 'fk_job=' . $fk_job;
+	$param = 'fk_job='.$fk_job;
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-		$param .= '&contextpage=' . urlencode($contextpage);
+		$param .= '&contextpage='.urlencode($contextpage);
 	}
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.((int) $limit);
@@ -456,17 +456,17 @@ 
 	foreach ($search as $key => $val) {
 		if (is_array($search[$key]) && count($search[$key])) {
 			foreach ($search[$key] as $skey) {
-				$param .= '&search_' . $key . '[]=' . urlencode($skey);
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
 			}
 		} else {
-			$param .= '&search_' . $key . '=' . urlencode($search[$key]);
+			$param .= '&search_'.$key.'='.urlencode($search[$key]);
 		}
 	}
 	if ($optioncss != '') {
-		$param .= '&optioncss=' . urlencode($optioncss);
+		$param .= '&optioncss='.urlencode($optioncss);
 	}
 	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_param.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 	// Add $param from hooks
 	$parameters = array('param' => &$param);
 	$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -480,43 +480,43 @@ 
 		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
 	if ($permissiontodelete) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"') . $langs->trans("Delete");
+		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
 	if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete'))) {
 		$arrayofmassactions = array();
 	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	print '<form method="POST" id="searchFormList" action="' . $_SERVER["PHP_SELF"] . '?fk_job=' . $fk_job . '">' . "\n";
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'?fk_job='.$fk_job.'">'."\n";
 	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
-	print '<input type="hidden" name="token" value="' . newToken() . '">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="massaction" value="' . $massaction . '">';
-	print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';
-	print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';
-	print '<input type="hidden" name="page" value="' . $page . '">';
-	print '<input type="hidden" name="contextpage" value="' . $contextpage . '">';
+	print '<input type="hidden" name="massaction" value="'.$massaction.'">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	$newcardbutton = '';
 	$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'&fk_job='.((int) $fk_job), '', $permissiontoadd);
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_' . $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Add code for pre mass action (confirmation or email presend form)
 	$topicmail = "SendPositionRef";
 	$modelmail = "position";
 	$objecttmp = new Position($db);
-	$trackid = 'xxxx' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php';
+	$trackid = 'xxxx'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 	if ($search_all) {
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
 		}
-		print '<div class="divsearchfieldfilter">' . $langs->trans("FilterOnInto", $search_all) . implode(', ', $fieldstosearchall) . '</div>';
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).implode(', ', $fieldstosearchall).'</div>';
 	}
 
 	$moreforfilter = '';
@@ -543,7 +543,7 @@ 
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you don't need reserved height for your table
-	print '<table class="tagtable nobottomiftotal liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
+	print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Fields title search
 	// --------------------------------------------------------------------
@@ -551,35 +551,35 @@ 
 	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'right';
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
-		if (!empty($arrayfields['t.' . $key]['checked'])) {
-			print '<td class="liste_titre' . ($cssforfield ? ' ' . $cssforfield : '') . '">';
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 			if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-				print $form->selectarray('search_' . $key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+				print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 			} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 				print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
 			} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-				print '<input type="text" class="flat maxwidth75" name="search_' . $key . '" value="' . dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '') . '">';
+				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 			} elseif (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
 				print '<div class="nowrap">';
-				print $form->selectDate($search[$key . '_dtstart'] ? $search[$key . '_dtstart'] : '', "search_" . $key . "_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+				print $form->selectDate($search[$key.'_dtstart'] ? $search[$key.'_dtstart'] : '', "search_".$key."_dtstart", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
 				print '</div>';
 				print '<div class="nowrap">';
-				print $form->selectDate($search[$key . '_dtend'] ? $search[$key . '_dtend'] : '', "search_" . $key . "_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+				print $form->selectDate($search[$key.'_dtend'] ? $search[$key.'_dtend'] : '', "search_".$key."_dtend", 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
 				print '</div>';
 			}
 			print '</td>';
 		}
 	}
 	// Extra fields
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_input.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 	// Fields from hook
 	$parameters = array('arrayfields' => $arrayfields);
@@ -590,7 +590,7 @@ 
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	print '</tr>' . "\n";
+	print '</tr>'."\n";
 
 
 	// Fields title label
@@ -599,27 +599,27 @@ 
 	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'right';
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
-		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";
+		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";
 		}
 	}
 	// Extra fields
-	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
 	$parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ') . "\n";
-	print '</tr>' . "\n";
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	print '</tr>'."\n";
 
 	// Detect if we need a fetch on each output line
 	$needToFetchEachLine = 0;
@@ -651,24 +651,24 @@ 
 		foreach ($object->fields as $key => $val) {
 			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
 			} elseif ($key == 'status') {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+				$cssforfield .= ($cssforfield ? ' ' : '').'center';
 			}
 
 			if (in_array($val['type'], array('timestamp'))) {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 			} elseif ($key == 'ref') {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 			}
 
 			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
-				$cssforfield .= ($cssforfield ? ' ' : '') . 'right';
+				$cssforfield .= ($cssforfield ? ' ' : '').'right';
 			}
 			//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-			if (!empty($arrayfields['t.' . $key]['checked'])) {
-				print '<td' . ($cssforfield ? ' class="' . $cssforfield . '"' : '') . '>';
+			if (!empty($arrayfields['t.'.$key]['checked'])) {
+				print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 				if ($key == 'status') {
 					print $object->getLibStatut(5);
 				} elseif ($key == 'rowid') {
@@ -682,20 +682,20 @@ 
 				}
 				if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 					if (!$i) {
-						$totalarray['pos'][$totalarray['nbfield']] = 't.' . $key;
+						$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 					}
 					if (!isset($totalarray['val'])) {
 						$totalarray['val'] = array();
 					}
-					if (!isset($totalarray['val']['t.' . $key])) {
-						$totalarray['val']['t.' . $key] = 0;
+					if (!isset($totalarray['val']['t.'.$key])) {
+						$totalarray['val']['t.'.$key] = 0;
 					}
-					$totalarray['val']['t.' . $key] += $object->$key;
+					$totalarray['val']['t.'.$key] += $object->$key;
 				}
 			}
 		}
 		// Extra fields
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_print_fields.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
 		$parameters = array('arrayfields' => $arrayfields, 'object' => $object, 'obj' => $obj, 'i' => $i, 'totalarray' => &$totalarray);
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -707,20 +707,20 @@ 
 			if (in_array($object->id, $arrayofselected)) {
 				$selected = 1;
 			}
-			print '<input id="cb' . $object->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $object->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 
-		print '</tr>' . "\n";
+		print '</tr>'."\n";
 
 		$i++;
 	}
 
 	// Show total line
-	include DOL_DOCUMENT_ROOT . '/core/tpl/list_print_total.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
 	// If no record found
 	if ($num == 0) {
@@ -730,7 +730,7 @@ 
 				$colspan++;
 			}
 		}
-		print '<tr><td colspan="' . $colspan . '"><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 	}
 
 
@@ -740,10 +740,10 @@ 
 	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	print '</table>' . "\n";
-	print '</div>' . "\n";
+	print '</table>'."\n";
+	print '</div>'."\n";
 
-	print '</form>' . "\n";
+	print '</form>'."\n";
 
 	if (in_array('builddoc', array_keys($arrayofmassactions)) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 		$hidegeneratedfilelistifempty = 1;
@@ -751,11 +751,11 @@ 
 			$hidegeneratedfilelistifempty = 0;
 		}
 
-		require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 		$formfile = new FormFile($db);
 
 		// Show list of available documents
-		$urlsource = $_SERVER['PHP_SELF'] . '?sortfield=' . $sortfield . '&sortorder=' . $sortorder;
+		$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 		$urlsource .= str_replace('&amp;', '&', $param);
 
 		$filedir = $diroutputmassaction;

htdocs/contrat/card.php

Spacing +15 added lines, -15 removed lines

@@ -110,7 +110,7 @@ 
 $permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $user->hasRight('contrat', 'creer'); // Used by the include of actions_dellink.inc.php
 $permissiontodelete = ($user->hasRight('contrat', 'creer') && $object->statut == $object::STATUS_DRAFT) || $user->hasRight('contrat', 'supprimer');
-$permissiontoadd   = $user->hasRight('contrat', 'creer');     //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd   = $user->hasRight('contrat', 'creer'); //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontoedit = $permissiontoadd;
 $permissiontoactivate = $user->hasRight('contrat', 'activer');
 $error = 0;
@@ -155,7 +155,7 @@ 
 
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
 
-	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';  // Must be 'include', not 'include_once'
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php'; // Must be 'include', not 'include_once'
 
 	if ($action == 'confirm_active' && $confirm == 'yes' && $permissiontoactivate) {
 		$date_start = '';
@@ -533,8 +533,8 @@ 
 					$result = $prodcustprice->fetchAll('', '', 0, 0, $filter);
 					if ($result) {
 						if (count($prodcustprice->lines) > 0) {
-							$price_min =  price($prodcustprice->lines[0]->price_min);
-							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
+							$price_min = price($prodcustprice->lines[0]->price_min);
+							$price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc);
 							/*$tva_tx = $prodcustprice->lines[0]->tva_tx;
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
 								$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
@@ -767,7 +767,7 @@ 
 			// update price_ht with discount
 			// TODO Use object->updateline instead objectline->update
 
-			$price_ht =  price2num(GETPOST('elprice'), 'MU');
+			$price_ht = price2num(GETPOST('elprice'), 'MU');
 			$remise_percent = price2num(GETPOST('elremise_percent'), '', 2);
 			if ($remise_percent > 0) {
 				$remise = round(((float) $price_ht * (float) $remise_percent / 100), 2);
@@ -873,7 +873,7 @@ 
 	} elseif ($action == 'confirm_activate' && $confirm == 'yes' && $user->hasRight('contrat', 'creer')) {
 		$date_start = dol_mktime(12, 0, 0, GETPOST('d_startmonth'), GETPOST('d_startday'), GETPOST('d_startyear'));
 		$date_end   = dol_mktime(12, 0, 0, GETPOST('d_endmonth'), GETPOST('d_endday'), GETPOST('d_endyear'));
-		$comment      = GETPOST('comment', 'alpha');
+		$comment = GETPOST('comment', 'alpha');
 		$result = $object->activateAll($user, $date_start, 0, $comment, $date_end);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -1407,7 +1407,7 @@ 
 		$morehtmlref .= '<div class="refidno">';
 		// Ref customer
 		$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1, 'getFormatedCustomerRef');
+		$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_customer', $object->ref_customer, $object, $user->hasRight('contrat', 'creer'), 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1, 'getFormatedCustomerRef');
 		// Ref supplier
 		$morehtmlref .= '<br>';
 		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $user->hasRight('contrat', 'creer'), 'string', '', 0, 1);
@@ -1501,7 +1501,7 @@ 
 		}
 
 
-		$arrayothercontracts = $object->getListOfContracts('others');	// array or -1 if technical error
+		$arrayothercontracts = $object->getListOfContracts('others'); // array or -1 if technical error
 
 		/*
 		 * Lines of contracts
@@ -1739,7 +1739,7 @@ 
 					// Ligne carac
 					print '<tr class="oddeven">';
 					print '<td>';
-					$currentLineProductId=GETPOSTISSET('idprod')?GETPOST('idprod'):(!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0);
+					$currentLineProductId = GETPOSTISSET('idprod') ?GETPOST('idprod') : (!empty($object->lines[$cursorline - 1]->fk_product) ? $object->lines[$cursorline - 1]->fk_product : 0);
 					if ($objp->fk_product > 0) {
 						$canchangeproduct = 1;
 
@@ -1772,7 +1772,7 @@ 
 					if (getDolGlobalString('MAIN_INPUT_DESC_HEIGHT')) {
 						$nbrows = getDolGlobalString('MAIN_INPUT_DESC_HEIGHT');
 					}
-					$doleditor = new DolEditor('product_desc', (GETPOSTISSET('product_desc')?GETPOST('product_desc'):$objp->description), '', 92, 'dolibarr_details', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), $nbrows, '90%');
+					$doleditor = new DolEditor('product_desc', (GETPOSTISSET('product_desc') ?GETPOST('product_desc') : $objp->description), '', 92, 'dolibarr_details', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), $nbrows, '90%');
 					$doleditor->Create();
 
 					print '</td>';
@@ -1783,7 +1783,7 @@ 
 					print '</td>';
 
 					// Price
-					print '<td class="right"><input class="width50" type="text" name="elprice" value="'.(GETPOSTISSET('elprice')?GETPOST('elprice'):price($objp->subprice)).'"></td>';
+					print '<td class="right"><input class="width50" type="text" name="elprice" value="'.(GETPOSTISSET('elprice') ?GETPOST('elprice') : price($objp->subprice)).'"></td>';
 
 					// Price multicurrency
 					/*if (isModEnabled("multicurrency")) {
@@ -1791,24 +1791,24 @@ 
 					 }*/
 
 					// Quantity
-					print '<td class="center"><input size="2" type="text" name="elqty" value="'.(GETPOSTISSET('elqty')?GETPOST('elqty'):$objp->qty).'"></td>';
+					print '<td class="center"><input size="2" type="text" name="elqty" value="'.(GETPOSTISSET('elqty') ?GETPOST('elqty') : $objp->qty).'"></td>';
 
 					// Unit
 					if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
 						print '<td class="left">';
-						print $form->selectUnits((GETPOSTISSET('unit')?GETPOST('unit'):$objp->fk_unit), "unit");
+						print $form->selectUnits((GETPOSTISSET('unit') ?GETPOST('unit') : $objp->fk_unit), "unit");
 						print '</td>';
 					}
 
 					// Discount
-					print '<td class="nowrap right"><input size="1" type="text" name="elremise_percent" value="'.(GETPOSTISSET('elremise_percent')?GETPOST('elremise_percent'):$objp->remise_percent).'">%</td>';
+					print '<td class="nowrap right"><input size="1" type="text" name="elremise_percent" value="'.(GETPOSTISSET('elremise_percent') ?GETPOST('elremise_percent') : $objp->remise_percent).'">%</td>';
 
 					if (!empty($usemargins)) {
 						print '<td class="right">';
 						if ($objp->fk_product) {
 							print '<select id="fournprice" name="fournprice"></select>';
 						}
-						print '<input id="buying_price" type="text" class="width50" name="buying_price" value="'.price((GETPOSTISSET('buying_price')?GETPOST('buying_price'):$objp->pa_ht), 0, '', 0).'"></td>';
+						print '<input id="buying_price" type="text" class="width50" name="buying_price" value="'.price((GETPOSTISSET('buying_price') ?GETPOST('buying_price') : $objp->pa_ht), 0, '', 0).'"></td>';
 					}
 					print '<td class="center">';
 					print '<input type="submit" class="button margintoponly marginbottomonly" name="save" value="'.$langs->trans("Modify").'">';