Inspection of "Daily Inspection: Merge pull request #25928 from a..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (21bcc8)

unknown

created 2023-09-15 16:51 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -273,7 +273,7 @@
 block discarded – undo
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('PrintWithoutDetailsLabelDefault');
 	print '<td colspan="2">';
-	print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="' . getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT') . '" />';
+	print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="'.getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT').'" />';
 	print "</td></tr>\n";
 }
 

Please login to merge, or discard this patch.

htdocs/accountancy/supplier/lines.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -60,7 +60,7 @@  discard block
 block discarded – undo
 $search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -216,13 +216,13 @@  discard block
 block discarded – undo
 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";

Please login to merge, or discard this patch.

htdocs/accountancy/customer/lines.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -59,7 +59,7 @@  discard block
 block discarded – undo
 $search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_country = GETPOST('search_country', 'alpha');
 $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -215,13 +215,13 @@  discard block
 block discarded – undo
 $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 }
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
-	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
 $sql .= " WHERE fd.fk_code_ventilation > 0";

Please login to merge, or discard this patch.

htdocs/hrm/skill_agenda.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -29,11 +29,11 @@  discard block
 block discarded – undo
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
 
 
 // Load translation files required by the page
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
 	$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>';
 
 

Please login to merge, or discard this patch.

htdocs/hrm/evaluation_document.php 1 patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

htdocs/hrm/skill_list.php 2 patches

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -82,7 +82,7 @@  discard block
 block discarded – undo
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
 		}
 	} else {
 		if (preg_match('/(_dtstart|_dtend)$/', $key) && $search[$key] != '') {
-			$columnName=preg_replace('/(_dtstart|_dtend)$/', '', $key);
+			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
 					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
 		$totalarray['nbfield']++;

Please login to merge, or discard this patch.

htdocs/hrm/skill_document.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -33,8 +33,8 @@  discard block
 block discarded – undo
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.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.'/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', 'companies', 'other', 'mails'));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
 	$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);

Please login to merge, or discard this patch.

htdocs/hrm/job_agenda.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

@@ -29,11 +29,11 @@  discard block
 block discarded – undo
 // Load Dolibarr environment
 require '../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'other'));
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 

Please login to merge, or discard this patch.

htdocs/hrm/job_document.php 2 patches

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

@@ -136,8 +136,12 @@
 block discarded – undo
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
 //restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
-if (empty($conf->hrm->enabled)) accessforbidden();
-if (!$permissiontoread) accessforbidden();
+if (empty($conf->hrm->enabled)) {
+	accessforbidden();
+}
+if (!$permissiontoread) {
+	accessforbidden();
+}
 
 
 /*

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -32,8 +32,8 @@  discard block
 block discarded – undo
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
 	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);

Please login to merge, or discard this patch.

		@@ -273,7 +273,7 @@
		block discarded – undo
273	273	print '<tr class="oddeven"><td>';
274	274	print $langs->trans('PrintWithoutDetailsLabelDefault');
275	275	print '<td colspan="2">';
276		- print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="' . getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT') . '" />';
	276	+ print '<input type="text" name="TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT" value="'.getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS_LABEL_DEFAULT').'" />';
277	277	print "</td></tr>\n";
278	278	}
279	279

		@@ -60,7 +60,7 @@ discard block
		block discarded – undo
60	60	$search_date_endday = GETPOST('search_date_endday', 'int');
61	61	$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
62	62	$search_date_endyear = GETPOST('search_date_endyear', 'int');
63		-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
	63	+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
64	64	$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65	65	$search_country = GETPOST('search_country', 'alpha');
66	66	$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
		@@ -216,13 +216,13 @@ discard block
		block discarded – undo
216	216	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as l";
217	217	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = l.fk_product";
218	218	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
219		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
	219	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
220	220	}
221	221	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = l.fk_code_ventilation";
222	222	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture_fourn as f ON f.rowid = l.fk_facture_fourn";
223	223	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
224	224	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
225		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
	225	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
226	226	}
227	227	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
228	228	$sql .= " WHERE f.rowid = l.fk_facture_fourn and f.fk_statut >= 1 AND l.fk_code_ventilation <> 0 ";

		@@ -136,8 +136,12 @@
		block discarded – undo
136	136	//if ($user->socid > 0) $socid = $user->socid;
137	137	//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138	138	//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139		-if (empty($conf->hrm->enabled)) accessforbidden();
140		-if (!$permissiontoread) accessforbidden();
	139	+if (empty($conf->hrm->enabled)) {
	140	+ accessforbidden();
	141	+}
	142	+if (!$permissiontoread) {
	143	+ accessforbidden();
	144	+}
141	145
142	146
143	147	/*

		@@ -136,8 +136,12 @@
		block discarded – undo
136	136	//if ($user->socid > 0) $socid = $user->socid;
137	137	//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
138	138	//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
139		-if (empty($conf->hrm->enabled)) accessforbidden();
140		-if (!$permissiontoread) accessforbidden();
	139	+if (empty($conf->hrm->enabled)) {
	140	+ accessforbidden();
	141	+}
	142	+if (!$permissiontoread) {
	143	+ accessforbidden();
	144	+}
141	145
142	146
143	147	/*

		@@ -188,13 +188,19 @@
		block discarded – undo
188	188	}
189	189
190	190	// Security check (enable the most restrictive one)
191		-if ($user->socid > 0) accessforbidden();
	191	+if ($user->socid > 0) {
	192	+ accessforbidden();
	193	+}
192	194	//if ($user->socid > 0) accessforbidden();
193	195	//$socid = 0; if ($user->socid > 0) $socid = $user->socid;
194	196	//$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
195	197	//restrictedArea($user, $object->element, $object->id, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
196		-if (empty($conf->hrm->enabled)) accessforbidden();
197		-if (!$permissiontoread) accessforbidden();
	198	+if (empty($conf->hrm->enabled)) {
	199	+ accessforbidden();
	200	+}
	201	+if (!$permissiontoread) {
	202	+ accessforbidden();
	203	+}
198	204
199	205
200	206

		@@ -59,7 +59,7 @@ discard block
		block discarded – undo
59	59	$search_date_endday = GETPOST('search_date_endday', 'int');
60	60	$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
61	61	$search_date_endyear = GETPOST('search_date_endyear', 'int');
62		-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
	62	+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
63	63	$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
64	64	$search_country = GETPOST('search_country', 'alpha');
65	65	$search_tvaintra = GETPOST('search_tvaintra', 'alpha');
		@@ -215,13 +215,13 @@ discard block
		block discarded – undo
215	215	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";
216	216	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = fd.fk_product";
217	217	if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
218		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
	218	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
219	219	}
220	220	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_account as aa ON aa.rowid = fd.fk_code_ventilation";
221	221	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = fd.fk_facture";
222	222	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = f.fk_soc";
223	223	if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
224		- $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
	224	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = ".((int) $conf->entity);
225	225	}
226	226	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as co ON co.rowid = s.fk_pays ";
227	227	$sql .= " WHERE fd.fk_code_ventilation > 0";

		@@ -29,11 +29,11 @@ discard block
		block discarded – undo
29	29	// Load Dolibarr environment
30	30	require '../main.inc.php';
31	31
32		-require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
34		-require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
35		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
36		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
	34	+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
	35	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
	36	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
37	37
38	38
39	39	// Load translation files required by the page
		@@ -152,7 +152,7 @@ discard block
		block discarded – undo
152	152	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
153	153
154	154	$morehtmlref = '<div class="refid">';
155		- $morehtmlref.= $object->label;
	155	+ $morehtmlref .= $object->label;
156	156	$morehtmlref .= '</div>';
157	157
158	158

		@@ -82,7 +82,7 @@ discard block
		block discarded – undo
82	82
83	83	// Default sort order (if not yet defined by previous GETPOST)
84	84	if (!$sortfield) {
85		- reset($object->fields); // Reset is required to avoid key() to return null.
	85	+ reset($object->fields); // Reset is required to avoid key() to return null.
86	86	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
87	87	}
88	88	if (!$sortorder) {
		@@ -271,7 +271,7 @@ discard block
		block discarded – undo
271	271	}
272	272	} else {
273	273	if (preg_match('/(_dtstart\|_dtend)$/', $key) && $search[$key] != '') {
274		- $columnName=preg_replace('/(_dtstart\|_dtend)$/', '', $key);
	274	+ $columnName = preg_replace('/(_dtstart\|_dtend)$/', '', $key);
275	275	if (preg_match('/^(date\|timestamp\|datetime)/', $object->fields[$columnName]['type'])) {
276	276	if (preg_match('/_dtstart$/', $key)) {
277	277	$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
		@@ -565,7 +565,7 @@ discard block
		block discarded – undo
565	565	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
566	566	$cssforfield .= ($cssforfield ? ' ' : '').'right';
567	567	}
568		- $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
	568	+ $cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
569	569	if (!empty($arrayfields['t.'.$key]['checked'])) {
570	570	print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
571	571	$totalarray['nbfield']++;

		@@ -33,8 +33,8 @@ discard block
		block discarded – undo
33	33	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
34	34	require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
35	35	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
36		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skill.class.php';
37		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_skill.lib.php';
	36	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skill.class.php';
	37	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_skill.lib.php';
38	38
39	39	// Load translation files required by the page
40	40	$langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	$linkback = '<a href="'.DOL_URL_ROOT.'/hrm/skill_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
132	132
133	133	$morehtmlref = '<div class="refid">';
134		- $morehtmlref.= $object->label;
	134	+ $morehtmlref .= $object->label;
135	135	$morehtmlref .= '</div>';
136	136
137	137	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);

		@@ -32,8 +32,8 @@ discard block
		block discarded – undo
32	32	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
33	33	require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
34	34	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
35		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
36		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
	35	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
	36	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
37	37
38	38	// Load translation files required by the page
39	39	$langs->loadLangs(array('hrm', 'companies', 'other', 'mails'));
		@@ -131,7 +131,7 @@ discard block
		block discarded – undo
131	131	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
132	132
133	133	$morehtmlref = '<div class="refid">';
134		- $morehtmlref.= $object->label;
	134	+ $morehtmlref .= $object->label;
135	135	$morehtmlref .= '</div>';
136	136
137	137	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref);

Dolibarr / dolibarr

Branch — develop (21bcc8)

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Braces +9 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +6 added lines, -6 removed lines patch added patch discarded remove patch

Braces +6 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch