Dolibarr / dolibarr

dev/build/generate_filelist_xml.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 if (!defined('NOREQUIREDB')) {
-	define('NOREQUIREDB', '1');	// Do not create database handler $db
+	define('NOREQUIREDB', '1'); // Do not create database handler $db
 }
 
 $sapi_type = php_sapi_name();
@@ -67,7 +67,7 @@ 
 $result = array();
 while ($i < $argc) {
 	if (!empty($argv[$i])) {
-		parse_str($argv[$i], $result);	// set all params $release, $includecustom, $includeconstant, $buildzip ...
+		parse_str($argv[$i], $result); // set all params $release, $includecustom, $includeconstant, $buildzip ...
 	}
 	if (!empty($result["release"])) {
 		$release = $result["release"];
@@ -82,9 +82,9 @@ 
 		$buildzip = 1;
 	}
 	if (preg_match('/includeconstant=/', strval($argv[$i]))) {
-		$tmp = explode(':', $result['includeconstant'], 3);			// $includeconstant has been set with previous parse_str()
+		$tmp = explode(':', $result['includeconstant'], 3); // $includeconstant has been set with previous parse_str()
 		if (count($tmp) != 3) {
-			print "Error: Bad parameter includeconstant=".$result['includeconstant'] ."\n";
+			print "Error: Bad parameter includeconstant=".$result['includeconstant']."\n";
 			exit(1);
 		}
 		$includeconstants[$tmp[0]][$tmp[1]] = $tmp[2];
@@ -159,7 +159,7 @@ 
 }
 
 $gitcommit = 'seetag';
-$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release);	// Keep only x.y into x.y.z
+$branchname = preg_replace('/^(\d+\.\d+)\..*$/', '\1', $release); // Keep only x.y into x.y.z
 $fileforgit = dirname(dirname(dirname(__FILE__))).'/.git/refs/heads/'.$branchname;
 print "Try to get last commit ID from file ".$fileforgit."\n";
 $fileforgitcontent = '';
@@ -190,7 +190,7 @@ 
 
 // Define qualified files (must be same than into generate_filelist_xml.php and in api_setup.class.php)
 $regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|escpos-php\/doc|escpos-php\/example|escpos-php\/test|conf|install|dejavu-fonts-ttf-.*|public\/test|sabre\/sabre\/.*\/tests|Shared\/PCLZip|nusoap\/lib\/Mail|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 
 $dir = '';
@@ -233,7 +233,7 @@ 
 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
 
 $regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude = '(custom|documents|conf|install)$';  // Exclude dirs
+$regextoexclude = '(custom|documents|conf|install)$'; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir = '';
 foreach ($files as $filetmp) {
@@ -274,7 +274,7 @@ 
 fputs($fp, '<dolibarr_unalterable_files version="'.$release.'">'."\n");
 
 $regextoinclude = '(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
+$regextoexclude = ''; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/blockedlog', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
 $dir = '';
 foreach ($files as $filetmp) {
@@ -302,7 +302,7 @@ 
 }
 // Add the SQL file
 $regextoinclude = 'llx_blockedlog.*(\.php|\.sql)$';
-$regextoexclude = '';  // Exclude dirs
+$regextoexclude = ''; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../../htdocs/install/mysql/tables', 'files', 0, $regextoinclude, $regextoexclude, 'fullname');
 foreach ($files as $filetmp) {
 	$file = $filetmp['fullname'];
@@ -385,7 +385,7 @@ 
 	$needtoclose = 1;
 }
 
-$needtoclose = 1;	// This is the last file
+$needtoclose = 1; // This is the last file
 if (filetype($file) == "file") {
 	$md5 = md5_file($file);
 	$checksumconcat[] = $md5;

htdocs/comm/action/list.php

Spacing +10 added lines, -10 removed lines

@@ -50,16 +50,16 @@ 
 $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "orders", "bills"));
 
 // Get Parameters
-$action 	= GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
-$confirm 	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
-$toselect 	= GETPOST('toselect', 'array:int');
+$toselect = GETPOST('toselect', 'array:int');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
 $optioncss 	= GETPOST('optioncss', 'alpha');
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
-	$mode = $action;	// For backward compatibility
+	$mode = $action; // For backward compatibility
 }
 
 $disabledefaultvalues = GETPOSTINT('disabledefaultvalues');
@@ -428,7 +428,7 @@ 
 if (isModEnabled('category') && $user->hasRight('agenda', 'myactions', 'create')) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+if (GETPOSTINT('nomassaction') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -473,7 +473,7 @@ 
 if (($filtert != '-1' && $filtert != '-2') || $usergroup > 0) {
 	// TODO Replace with a AND EXISTS
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm_resources as ar ON ar.fk_actioncomm = a.id AND ar.element_type = 'user'";
-	if ($filtert != '' && $filtert != '-1' && $filtert != '-2'  && $filtert != '-3') {
+	if ($filtert != '' && $filtert != '-1' && $filtert != '-2' && $filtert != '-3') {
 		$sql .= " AND (ar.fk_element IN (".$db->sanitize($filtert).") OR (ar.fk_element IS NULL AND a.fk_user_action = ".((int) $filtert)."))"; // The OR is for backward compatibility
 	} elseif ($filtert == '-3') {
 		$sql .= " AND ar.fk_element IN (".$db->sanitize(implode(',', $user->getAllChildIds(1))).")";
@@ -488,7 +488,7 @@ 
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-$sql .= " WHERE a.entity IN (".getEntity('agenda').")";	// bookcal is a "virtual view" of agenda
+$sql .= " WHERE a.entity IN (".getEntity('agenda').")"; // bookcal is a "virtual view" of agenda
 // Condition on actioncode
 if (!empty($actioncode)) {
 	if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE')) {
@@ -518,7 +518,7 @@ 
 					 * @param string $value
 					 * @return	bool
 					 */
-					function ($value) {
+					function($value) {
 						return ((string) $value !== '-1');
 					}
 				);
@@ -1018,7 +1018,7 @@ 
 	$event_owner_style = '';
 	// We decide to choose color of owner of event (event->userownerid is user id of owner, event->userassigned contains all users assigned to event)
 	if ($obj->fk_user_action > 0 && $cache_user_list[$obj->fk_user_action]->color != '') {
-		$event_owner_style .= 'border-left: #' . $cache_user_list[$obj->fk_user_action]->color . ' 5px solid;';
+		$event_owner_style .= 'border-left: #'.$cache_user_list[$obj->fk_user_action]->color.' 5px solid;';
 	}
 
 	// get event style for start and end date
@@ -1053,7 +1053,7 @@ 
 	}
 	$event_start_date_css = $event_end_date_css = $event_more_class;
 
-	print '<tr class="oddeven row-with-select ' . ($event_more_class != '' ? ' '.$event_more_class : '') . '">';
+	print '<tr class="oddeven row-with-select '.($event_more_class != '' ? ' '.$event_more_class : '').'">';
 	// Action column
 	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="nowrap center">';

htdocs/datapolicy/class/datapolicycron.class.php

Spacing +26 added lines, -26 removed lines

@@ -74,7 +74,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_TIERS_CLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::CUSTOMER." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => 'anonymous+__ID__@example.com', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -89,7 +89,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_TIERS_PROSPECT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::PROSPECT." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => 'anonymous+__ID__@example.com', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -104,7 +104,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_TIERS_PROSPECT_CLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::CUSTOMER_AND_PROSPECT." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => 'anonymous+__ID__@example.com', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -120,7 +120,7 @@ 
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::NO_CUSTOMER." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'sql_template_delete' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::NO_CUSTOMER." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => 'anonymous+__ID__@example.com', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -135,7 +135,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_TIERS_FOURNISSEUR_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.fournisseur = 1 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => 'anonymous+__ID__@example.com', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -151,7 +151,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_CLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.client = ".Societe::CUSTOMER." AND s.fournisseur = 0 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => 'anonymous+__ID__@example.com', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -166,7 +166,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_PROSPECT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.client = ".Societe::PROSPECT." AND s.fournisseur = 0 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => 'anonymous+__ID__@example.com', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -181,7 +181,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_PROSPECT_CLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.client = ".Societe::CUSTOMER_AND_PROSPECT." AND s.fournisseur = 0 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => 'anonymous+__ID__@example.com', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -196,7 +196,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.client = ".Societe::NO_CUSTOMER." AND s.fournisseur = 0 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => 'anonymous+__ID__@example.com', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -211,7 +211,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_FOURNISSEUR_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.fournisseur = 1 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => 'anonymous+__ID__@example.com', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -233,10 +233,10 @@ 
 				'const_anonymize' => 'DATAPOLICY_ADHERENT_ANONYMIZE_DELAY',
 				'sql_template' => $sqltemplate,
 				'class' => 'Adherent',
-				'file' => DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'societe' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => 'anonymous+__ID__@example.com', 'birth' => '1900-01-01', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'ip' => '0.0.0.0'),
 				'call_params' => array(
-					'delete' => array('user'),   // $object->delete($user)
+					'delete' => array('user'), // $object->delete($user)
 					'update' => array('user')    // $object->update($user)
 				)
 			);
@@ -252,10 +252,10 @@ 
 				'const_anonymize' => '', // Anonymization not applicable
 				'sql_template_delete' => "SELECT c.rowid FROM ".$prefix."recruitment_recruitmentcandidature as c WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT ac.id FROM ".$prefix."actioncomm as ac WHERE ac.elementtype = 'recruitmentcandidature@recruitment' AND ac.fk_element = c.rowid AND ac.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH))",
 				'class' => 'RecruitmentCandidature',
-				'file' => DOL_DOCUMENT_ROOT . '/recruitment/class/recruitmentcandidature.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php',
 				'anonymize_fields' => array(),
 				'call_params' => array(
-					'delete' => array('user'),   // $object->delete($user)
+					'delete' => array('user'), // $object->delete($user)
 					'update' => array('user')    // $object->update($user)
 				)
 			);
@@ -296,7 +296,7 @@ 
 		// Iterate through each defined policy to apply its rules.
 		foreach ($dataPolicies as $policy) {
 			// Instantiate object only once per class type for efficiency.
-			if (! isset($objectInstances[$policy['class']])) {
+			if (!isset($objectInstances[$policy['class']])) {
 				require_once $policy['file'];
 				$classtoinit = $policy['class'];
 				$objectInstances[$policy['class']] = new $classtoinit($this->db);
@@ -314,9 +314,9 @@ 
 		}
 
 		// Finalize the transaction based on the outcome of all operations.
-		if (! $this->errorCount) {
+		if (!$this->errorCount) {
 			$this->db->commit();
-			$this->output = $this->nbupdated . ' record(s) anonymized, ' . $this->nbdeleted . ' record(s) deleted.';
+			$this->output = $this->nbupdated.' record(s) anonymized, '.$this->nbdeleted.' record(s) deleted.';
 		} else {
 			$this->db->rollback();
 			$this->error = implode("\n", $this->errorMessages);
@@ -339,7 +339,7 @@ 
 	 */
 	private function _processPolicyAction($policy, $action, $object, &$processedIds, $conf, $user)
 	{
-		$constName = $policy['const_' . $action] ?? null;
+		$constName = $policy['const_'.$action] ?? null;
 		$delay = $constName ? getDolGlobalInt($constName) : 0;
 
 		if ($delay <= 0) {
@@ -350,25 +350,25 @@ 
 		$sqlPlaceholders = array(
 			'__ENTITY__' => (string) $conf->entity,
 			'__DELAY__' => (string) $delay,
-			'__NOW__' => "'" . $this->db->idate(dol_now()) . "'"
+			'__NOW__' => "'".$this->db->idate(dol_now())."'"
 		);
 		$sql = str_replace(array_keys($sqlPlaceholders), array_values($sqlPlaceholders), $policy['sql_template']);
 
 		$resql = $this->db->query($sql);
 
-		if (! $resql) {
+		if (!$resql) {
 			$this->errorCount++;
-			$this->errorMessages[] = 'Error executing ' . $action . ' query for policy ' . $constName . ': ' . $this->db->lasterror();
+			$this->errorMessages[] = 'Error executing '.$action.' query for policy '.$constName.': '.$this->db->lasterror();
 
 			return;
 		}
 
 		// Define the handler method for the action
-		$handlerMethod = '_handle' . ucfirst($action);
+		$handlerMethod = '_handle'.ucfirst($action);
 
 		// Process the records found by the query
 		while ($obj = $this->db->fetch_object($resql)) {
-			if (in_array($obj->rowid, $processedIds) || ! method_exists($this, $handlerMethod)) {
+			if (in_array($obj->rowid, $processedIds) || !method_exists($this, $handlerMethod)) {
 				continue;
 			}
 			/** @var CommonObject $object */
@@ -416,7 +416,7 @@ 
 		foreach ($policy['anonymize_fields'] as $field => $val) {
 			if ($val == 'MAKEANONYMOUS') {
 				// For each field with rule "MAKEANONYMOUS, set the new value, keeping the ID.
-				$object->$field = $field . '-anon-' . $object->id;
+				$object->$field = $field.'-anon-'.$object->id;
 			} else {
 				// For others, force the value, but only if not already empty.
 				if (!empty($object->$field)) {
@@ -454,7 +454,7 @@ 
 			 * @param	string$paramName	Name of parameter to get
 			 * @return	mixed				Parameter value
 			 */
-			static function (string $paramName) use ($availableArgs) {
+			static function(string $paramName) use ($availableArgs) {
 				return $availableArgs[$paramName];
 			},
 			$paramConfig
@@ -473,7 +473,7 @@ 
 	{
 		if ($result <= 0) {
 			$this->errorCount++;
-			$this->errorMessages[] = 'Failed to ' . $action . ' record ID ' . $object->id . ' from class ' . get_class($object) . '. Error: ' . $object->errorsToString();
+			$this->errorMessages[] = 'Failed to '.$action.' record ID '.$object->id.' from class '.get_class($object).'. Error: '.$object->errorsToString();
 		} else {
 			if ($action === 'delete') {
 				$this->nbdeleted++;

htdocs/webportal/controllers/documentlist.controller.class.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
  */
 
 
-require_once __DIR__ . '/abstractdocument.controller.class.php';
+require_once __DIR__.'/abstractdocument.controller.class.php';
 
 /**
  * \file        htdocs/webportal/controllers/documentlist.controller.class.php
@@ -90,9 +90,9 @@ 
 
 		if (!empty($thirdparty) && $thirdparty->id) {
 			// 1. Prepare data
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 			$client_dir_name = dol_sanitizeFileName($thirdparty->ref);
-			$dir_ged_tiers = $conf->societe->dir_output . '/' . $client_dir_name;
+			$dir_ged_tiers = $conf->societe->dir_output.'/'.$client_dir_name;
 			$fileList = dol_dir_list($dir_ged_tiers, 'files', 0, '', '', 'date', SORT_DESC);
 
 			// 2. Define the link builder function
@@ -103,8 +103,8 @@ 
 			 * @return	string						Url for file
 			 */
 			$linkBuilder
-				= static function (array $file) use ($client_dir_name) {
-					return DOL_URL_ROOT . '/document.php?modulepart=societe&attachment=1&file=' . urlencode($client_dir_name . '/' . $file['name']);
+				= static function(array $file) use ($client_dir_name) {
+					return DOL_URL_ROOT.'/document.php?modulepart=societe&attachment=1&file='.urlencode($client_dir_name.'/'.$file['name']);
 				};
 
 			// 3. Call the parent method to display the table

htdocs/webportal/controllers/shareddocuments.controller.class.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
  * the Free Software Foundation.
  */
 
-require_once __DIR__ . '/abstractdocument.controller.class.php';
+require_once __DIR__.'/abstractdocument.controller.class.php';
 
 /**
  * \file        htdocs/webportal/controllers/shareddocuments.controller.class.php
@@ -78,8 +78,8 @@ 
 
 		// 1. Prepare data for this controller
 		$shared_dir_name = getDolGlobalString('WEBPORTAL_SHARED_DOCS_DIR', 'Documentscomptes');
-		$dir_ged_partage = $conf->ecm->dir_output . '/' . $shared_dir_name;
-		$shared_dir_relative_path = 'ecm/' . $shared_dir_name;
+		$dir_ged_partage = $conf->ecm->dir_output.'/'.$shared_dir_name;
+		$shared_dir_relative_path = 'ecm/'.$shared_dir_name;
 		$fileList = dol_dir_list($dir_ged_partage, 'files', 0, '', '', 'date', SORT_DESC);
 
 		// 2. Define the link builder function
@@ -90,8 +90,8 @@ 
 		 * @return	string						Url for file
 		 */
 		$linkBuilder
-			= static function (array $file) use ($shared_dir_relative_path) {
-				return DOL_URL_ROOT . '/document.php?modulepart=ecm&file=' . urlencode($shared_dir_relative_path . '/' . $file['name']);
+			= static function(array $file) use ($shared_dir_relative_path) {
+				return DOL_URL_ROOT.'/document.php?modulepart=ecm&file='.urlencode($shared_dir_relative_path.'/'.$file['name']);
 			};
 
 		// 3. Call the parent method to display the table

htdocs/fourn/facture/list.php

Spacing +13 added lines, -13 removed lines

@@ -93,7 +93,7 @@ 
 $search_multicurrency_montant_ht = GETPOST('search_multicurrency_montant_ht', 'alpha');
 $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat', 'alpha');
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
-$search_status = GETPOST('search_status', 'intcomma');	// Can be '' or a numeric
+$search_status = GETPOST('search_status', 'intcomma'); // Can be '' or a numeric
 $search_paymentmode = GETPOST('search_paymentmode', 'intcomma');
 $search_paymentcond = GETPOST('search_paymentcond') ? GETPOSTINT('search_paymentcond') : '';
 $search_vat_reverse_charge = GETPOST('search_vat_reverse_charge', 'alpha');
@@ -686,16 +686,16 @@ 
 	$sql .= " AND f.vat_reverse_charge = ".((int) $search_vat_reverse_charge);
 }
 if ($search_date_start) {
-	$sql .= " AND f.datef >= '" . $db->idate($search_date_start) . "'";
+	$sql .= " AND f.datef >= '".$db->idate($search_date_start)."'";
 }
 if ($search_date_end) {
-	$sql .= " AND f.datef <= '" . $db->idate($search_date_end) . "'";
+	$sql .= " AND f.datef <= '".$db->idate($search_date_end)."'";
 }
 if ($search_datelimit_start) {
-	$sql .= " AND f.date_lim_reglement >= '" . $db->idate($search_datelimit_start) . "'";
+	$sql .= " AND f.date_lim_reglement >= '".$db->idate($search_datelimit_start)."'";
 }
 if ($search_datelimit_end) {
-	$sql .= " AND f.date_lim_reglement <= '" . $db->idate($search_datelimit_end) . "'";
+	$sql .= " AND f.date_lim_reglement <= '".$db->idate($search_datelimit_end)."'";
 }
 if ($option == 'late') {
 	$sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
@@ -725,7 +725,7 @@ 
 			if ($searchCategorySupplierInvoiceOperator == 0) {
 				$searchCategorySupplierInvoiceSqlList[] = " EXISTS (SELECT ck.fk_supplier_invoice FROM ".MAIN_DB_PREFIX."categorie_supplier_invoice as ck WHERE f.rowid = ck.fk_supplier_invoice AND ck.fk_categorie = ".((int) $searchCategorySupplierInvoice).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySupplierInvoice);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategorySupplierInvoice);
 			}
 		}
 	}
@@ -755,7 +755,7 @@ 
 			if ($searchCategorySupplierOperator == 0) {
 				$searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM ".MAIN_DB_PREFIX."categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = ".((int) $searchCategorySupplier).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategorySupplier);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategorySupplier);
 			}
 		}
 	}
@@ -785,7 +785,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."facture_fourn_det as fd WHERE fd.fk_facture_fourn = f.rowid AND fd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -892,8 +892,8 @@ 
 llxHeader('', $title, $help_url, '', 0, 0, '', '', '', 'bodyforlist mod-fourn-facture page-list');
 
 if ($search_fk_fac_rec_source) {
-	require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php';
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture-rec.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 	$object = new FactureFournisseurRec($db);
 	$object->fetch((int) $search_fk_fac_rec_source);
 
@@ -1043,7 +1043,7 @@ 
 	$param .= '&search_type_thirdparty='.$search_type_thirdparty;
 }
 if ($search_fk_fac_rec_source) {
-	$param .= '&search_fk_fac_rec_source=' . (int) $search_fk_fac_rec_source;
+	$param .= '&search_fk_fac_rec_source='.(int) $search_fk_fac_rec_source;
 }
 
 // Add $param from extra fields
@@ -1176,7 +1176,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -2050,7 +2050,7 @@ 
 				$totalarray['pos'][$totalarray['nbfield']] = 'totalam';
 			}
 			if (empty($totalarray['val']['totalam'])) {
-				$totalarray['val']['totalam'] = 0;		// avoid PHP Warning:  Undefined array key "totalam" on line 1891
+				$totalarray['val']['totalam'] = 0; // avoid PHP Warning:  Undefined array key "totalam" on line 1891
 			}
 			$totalarray['val']['totalam'] += $totalpay;
 		}

htdocs/install/check.php

Spacing +2 added lines, -2 removed lines

@@ -119,7 +119,7 @@ 
 }
 if (empty($force_install_nophpinfo) && (!file_exists($lockfile) && !file_exists($lockfile2))) {		// Do not show sensible information in update process, only in install process.
 	print ' (<a href="phpinfo.php" target="_blank" rel="noopener noreferrer">';
-	$conf->use_javascript_ajax = 1;		// We suppose javascript is on for install process
+	$conf->use_javascript_ajax = 1; // We suppose javascript is on for install process
 	print dolButtonToOpenUrlInDialogPopup('phpinfo', $langs->trans("MoreInformation"), $langs->trans("MoreInformation"), '/install/phpinfo.php', '', '');
 	print '</a>)';
 }
@@ -523,7 +523,7 @@ 
 			$allowupgrade = true;
 		}
 
-		$dir = DOL_DOCUMENT_ROOT."/install/mysql/migration/";	// We use mysql migration scripts whatever is database driver
+		$dir = DOL_DOCUMENT_ROOT."/install/mysql/migration/"; // We use mysql migration scripts whatever is database driver
 		dolibarr_install_syslog("Scan sql files for migration files in ".$dir);
 
 		// Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration

htdocs/workstation/class/workstation.class.php

Spacing +6 added lines, -6 removed lines

@@ -106,7 +106,7 @@ 
 		'fk_user_modif' => array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => 1, 'position' => 511, 'notnull' => -1, 'visible' => -2,),
 		'import_key' => array('type' => 'varchar(14)', 'label' => 'ImportId', 'enabled' => 1, 'position' => 512, 'notnull' => -1, 'visible' => -2,),
 		'nb_operators_required' => array('type' => 'integer', 'label' => 'NbOperatorsRequired', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right maxwidth50imp', 'csslist' => 'maxwidth50imp'),
-		'thm_operator_estimated' => array('type' => 'price', 'help' => 'THMOperatorEstimatedHelp','label' => 'THMOperatorEstimated', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right maxwidth75imp', 'csslist' => 'maxwidth75imp'),
+		'thm_operator_estimated' => array('type' => 'price', 'help' => 'THMOperatorEstimatedHelp', 'label' => 'THMOperatorEstimated', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right maxwidth75imp', 'csslist' => 'maxwidth75imp'),
 		'thm_machine_estimated' => array('type' => 'price', 'help' => 'THMMachineEstimatedHelp', 'label' => 'THMMachineEstimated', 'enabled' => 1, 'position' => 50, 'notnull' => 0, 'visible' => 1, 'css' => 'right maxwidth75imp', 'csslist' => 'maxwidth75imp'),
 		'status' => array('type' => 'smallint', 'label' => 'Status', 'enabled' => 1, 'position' => 1000, 'default' => '1', 'notnull' => 1, 'visible' => 1, 'index' => 1, 'arrayofkeyval' => array(0 => 'Disabled', 1 => 'Enabled'),),
 	);
@@ -129,7 +129,7 @@ 
 	/**
 	 * @var string type
 	 */
-	public $type;	// HUMAN, MACHINE, ...
+	public $type; // HUMAN, MACHINE, ...
 
 	/**
 	 * @var int User ID
@@ -230,7 +230,7 @@ 
 		$id = $this->createCommon($user, $notrigger);
 
 		// Usergroups
-		$groups = GETPOST('groups', 'array:int');	// FIXME We should not GETPOST but receive array as parameter
+		$groups = GETPOST('groups', 'array:int'); // FIXME We should not GETPOST but receive array as parameter
 		if (empty($groups)) {
 			$groups = $this->usergroups; // createFromClone
 		}
@@ -245,7 +245,7 @@ 
 		}
 
 		// Resources
-		$resources = GETPOST('resources', 'array:int');	// FIXME We should not GETPOST but receive array as parameter
+		$resources = GETPOST('resources', 'array:int'); // FIXME We should not GETPOST but receive array as parameter
 		if (empty($resources)) {
 			$resources = $this->resources; // createFromClone
 		}
@@ -715,7 +715,7 @@ 
 		$return .= img_picto('', $this->picto);
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">' . $this->getNomUrl() . '</span>';
+		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.$this->getNomUrl().'</span>';
 		if ($selected >= 0) {
 			$return .= '<input id="cb'.$this->id.'" class="flat checkforselect fright" type="checkbox" name="toselect[]" value="'.$this->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
@@ -833,7 +833,7 @@ 
 		if (getDolGlobalString('WORKSTATION_WORKSTATION_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON') . ".php";
+			$file = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON').".php";
 			$classname = getDolGlobalString('WORKSTATION_WORKSTATION_ADDON');
 
 			// Include file with class

htdocs/fichinter/class/api_interventions.class.php

Indentation +13 added lines, -13 removed lines

@@ -733,19 +733,19 @@
 	}
 
 		/**
-	 * Delete a contact type of given interventional
-	 *
-	 * @param	int    $id             Id of interventional to update
-	 * @param	int    $contactid      Row key of the contact in the array contact_ids.
-	 * @param	string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
-	 * @return	Object				   Object with cleaned properties
-	 *
-	 * @url	DELETE {id}/contact/{contactid}/{type}
-	 *
-	 * @throws RestException 401
-	 * @throws RestException 404
-	 * @throws RestException 500 System error
-	 */
+		 * Delete a contact type of given interventional
+		 *
+		 * @param	int    $id             Id of interventional to update
+		 * @param	int    $contactid      Row key of the contact in the array contact_ids.
+		 * @param	string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
+		 * @return	Object				   Object with cleaned properties
+		 *
+		 * @url	DELETE {id}/contact/{contactid}/{type}
+		 *
+		 * @throws RestException 401
+		 * @throws RestException 404
+		 * @throws RestException 500 System error
+		 */
 	public function deleteContact($id, $contactid, $type)
 	{
 		if (!DolibarrApiAccess::$user->hasRight('ficheinter', 'creer')) {