Inspection of "Daily Inspection: Use rector to convert user->righ..." - Dolibarr/dolibarr - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — develop (758ccb)

unknown

created 2024-02-04 16:36 UTC

Status

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

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

Please login to merge, or discard this patch.

htdocs/hrm/position_card.php 1 patch

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

@@ -29,19 +29,19 @@  discard block
 block discarded – undo
 // 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.'/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';
 //dol_include_once('/hrm/position.php');
 
 // Get Parameters
-$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', ...
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$id 	= GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
 
 // Initialize technical objects
 $form = new Form($db);
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 $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');
 $permissiondellink = $user->hasRight('hrm', 'all', 'write'); // Used by the include of actions_dellink.inc.php
-$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();
@@ -75,10 +75,10 @@  discard block
 block discarded – undo
 
 
 // Get parameters
-$id 	= GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
 $fk_job = GETPOST('fk_job', 'int');
 
-$ref 	= GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
 
 $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('positioncard', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
 $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');
 	}
 }
 
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
 }
 
 // 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.
 
 
 /*
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/hrm/position_card.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__');
+				$backtopage = dol_buildpath('/hrm/position_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
 			}
 		}
 	}
@@ -149,19 +149,19 @@  discard block
 block discarded – undo
 	$triggermodname = 'HRM_POSITION_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
-	include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
 	// 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', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
@@ -173,8 +173,8 @@  discard block
 block discarded – undo
 	// Actions to send emails
 	$triggersendname = 'HRM_POSITION_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_POSITION_TO';
-	$trackid = 'position' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+	$trackid = 'position'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -219,36 +219,36 @@  discard block
 block discarded – undo
 
 	// Part to edit record
 	if (($id || $ref) && $action == 'edit') {
-		print load_fiche_titre($langs->trans("Position"), '', 'object_' . $object->picto);
+		print load_fiche_titre($langs->trans("Position"), '', 'object_'.$object->picto);
 
-		print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">';
-		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+		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';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
 		print '</table>';
 
 		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>';
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
 
 		// Confirmation to delete
 		if ($action == 'delete') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeletePosition'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeletePosition'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
 		}
 
 		// Call Hook formConfirm
@@ -302,18 +302,18 @@  discard block
 block discarded – undo
 		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['fk_user']['visible']=0; // Already in banner
-		$object->fields['fk_job']['visible']=0; // Already in banner
-		include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+		$object->fields['fk_user']['visible'] = 0; // Already in banner
+		$object->fields['fk_job']['visible'] = 0; // Already in banner
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 		// Other attributes. Fields from hook formObjectOptions and Extrafields.
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		print '</table>';
 		print '</div>';
@@ -332,10 +332,10 @@  discard block
 block discarded – undo
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
 
-		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);
 
 		// 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);
 	}
 }
 
@@ -373,10 +373,10 @@  discard block
 block discarded – undo
 //}
 
 
-print '</table>' . "\n";
-print '</div>' . "\n";
+print '</table>'."\n";
+print '</div>'."\n";
 
-print '</form>' . "\n";
+print '</form>'."\n";
 
 
 if ($action !== 'edit' && $action !== 'create') {
@@ -394,9 +394,9 @@  discard block
 block discarded – undo
 	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/position_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>';
 }

Please login to merge, or discard this patch.

htdocs/hrm/job_card.php 1 patch

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

@@ -29,15 +29,15 @@  discard block
 block discarded – undo
 // 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/job.class.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_job.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.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/job.class.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_job.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skillrank.class.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 = GETPOST('id', 'int');
@@ -48,12 +48,12 @@  discard block
 block discarded – undo
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'jobcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid = GETPOST('lineid', 'int');
 
 // Initialize technical objects
 $object = new Job($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('jobcard', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
 $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');
 	}
 }
 
@@ -75,13 +75,13 @@  discard block
 block discarded – undo
 }
 
 // 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] . '/job';
+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/job';
 
 // Security check (enable the most restrictive one)
 //if ($user->socid > 0) accessforbidden();
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = dol_buildpath('/hrm/job_card.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__');
+				$backtopage = dol_buildpath('/hrm/job_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
 			}
 		}
 	}
@@ -126,20 +126,20 @@  discard block
 block discarded – undo
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
 	if ($action != 'confirm_clone') {
-		include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
+		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 	}
 
 	// 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', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
@@ -151,8 +151,8 @@  discard block
 block discarded – undo
 	// Actions to send emails
 	$triggersendname = 'HRM_JOB_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_JOB_TO';
-	$trackid = 'job' . $object->id;
-	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+	$trackid = 'job'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 	if ($action == 'confirm_clone' && $confirm != 'yes') {
 		$action = '';
@@ -239,36 +239,36 @@  discard block
 block discarded – undo
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewJobProfile", $langs->transnoentities('Job')), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("NewJobProfile", $langs->transnoentities('Job')), '', '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();
 
 	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>';
@@ -278,35 +278,35 @@  discard block
 block discarded – undo
 
 // Part to edit record
 if (($id || $ref) && $action == 'edit') {
-	print load_fiche_titre($langs->trans("JobProfile"), '', 'object_' . $object->picto);
+	print load_fiche_titre($langs->trans("JobProfile"), '', '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';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
 	print '</table>';
 
 	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>';
@@ -324,11 +324,11 @@  discard block
 block discarded – undo
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteJob'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteJob'), $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);
 	}
 	// Clone confirmation
 	if ($action == 'clone') {
@@ -354,7 +354,7 @@  discard block
 block discarded – undo
 			// 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
@@ -372,10 +372,10 @@  discard block
 block discarded – undo
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="' . dol_buildpath('/hrm/job_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
+	$linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
+	$morehtmlref .= $object->label;
 	$morehtmlref .= '</div>';
 
 
@@ -391,11 +391,11 @@  discard block
 block discarded – undo
 	//$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>';
@@ -414,16 +414,16 @@  discard block
 block discarded – undo
 		// Show object lines
 		$result = $object->getLinesArray();
 
-		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
-		<input type="hidden" name="token" value="' . newToken() . '">
-		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
 		<input type="hidden" name="page_y" value="">
-		<input type="hidden" name="id" value="' . $object->id . '">
+		<input type="hidden" name="id" value="' . $object->id.'">
 		';
 
 		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
-			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
 		print '<div class="div-table-responsive-no-min">';
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
 	// 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) {
@@ -473,17 +473,17 @@  discard block
 block discarded – undo
 		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);
 
-			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=clone&token=' . newToken(), '', $permissiontoadd);
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=clone&token='.newToken(), '', $permissiontoadd);
 
 			// 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";
 	}
 
 
@@ -501,12 +501,12 @@  discard block
 block discarded – undo
 		// Documents
 		if ($includedocgeneration) {
 			$objref = dol_sanitizeFileName($object->ref);
-			$relativepath = $objref . '/' . $objref . '.pdf';
-			$filedir = $conf->hrm->dir_output . '/' . $object->element . '/' . $objref;
-			$urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->hrm->dir_output.'/'.$object->element.'/'.$objref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 			$genallowed = $user->hasRight('hrm', 'job', 'read'); // If you can read, you can build the PDF to read content
 			$delallowed = $user->hasRight('hrm', 'job', 'write'); // If you can create/edit, you can remove a file on card
-			print $formfile->showdocuments('hrm:Job', $object->element . '/' . $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+			print $formfile->showdocuments('hrm:Job', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 		}
 
 		// Show links to link elements
@@ -521,9 +521,9 @@  discard block
 block discarded – undo
 		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/job_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>';
 	}
@@ -532,9 +532,9 @@  discard block
 block discarded – undo
 	$modelmail = 'job';
 	$defaulttopic = 'InformationMessage';
 	$diroutput = $conf->hrm->dir_output;
-	$trackid = 'job' . $object->id;
+	$trackid = 'job'.$object->id;
 
-	include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page

Please login to merge, or discard this patch.

htdocs/hrm/skill_card.php 1 patch

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

@@ -29,15 +29,15 @@  discard block
 block discarded – undo
 
 // 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 = GETPOST('id', 'int');
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'skillcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$lineid = GETPOST('lineid', 'int');
 
 // Initialize technical objects
 $object = new Skill($db);
@@ -66,8 +66,8 @@  discard block
 block discarded – undo
 $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 @@  discard block
 block discarded – undo
 }
 
 // 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 @@  discard block
 block discarded – undo
 			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 @@  discard block
 block discarded – undo
 
 
 	// 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', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
@@ -173,8 +173,8 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 
 // 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 @@  discard block
 block discarded – undo
 	//@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 @@  discard block
 block discarded – undo
 // 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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 					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 @@  discard block
 block discarded – undo
 				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 @@  discard block
 block discarded – undo
 					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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 
 	// 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 @@  discard block
 block discarded – undo
 			// 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 @@  discard block
 block discarded – undo
 
 	// 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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	// 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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 //*---------------------------------------------------------------------------
 
 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 @@  discard block
 block discarded – undo
 
 	// 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 @@  discard block
 block discarded – undo
 	$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, GETPOST('search_' . $key . '_dtstartmonth', 'int'), GETPOST('search_' . $key . '_dtstartday', 'int'), GETPOST('search_' . $key . '_dtstartyear', 'int'));
-			$search[$key . '_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_' . $key . '_dtendmonth', 'int'), GETPOST('search_' . $key . '_dtendday', 'int'), GETPOST('search_' . $key . '_dtendyear', 'int'));
+			$search[$key.'_dtstart'] = dol_mktime(0, 0, 0, GETPOST('search_'.$key.'_dtstartmonth', 'int'), GETPOST('search_'.$key.'_dtstartday', 'int'), GETPOST('search_'.$key.'_dtstartyear', 'int'));
+			$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
 		}
 	}
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 		// 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' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
@@ -599,9 +599,9 @@  discard block
 block discarded – undo
 	// --------------------------------------------------------------------
 	$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 @@  discard block
 block discarded – undo
 	$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, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 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) . join(', ', $fieldstosearchall) . '</div>';
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 	}
 
 	$moreforfilter = '';
@@ -672,7 +672,7 @@  discard block
 block discarded – undo
 	//  $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 @@  discard block
 block discarded – undo
 		//      } 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 @@  discard block
 block discarded – undo
 			//          }
 			//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 @@  discard block
 block discarded – undo
 				}
 				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 @@  discard block
 block discarded – undo
 			$totalarray['nbfield']++;
 		}
 
-		print '</tr>' . "\n";
+		print '</tr>'."\n";
 
 		$i++;
 	}
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
 				$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 @@  discard block
 block discarded – undo
 	$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 @@  discard block
 block discarded – undo
 	$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>';
 }

Please login to merge, or discard this patch.

htdocs/societe/class/api_thirdparties.class.php 1 patch

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

@@ -149,7 +149,7 @@  discard block
 block discarded – undo
 
 		$sql = "SELECT t.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as t";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
 		if ($category > 0) {
 			if ($mode != 4) {
 				$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
 		}
 
 		if ($priceLevel < 1 || $priceLevel > getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
-			throw new RestException(400, 'Price level must be between 1 and ' . getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT'));
+			throw new RestException(400, 'Price level must be between 1 and '.getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT'));
 		}
 
 		if (!DolibarrApiAccess::$user->hasRight('societe', 'creer')) {

Please login to merge, or discard this patch.

htdocs/workstation/workstation_note.php 1 patch

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

@@ -45,19 +45,19 @@  discard block
 block discarded – undo
 $object = new Workstation($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('workstationnote', 'globalcard'));       // Note that conf->hooks_modules contains array
+$hookmanager->initHooks(array('workstationnote', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';     // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
 }
 
-$permissionnote = $user->hasRight('workstation', 'workstation', 'write');      // Used by the include of actions_setnotes.inc.php
-$permissiontoadd = $user->hasRight('workstation', 'workstation', 'write');     // Used by the include of actions_addupdatedelete.inc.php
+$permissionnote = $user->hasRight('workstation', 'workstation', 'write'); // Used by the include of actions_setnotes.inc.php
+$permissiontoadd = $user->hasRight('workstation', 'workstation', 'write'); // Used by the include of actions_addupdatedelete.inc.php
 
 // Security check
 $isdraft = 0;
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
  * Actions
  */
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);     // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }

Please login to merge, or discard this patch.

htdocs/don/document.php 1 patch

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

@@ -84,7 +84,7 @@
 block discarded – undo
 }
 $result = restrictedArea($user, 'don', $object->id);
 
-$permissiontoadd = $user->hasRight('don', 'creer');	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('don', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*

Please login to merge, or discard this patch.

htdocs/compta/sociales/document.php 1 patch

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

@@ -79,7 +79,7 @@
 block discarded – undo
 }
 $result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges');
 
-$permissiontoadd = $user->hasRight('tax', 'charges', 'creer');	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('tax', 'charges', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*

Please login to merge, or discard this patch.

htdocs/compta/accounting-files.php 1 patch

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

@@ -142,7 +142,7 @@  discard block
 block discarded – undo
 	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'picto'=>'bill', 'enabled' => isModEnabled('tax'), 'perms' => $user->hasRight('tax', 'charges', 'lire')),
 	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'picto'=>'salary', 'lang'=>'salaries', 'enabled' => isModEnabled('salaries'), 'perms' => $user->hasRight('salaries', 'read')),
 	'selectvariouspayment'=>array('label'=>'VariousPayment', 'picto'=>'payment', 'enabled' => isModEnabled('banque'), 'perms' => $user->hasRight('banque', 'lire')),
-	'selectloanspayment'=>array('label'=>'PaymentLoan','picto'=>'loan', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('loan', 'read')),
+	'selectloanspayment'=>array('label'=>'PaymentLoan', 'picto'=>'loan', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('loan', 'read')),
 );
 
 
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
 				$zipname .= '_'.$project->ref;
 			}
 		}
-		$zipname .='_export.zip';
+		$zipname .= '_export.zip';
 
 		dol_delete_file($zipname);
 

Please login to merge, or discard this patch.

		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	'selectsocialcontributions'=>array('label'=>'SocialContributions', 'picto'=>'bill', 'enabled' => isModEnabled('tax'), 'perms' => $user->hasRight('tax', 'charges', 'lire')),
143	143	'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'picto'=>'salary', 'lang'=>'salaries', 'enabled' => isModEnabled('salaries'), 'perms' => $user->hasRight('salaries', 'read')),
144	144	'selectvariouspayment'=>array('label'=>'VariousPayment', 'picto'=>'payment', 'enabled' => isModEnabled('banque'), 'perms' => $user->hasRight('banque', 'lire')),
145		- 'selectloanspayment'=>array('label'=>'PaymentLoan','picto'=>'loan', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('loan', 'read')),
	145	+ 'selectloanspayment'=>array('label'=>'PaymentLoan', 'picto'=>'loan', 'enabled' => isModEnabled('don'), 'perms' => $user->hasRight('loan', 'read')),
146	146	);
147	147
148	148
		@@ -522,7 +522,7 @@ discard block
		block discarded – undo
522	522	$zipname .= '_'.$project->ref;
523	523	}
524	524	}
525		- $zipname .='_export.zip';
	525	+ $zipname .= '_export.zip';
526	526
527	527	dol_delete_file($zipname);
528	528

		@@ -28,9 +28,9 @@ discard block
		block discarded – undo
28	28	// Load Dolibarr environment
29	29	require '../main.inc.php';
30	30
31		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/evaluation.class.php';
32		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_evaluation.lib.php';
	31	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/evaluation.class.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_evaluation.lib.php';
34	34
35	35
36	36	// Load translation files required by the page
		@@ -61,7 +61,7 @@ discard block
		block discarded – undo
61	61
62	62	// Permissions
63	63	$permissionnote = $user->hasRight('hrm', 'evaluation', 'write'); // Used by the include of actions_setnotes.inc.php
64		-$permissiontoread = $user->hasRight('hrm', 'evaluation', 'read'); // Used by the include of actions_addupdatedelete.inc.php
	64	+$permissiontoread = $user->hasRight('hrm', 'evaluation', 'read'); // Used by the include of actions_addupdatedelete.inc.php
65	65
66	66	// Security check (enable the most restrictive one)
67	67	//if ($user->socid > 0) accessforbidden();

		@@ -29,19 +29,19 @@ discard block
		block discarded – undo
29	29	// Load Dolibarr environment
30	30	require '../main.inc.php';
31	31
32		-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
34		-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
35		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/position.class.php';
36		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/job.class.php';
37		-require_once DOL_DOCUMENT_ROOT . '/hrm/lib/hrm_position.lib.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
	34	+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
	35	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/position.class.php';
	36	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/job.class.php';
	37	+require_once DOL_DOCUMENT_ROOT.'/hrm/lib/hrm_position.lib.php';
38	38	//dol_include_once('/hrm/position.php');
39	39
40	40	// Get Parameters
41		-$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
	41	+$action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
42	42	$backtopage = GETPOST('backtopage', 'alpha');
43	43	$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
44		-$id = GETPOST('id', 'int');
	44	+$id = GETPOST('id', 'int');
45	45
46	46	// Initialize technical objects
47	47	$form = new Form($db);
		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	$permissiontoadd = $user->hasRight('hrm', 'all', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
57	57	$permissiontodelete = $user->hasRight('hrm', 'all', 'delete');
58	58	$permissiondellink = $user->hasRight('hrm', 'all', 'write'); // Used by the include of actions_dellink.inc.php
59		-$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/position';
	59	+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/position';
60	60
61	61	// Security check (enable the most restrictive one)
62	62	//if ($user->socid > 0) accessforbidden();
		@@ -75,10 +75,10 @@ discard block
		block discarded – undo
75	75
76	76
77	77	// Get parameters
78		-$id = GETPOST('id', 'int');
	78	+$id = GETPOST('id', 'int');
79	79	$fk_job = GETPOST('fk_job', 'int');
80	80
81		-$ref = GETPOST('ref', 'alpha');
	81	+$ref = GETPOST('ref', 'alpha');
82	82	$action = GETPOST('action', 'aZ09');
83	83	$confirm = GETPOST('confirm', 'alpha');
84	84	$cancel = GETPOST('cancel', 'aZ09');
		@@ -96,7 +96,7 @@ discard block
		block discarded – undo
96	96
97	97	$extrafields = new ExtraFields($db);
98	98
99		-$diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
	99	+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
100	100	$hookmanager->initHooks(array('positioncard', 'globalcard')); // Note that conf->hooks_modules contains array
101	101
102	102	// Fetch optionals attributes and labels
		@@ -108,8 +108,8 @@ discard block
		block discarded – undo
108	108	$search_all = GETPOST("search_all", 'alpha');
109	109	$search = array();
110	110	foreach ($object->fields as $key => $val) {
111		- if (GETPOST('search_' . $key, 'alpha')) {
112		- $search[$key] = GETPOST('search_' . $key, 'alpha');
	111	+ if (GETPOST('search_'.$key, 'alpha')) {
	112	+ $search[$key] = GETPOST('search_'.$key, 'alpha');
113	113	}
114	114	}
115	115
		@@ -118,7 +118,7 @@ discard block
		block discarded – undo
118	118	}
119	119
120	120	// Load object
121		-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
	121	+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
122	122
123	123
124	124	/*
		@@ -141,7 +141,7 @@ discard block
		block discarded – undo
141	141	if (empty($id) && (($action != 'add' && $action != 'create') \|\| $cancel)) {
142	142	$backtopage = $backurlforlist;
143	143	} else {
144		- $backtopage = dol_buildpath('/hrm/position_card.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__');
	144	+ $backtopage = dol_buildpath('/hrm/position_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
145	145	}
146	146	}
147	147	}
		@@ -149,19 +149,19 @@ discard block
		block discarded – undo
149	149	$triggermodname = 'HRM_POSITION_MODIFY'; // Name of trigger action code to execute when we modify record
150	150
151	151	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
152		- include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
	152	+ include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
153	153
154	154	// Actions when linking object each other
155		- include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
	155	+ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
156	156
157	157	// Actions when printing a doc from card
158		- include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php';
	158	+ include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
159	159
160	160	// Action to move up and down lines of object
161	161	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
162	162
163	163	// Action to build doc
164		- include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
	164	+ include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
165	165
166	166	if ($action == 'set_thirdparty' && $permissiontoadd) {
167	167	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
		@@ -173,8 +173,8 @@ discard block
		block discarded – undo
173	173	// Actions to send emails
174	174	$triggersendname = 'HRM_POSITION_SENTBYMAIL';
175	175	$autocopy = 'MAIN_MAIL_AUTOCOPY_POSITION_TO';
176		- $trackid = 'position' . $object->id;
177		- include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
	176	+ $trackid = 'position'.$object->id;
	177	+ include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
178	178	}
179	179
180	180
		@@ -219,36 +219,36 @@ discard block
		block discarded – undo
219	219
220	220	// Part to edit record
221	221	if (($id \|\| $ref) && $action == 'edit') {
222		- print load_fiche_titre($langs->trans("Position"), '', 'object_' . $object->picto);
	222	+ print load_fiche_titre($langs->trans("Position"), '', 'object_'.$object->picto);
223	223
224		- print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">';
225		- print '<input type="hidden" name="token" value="' . newToken() . '">';
	224	+ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
	225	+ print '<input type="hidden" name="token" value="'.newToken().'">';
226	226	print '<input type="hidden" name="action" value="update">';
227		- print '<input type="hidden" name="id" value="' . $object->id . '">';
	227	+ print '<input type="hidden" name="id" value="'.$object->id.'">';
228	228
229	229	if ($backtopage) {
230		- print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
	230	+ print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
231	231	}
232	232	if ($backtopageforcancel) {
233		- print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
	233	+ print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
234	234	}
235	235
236	236	print dol_get_fiche_head();
237	237
238		- print '<table class="border centpercent tableforfieldedit">' . "\n";
	238	+ print '<table class="border centpercent tableforfieldedit">'."\n";
239	239
240	240	// Common attributes
241		- include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
	241	+ include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
242	242
243	243	// Other attributes
244		- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
	244	+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
245	245
246	246	print '</table>';
247	247
248	248	print dol_get_fiche_end();
249	249
250		- print '<div class="center"><input type="submit" class="button button-save" name="save" value="' . $langs->trans("Save") . '">';
251		- print '   <input type="submit" class="button button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
	250	+ print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
	251	+ print '   <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
252	252	print '</div>';
253	253
254	254	print '</form>';
		@@ -267,7 +267,7 @@ discard block
		block discarded – undo
267	267
268	268	// Confirmation to delete
269	269	if ($action == 'delete') {
270		- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeletePosition'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
	270	+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeletePosition'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
271	271	}
272	272
273	273	// Call Hook formConfirm
		@@ -302,18 +302,18 @@ discard block
		block discarded – undo
302	302	print '<div class="fichecenter">';
303	303	print '<div class="fichehalfleft">';
304	304	print '<div class="underbanner clearboth"></div>';
305		- print '<table class="border centpercent tableforfield">' . "\n";
	305	+ print '<table class="border centpercent tableforfield">'."\n";
306	306
307	307	// Common attributes
308	308	//$keyforbreak='fieldkeytoswitchonsecondcolumn'; // We change column just before this field
309	309	//unset($object->fields['fk_project']); // Hide field already shown in banner
310	310	//unset($object->fields['fk_soc']); // Hide field already shown in banner
311		- $object->fields['fk_user']['visible']=0; // Already in banner
312		- $object->fields['fk_job']['visible']=0; // Already in banner
313		- include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
	311	+ $object->fields['fk_user']['visible'] = 0; // Already in banner
	312	+ $object->fields['fk_job']['visible'] = 0; // Already in banner
	313	+ include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
314	314
315	315	// Other attributes. Fields from hook formObjectOptions and Extrafields.
316		- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
	316	+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
317	317
318	318	print '</table>';
319	319	print '</div>';
		@@ -332,10 +332,10 @@ discard block
		block discarded – undo
332	332	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
333	333
334	334
335		- print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
	335	+ print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
336	336
337	337	// Delete (need delete permission, or if draft, just need create/modify permission)
338		- print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=delete&token=' . newToken(), '', $permissiontodelete);
	338	+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete);
339	339	}
340	340	}
341	341
		@@ -373,10 +373,10 @@ discard block
		block discarded – undo
373	373	//}
374	374
375	375
376		-print '</table>' . "\n";
377		-print '</div>' . "\n";
	376	+print '</table>'."\n";
	377	+print '</div>'."\n";
378	378
379		-print '</form>' . "\n";
	379	+print '</form>'."\n";
380	380
381	381
382	382	if ($action !== 'edit' && $action !== 'create') {
		@@ -394,9 +394,9 @@ discard block
		block discarded – undo
394	394	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/position_agenda.php?id='.$object->id);
395	395
396	396	// List of actions on element
397		- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
	397	+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
398	398	$formactions = new FormActions($db);
399		- $somethingshown = $formactions->showactions($object, $object->element . '@' . $object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
	399	+ $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
400	400
401	401	print '</div></div>';
402	402	}

		@@ -29,15 +29,15 @@ discard block
		block discarded – undo
29	29	// Load Dolibarr environment
30	30	require '../main.inc.php';
31	31
32		-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
33		-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
34		-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.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';
37		-require_once DOL_DOCUMENT_ROOT . '/hrm/class/skillrank.class.php';
	32	+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
	33	+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
	34	+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.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';
	37	+require_once DOL_DOCUMENT_ROOT.'/hrm/class/skillrank.class.php';
38	38
39	39	// Load translation files required by the page
40		-$langs->loadLangs(array('hrm', 'other', 'products')); // why products?
	40	+$langs->loadLangs(array('hrm', 'other', 'products')); // why products?
41	41
42	42	// Get parameters
43	43	$id = GETPOST('id', 'int');
		@@ -48,12 +48,12 @@ discard block
		block discarded – undo
48	48	$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'jobcard'; // To manage different context of search
49	49	$backtopage = GETPOST('backtopage', 'alpha');
50	50	$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
51		-$lineid = GETPOST('lineid', 'int');
	51	+$lineid = GETPOST('lineid', 'int');
52	52
53	53	// Initialize technical objects
54	54	$object = new Job($db);
55	55	$extrafields = new ExtraFields($db);
56		-$diroutputmassaction = $conf->hrm->dir_output . '/temp/massgeneration/' . $user->id;
	56	+$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
57	57	$hookmanager->initHooks(array('jobcard', 'globalcard')); // Note that conf->hooks_modules contains array
58	58
59	59	// Fetch optionals attributes and labels
		@@ -65,8 +65,8 @@ discard block
		block discarded – undo
65	65	$search_all = GETPOST("search_all", 'alpha');
66	66	$search = array();
67	67	foreach ($object->fields as $key => $val) {
68		- if (GETPOST('search_' . $key, 'alpha')) {
69		- $search[$key] = GETPOST('search_' . $key, 'alpha');
	68	+ if (GETPOST('search_'.$key, 'alpha')) {
	69	+ $search[$key] = GETPOST('search_'.$key, 'alpha');
70	70	}
71	71	}
72	72
		@@ -75,13 +75,13 @@ discard block
		block discarded – undo
75	75	}
76	76
77	77	// Load object
78		-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
	78	+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
79	79
80	80	// Permissions
81	81	$permissiontoread = $user->hasRight('hrm', 'all', 'read');
82	82	$permissiontoadd = $user->hasRight('hrm', 'all', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
83	83	$permissiontodelete = $user->hasRight('hrm', 'all', 'delete');
84		-$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1] . '/job';
	84	+$upload_dir = $conf->hrm->multidir_output[isset($object->entity) ? $object->entity : 1].'/job';
85	85
86	86	// Security check (enable the most restrictive one)
87	87	//if ($user->socid > 0) accessforbidden();
		@@ -116,7 +116,7 @@ discard block
		block discarded – undo
116	116	if (empty($id) && (($action != 'add' && $action != 'create') \|\| $cancel)) {
117	117	$backtopage = $backurlforlist;
118	118	} else {
119		- $backtopage = dol_buildpath('/hrm/job_card.php', 1) . '?id=' . ($id > 0 ? $id : '__ID__');
	119	+ $backtopage = dol_buildpath('/hrm/job_card.php', 1).'?id='.($id > 0 ? $id : '__ID__');
120	120	}
121	121	}
122	122	}
		@@ -126,20 +126,20 @@ discard block
		block discarded – undo
126	126
127	127	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
128	128	if ($action != 'confirm_clone') {
129		- include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
	129	+ include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
130	130	}
131	131
132	132	// Actions when linking object each other
133		- include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
	133	+ include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
134	134
135	135	// Actions when printing a doc from card
136		- include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php';
	136	+ include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
137	137
138	138	// Action to move up and down lines of object
139	139	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
140	140
141	141	// Action to build doc
142		- include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';
	142	+ include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
143	143
144	144	if ($action == 'set_thirdparty' && $permissiontoadd) {
145	145	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
		@@ -151,8 +151,8 @@ discard block
		block discarded – undo
151	151	// Actions to send emails
152	152	$triggersendname = 'HRM_JOB_SENTBYMAIL';
153	153	$autocopy = 'MAIN_MAIL_AUTOCOPY_JOB_TO';
154		- $trackid = 'job' . $object->id;
155		- include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
	154	+ $trackid = 'job'.$object->id;
	155	+ include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
156	156
157	157	if ($action == 'confirm_clone' && $confirm != 'yes') {
158	158	$action = '';
		@@ -239,36 +239,36 @@ discard block
		block discarded – undo
239	239
240	240	// Part to create
241	241	if ($action == 'create') {
242		- print load_fiche_titre($langs->trans("NewJobProfile", $langs->transnoentities('Job')), '', 'object_' . $object->picto);
	242	+ print load_fiche_titre($langs->trans("NewJobProfile", $langs->transnoentities('Job')), '', 'object_'.$object->picto);
243	243
244		- print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
245		- print '<input type="hidden" name="token" value="' . newToken() . '">';
	244	+ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
	245	+ print '<input type="hidden" name="token" value="'.newToken().'">';
246	246	print '<input type="hidden" name="action" value="add">';
247	247	if ($backtopage) {
248		- print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
	248	+ print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
249	249	}
250	250	if ($backtopageforcancel) {
251		- print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
	251	+ print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
252	252	}
253	253
254	254	print dol_get_fiche_head(array(), '');
255	255
256		- print '<table class="border centpercent tableforfieldcreate">' . "\n";
	256	+ print '<table class="border centpercent tableforfieldcreate">'."\n";
257	257
258	258	// Common attributes
259		- include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
	259	+ include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
260	260
261	261	// Other attributes
262		- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
	262	+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
263	263
264		- print '</table>' . "\n";
	264	+ print '</table>'."\n";
265	265
266	266	print dol_get_fiche_end();
267	267
268	268	print '<div class="center">';
269		- print '<input type="submit" class="button" name="add" value="' . dol_escape_htmltag($langs->trans("Create")) . '">';
	269	+ print '<input type="submit" class="button" name="add" value="'.dol_escape_htmltag($langs->trans("Create")).'">';
270	270	print '  ';
271		- 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
	271	+ 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
272	272	print '</div>';
273	273
274	274	print '</form>';
		@@ -278,35 +278,35 @@ discard block
		block discarded – undo
278	278
279	279	// Part to edit record
280	280	if (($id \|\| $ref) && $action == 'edit') {
281		- print load_fiche_titre($langs->trans("JobProfile"), '', 'object_' . $object->picto);
	281	+ print load_fiche_titre($langs->trans("JobProfile"), '', 'object_'.$object->picto);
282	282
283		- print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '">';
284		- print '<input type="hidden" name="token" value="' . newToken() . '">';
	283	+ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
	284	+ print '<input type="hidden" name="token" value="'.newToken().'">';
285	285	print '<input type="hidden" name="action" value="update">';
286		- print '<input type="hidden" name="id" value="' . $object->id . '">';
	286	+ print '<input type="hidden" name="id" value="'.$object->id.'">';
287	287	if ($backtopage) {
288		- print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
	288	+ print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
289	289	}
290	290	if ($backtopageforcancel) {
291		- print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
	291	+ print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
292	292	}
293	293
294	294	print dol_get_fiche_head();
295	295
296		- print '<table class="border centpercent tableforfieldedit">' . "\n";
	296	+ print '<table class="border centpercent tableforfieldedit">'."\n";
297	297
298	298	// Common attributes
299		- include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
	299	+ include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
300	300
301	301	// Other attributes
302		- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
	302	+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
303	303
304	304	print '</table>';
305	305
306	306	print dol_get_fiche_end();
307	307
308		- print '<div class="center"><input type="submit" class="button button-save" name="save" value="' . $langs->trans("Save") . '">';
309		- print '   <input type="submit" class="button button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
	308	+ print '<div class="center"><input type="submit" class="button button-save" name="save" value="'.$langs->trans("Save").'">';
	309	+ print '   <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
310	310	print '</div>';
311	311
312	312	print '</form>';
		@@ -324,11 +324,11 @@ discard block
		block discarded – undo
324	324
325	325	// Confirmation to delete
326	326	if ($action == 'delete') {
327		- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteJob'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
	327	+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteJob'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
328	328	}
329	329	// Confirmation to delete line
330	330	if ($action == 'deleteline') {
331		- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
	331	+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
332	332	}
333	333	// Clone confirmation
334	334	if ($action == 'clone') {
		@@ -354,7 +354,7 @@ discard block
		block discarded – undo
354	354	// array('type' => 'other', 'name' => 'idwarehouse', 'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
355	355	);
356	356	*/
357		- $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
	357	+ $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
358	358	}
359	359
360	360	// Call Hook formConfirm
		@@ -372,10 +372,10 @@ discard block
		block discarded – undo
372	372
373	373	// Object card
374	374	// ------------------------------------------------------------
375		- $linkback = '<a href="' . dol_buildpath('/hrm/job_list.php', 1) . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
	375	+ $linkback = '<a href="'.dol_buildpath('/hrm/job_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
376	376
377	377	$morehtmlref = '<div class="refid">';
378		- $morehtmlref.= $object->label;
	378	+ $morehtmlref .= $object->label;
379	379	$morehtmlref .= '</div>';
380	380
381	381
		@@ -391,11 +391,11 @@ discard block
		block discarded – undo
391	391	//$keyforbreak='fieldkeytoswitchonsecondcolumn'; // We change column just before this field
392	392	//unset($object->fields['fk_project']); // Hide field already shown in banner
393	393	//unset($object->fields['fk_soc']); // Hide field already shown in banner
394		- $object->fields['label']['visible']=0; // Already in banner
395		- include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
	394	+ $object->fields['label']['visible'] = 0; // Already in banner
	395	+ include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
396	396
397	397	// Other attributes. Fields from hook formObjectOptions and Extrafields.
398		- include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
	398	+ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
399	399
400	400	print '</table>';
401	401	print '</div>';
		@@ -414,16 +414,16 @@ discard block
		block discarded – undo
414	414	// Show object lines
415	415	$result = $object->getLinesArray();
416	416
417		- print ' <form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
418		- <input type="hidden" name="token" value="' . newToken() . '">
419		- <input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
	417	+ print ' <form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
	418	+ <input type="hidden" name="token" value="' . newToken().'">
	419	+ <input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
420	420	<input type="hidden" name="mode" value="">
421	421	<input type="hidden" name="page_y" value="">
422		- <input type="hidden" name="id" value="' . $object->id . '">
	422	+ <input type="hidden" name="id" value="' . $object->id.'">
423	423	';
424	424
425	425	if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
426		- include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
	426	+ include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
427	427	}
428	428
429	429	print '<div class="div-table-responsive-no-min">';
		@@ -463,7 +463,7 @@ discard block
		block discarded – undo
463	463	// Buttons for actions
464	464
465	465	if ($action != 'presend' && $action != 'editline') {
466		- print '<div class="tabsAction">' . "\n";
	466	+ print '<div class="tabsAction">'."\n";
467	467	$parameters = array();
468	468	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
469	469	if ($reshook < 0) {
		@@ -473,17 +473,17 @@ discard block
		block discarded – undo
473	473	if (empty($reshook)) {
474	474	// Back to draft
475	475	if ($object->status == $object::STATUS_VALIDATED) {
476		- print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=confirm_setdraft&confirm=yes&token=' . newToken(), '', $permissiontoadd);
	476	+ print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
477	477	}
478	478
479		- print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
	479	+ print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
480	480
481		- print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=clone&token=' . newToken(), '', $permissiontoadd);
	481	+ print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=clone&token='.newToken(), '', $permissiontoadd);
482	482
483	483	// Delete (need delete permission, or if draft, just need create/modify permission)
484		- print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=delete&token=' . newToken(), '', $permissiontodelete);
	484	+ print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken(), '', $permissiontodelete);
485	485	}
486		- print '</div>' . "\n";
	486	+ print '</div>'."\n";
487	487	}
488	488
489	489
		@@ -501,12 +501,12 @@ discard block
		block discarded – undo
501	501	// Documents
502	502	if ($includedocgeneration) {
503	503	$objref = dol_sanitizeFileName($object->ref);
504		- $relativepath = $objref . '/' . $objref . '.pdf';
505		- $filedir = $conf->hrm->dir_output . '/' . $object->element . '/' . $objref;
506		- $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;
	504	+ $relativepath = $objref.'/'.$objref.'.pdf';
	505	+ $filedir = $conf->hrm->dir_output.'/'.$object->element.'/'.$objref;
	506	+ $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
507	507	$genallowed = $user->hasRight('hrm', 'job', 'read'); // If you can read, you can build the PDF to read content
508	508	$delallowed = $user->hasRight('hrm', 'job', 'write'); // If you can create/edit, you can remove a file on card
509		- print $formfile->showdocuments('hrm:Job', $object->element . '/' . $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
	509	+ print $formfile->showdocuments('hrm:Job', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
510	510	}
511	511
512	512	// Show links to link elements
		@@ -521,9 +521,9 @@ discard block
		block discarded – undo
521	521	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/job_agenda.php?id='.$object->id);
522	522
523	523	// List of actions on element
524		- include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
	524	+ include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
525	525	$formactions = new FormActions($db);
526		- $somethingshown = $formactions->showactions($object, $object->element . '@' . $object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
	526	+ $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
527	527
528	528	print '</div></div>';
529	529	}
		@@ -532,9 +532,9 @@ discard block
		block discarded – undo
532	532	$modelmail = 'job';
533	533	$defaulttopic = 'InformationMessage';
534	534	$diroutput = $conf->hrm->dir_output;
535		- $trackid = 'job' . $object->id;
	535	+ $trackid = 'job'.$object->id;
536	536
537		- include DOL_DOCUMENT_ROOT . '/core/tpl/card_presend.tpl.php';
	537	+ include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
538	538	}
539	539
540	540	// End of page

		@@ -149,7 +149,7 @@ discard block
		block discarded – undo
149	149
150	150	$sql = "SELECT t.rowid";
151	151	$sql .= " FROM ".MAIN_DB_PREFIX."societe as t";
152		- $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
	152	+ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields AS ef ON ef.fk_object = t.rowid"; // So we will be able to filter on extrafields
153	153	if ($category > 0) {
154	154	if ($mode != 4) {
155	155	$sql .= ", ".MAIN_DB_PREFIX."categorie_societe as c";
		@@ -439,7 +439,7 @@ discard block
		block discarded – undo
439	439	}
440	440
441	441	if ($priceLevel < 1 \|\| $priceLevel > getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT')) {
442		- throw new RestException(400, 'Price level must be between 1 and ' . getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT'));
	442	+ throw new RestException(400, 'Price level must be between 1 and '.getDolGlobalString('PRODUIT_MULTIPRICES_LIMIT'));
443	443	}
444	444
445	445	if (!DolibarrApiAccess::$user->hasRight('societe', 'creer')) {

		@@ -45,19 +45,19 @@ discard block
		block discarded – undo
45	45	$object = new Workstation($db);
46	46	$extrafields = new ExtraFields($db);
47	47	$diroutputmassaction = $conf->workstation->dir_output.'/temp/massgeneration/'.$user->id;
48		-$hookmanager->initHooks(array('workstationnote', 'globalcard')); // Note that conf->hooks_modules contains array
	48	+$hookmanager->initHooks(array('workstationnote', 'globalcard')); // Note that conf->hooks_modules contains array
49	49
50	50	// Fetch optionals attributes and labels
51	51	$extrafields->fetch_name_optionals_label($object->table_element);
52	52
53	53	// Load object
54		-include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
	54	+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
55	55	if ($id > 0 \|\| !empty($ref)) {
56	56	$upload_dir = $conf->workstation->multidir_output[$object->entity]."/".$object->id;
57	57	}
58	58
59		-$permissionnote = $user->hasRight('workstation', 'workstation', 'write'); // Used by the include of actions_setnotes.inc.php
60		-$permissiontoadd = $user->hasRight('workstation', 'workstation', 'write'); // Used by the include of actions_addupdatedelete.inc.php
	59	+$permissionnote = $user->hasRight('workstation', 'workstation', 'write'); // Used by the include of actions_setnotes.inc.php
	60	+$permissiontoadd = $user->hasRight('workstation', 'workstation', 'write'); // Used by the include of actions_addupdatedelete.inc.php
61	61
62	62	// Security check
63	63	$isdraft = 0;
		@@ -68,7 +68,7 @@ discard block
		block discarded – undo
68	68	* Actions
69	69	*/
70	70	$parameters = array();
71		-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
	71	+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
72	72	if ($reshook < 0) {
73	73	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
74	74	}

		@@ -84,7 +84,7 @@
		block discarded – undo
84	84	}
85	85	$result = restrictedArea($user, 'don', $object->id);
86	86
87		-$permissiontoadd = $user->hasRight('don', 'creer'); // Used by the include of actions_dellink.inc.php
	87	+$permissiontoadd = $user->hasRight('don', 'creer'); // Used by the include of actions_dellink.inc.php
88	88
89	89
90	90	/*

		@@ -79,7 +79,7 @@
		block discarded – undo
79	79	}
80	80	$result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges');
81	81
82		-$permissiontoadd = $user->hasRight('tax', 'charges', 'creer'); // Used by the include of actions_dellink.inc.php
	82	+$permissiontoadd = $user->hasRight('tax', 'charges', 'creer'); // Used by the include of actions_dellink.inc.php
83	83
84	84
85	85	/*

Dolibarr / dolibarr

Branch — develop (758ccb)

Status

Category

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

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

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

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

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

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

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

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

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