Dolibarr / dolibarr

htdocs/admin/system/security.php

Spacing +8 added lines, -8 removed lines

@@ -108,7 +108,7 @@ 
 print "<strong>PHP session.use_strict_mode</strong> = ".(ini_get('session.use_strict_mode') ? img_picto('', 'tick').' ' : img_warning().' ').(ini_get('session.use_strict_mode') ? ini_get('session.use_strict_mode') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
 print "<strong>PHP session.use_only_cookies</strong> = ".(ini_get('session.use_only_cookies') ? img_picto('', 'tick').' ' : img_warning().' ').(ini_get('session.use_only_cookies') ? ini_get('session.use_only_cookies') : yn(0)).' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
 print "<strong>PHP session.cookie_httponly</strong> = ".(ini_get('session.cookie_httponly') ? img_picto('', 'tick').' ' : img_warning().' ').(ini_get('session.cookie_httponly') ? ini_get('session.cookie_httponly') : '').' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", '1').")</span><br>\n";
-print "<strong>PHP session.cookie_samesite</strong> = ".(ini_get('session.cookie_samesite') ? img_picto('', 'tick').' ' .ini_get('session.cookie_samesite') : 'None');
+print "<strong>PHP session.cookie_samesite</strong> = ".(ini_get('session.cookie_samesite') ? img_picto('', 'tick').' '.ini_get('session.cookie_samesite') : 'None');
 if (!ini_get('session.cookie_samesite') || ini_get('session.cookie_samesite') == 'Lax') {
 	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'Lax').")</span>";
 } elseif (ini_get('session.cookie_samesite') == 'Strict') {
@@ -195,7 +195,7 @@ 
 
 // JSON
 print '<strong>JSON</strong>: ';
-$loadedExtensions    = array_map('strtolower', get_loaded_extensions(false));
+$loadedExtensions = array_map('strtolower', get_loaded_extensions(false));
 $test = !in_array('json', $loadedExtensions);
 if ($test || function_exists('dol_json_decode')) {
 	print img_picto('', 'error').' '.$langs->trans("NotInstalled").' - '.$langs->trans("VulnerableToRCEAttack");
@@ -256,7 +256,7 @@ 
 print '<br>';
 print '<br>';
 
-print '<strong>'.$langs->trans("PermissionsOnFile", $conffile).'</strong>: ';		// $conffile is defined into filefunc.inc.php
+print '<strong>'.$langs->trans("PermissionsOnFile", $conffile).'</strong>: '; // $conffile is defined into filefunc.inc.php
 $perms = fileperms($dolibarr_main_document_root.'/'.$conffile);
 if ($perms) {
 	if (($perms & 0x0004) || ($perms & 0x0002)) {
@@ -490,7 +490,7 @@ 
 if (!getDolGlobalString('MAIN_ANTIVIRUS_COMMAND')) {
 	print ' - <span class="opacitymedium">'.$langs->trans("Recommended").': '.$langs->trans("DefinedAPathForAntivirusCommandIntoSetup", $langs->transnoentitiesnoconv("Home")." - ".$langs->transnoentitiesnoconv("Setup")." - ".$langs->transnoentitiesnoconv("Security")).'</span>';
 } else {
-	print ' &nbsp; - ' . getDolGlobalString('MAIN_ANTIVIRUS_COMMAND');
+	print ' &nbsp; - '.getDolGlobalString('MAIN_ANTIVIRUS_COMMAND');
 	if (defined('MAIN_ANTIVIRUS_COMMAND') && !defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {
 		print ' - <span class="opacitymedium">'.$langs->trans("ValueIsForcedBySystem").'</span>';
 	}
@@ -501,11 +501,11 @@ 
 $umask = getDolGlobalString('MAIN_UMASK');
 
 print '<strong>'.$langs->trans("UMask").'</strong>: ';
-if (! in_array($umask, array('600', '660', '0600', '0660'))) {
+if (!in_array($umask, array('600', '660', '0600', '0660'))) {
 	print img_warning().' ';
 }
 print $umask;
-if (! in_array($umask, array('600', '660', '0600', '0660'))) {
+if (!in_array($umask, array('600', '660', '0600', '0660'))) {
 	print ' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0600 | 0660)</span>';
 }
 print '<br>';
@@ -726,7 +726,7 @@ 
 $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;
 $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
 $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 0;
-$result=dol_htmlwithnojs('<img onerror<=alert(document.domain)> src=>0xbeefed');
+$result = dol_htmlwithnojs('<img onerror<=alert(document.domain)> src=>0xbeefed');
 $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = $savMAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES;
 $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = $savMAIN_RESTRICTHTML_ONLY_VALID_HTML;
 $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = $savMAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY;
@@ -750,7 +750,7 @@ 
 	$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;
 	$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;
 	$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
-	$result=dol_htmlwithnojs('<img onerror<=alert(document.domain)> src=>0xbeefed');
+	$result = dol_htmlwithnojs('<img onerror<=alert(document.domain)> src=>0xbeefed');
 	$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = $savMAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES;
 	$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = $savMAIN_RESTRICTHTML_ONLY_VALID_HTML;
 	$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = $savMAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY;

htdocs/fichinter/card.php

Spacing +9 added lines, -9 removed lines

@@ -49,8 +49,8 @@ 
 	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
 	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 }
-if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').".php")) {
-	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_" . getDolGlobalString('FICHEINTER_ADDON').'.php';
+if (getDolGlobalString('FICHEINTER_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".getDolGlobalString('FICHEINTER_ADDON').".php")) {
+	require_once DOL_DOCUMENT_ROOT."/core/modules/fichinter/mod_".getDolGlobalString('FICHEINTER_ADDON').'.php';
 }
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
@@ -60,7 +60,7 @@ 
 
 $id			= GETPOSTINT('id');
 $ref		= GETPOST('ref', 'alpha');
-$ref_client	= GETPOST('ref_client', 'alpha');
+$ref_client = GETPOST('ref_client', 'alpha');
 $socid = GETPOSTINT('socid');
 $contratid = GETPOSTINT('contratid');
 $action		= GETPOST('action', 'alpha');
@@ -221,7 +221,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -246,7 +246,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -271,7 +271,7 @@ 
 				$result = fichinter_create($db, $object, (!GETPOST('model', 'alpha')) ? $object->model_pdf : GETPOST('model', 'alpha'), $outputlangs);
 			}
 
-			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
 			exit;
 		} else {
 			$mesg = $object->error;
@@ -1122,7 +1122,7 @@ 
 	} else {
 		print '<form name="fichinter" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="create">';		// We go back to create action
+		print '<input type="hidden" name="action" value="create">'; // We go back to create action
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 		print dol_get_fiche_head('');
@@ -1807,9 +1807,9 @@ 
 				// Sign
 				if ($object->statut > Fichinter::STATUS_DRAFT) {
 					if ($object->signed_status != Fichinter::SIGNED_STATUSES['STATUS_SIGNED_ALL']) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=sign&token=' . newToken() . '">' . $langs->trans("InterventionSign") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=sign&token='.newToken().'">'.$langs->trans("InterventionSign").'</a></div>';
 					} else {
-						print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=unsign&token=' . newToken() . '">' . $langs->trans("InterventionUnsign") . '</a></div>';
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=unsign&token='.newToken().'">'.$langs->trans("InterventionUnsign").'</a></div>';
 					}
 				}
 

htdocs/fichinter/class/fichinter.class.php

Spacing +25 added lines, -25 removed lines

@@ -508,8 +508,8 @@ 
 				$this->description  = $obj->description;
 				$this->socid        = $obj->fk_soc;
 				$this->status       = $obj->status;
-				$this->statut       = $obj->status;	// deprecated
-				$this->signed_status= $obj->signed_status;
+				$this->statut       = $obj->status; // deprecated
+				$this->signed_status = $obj->signed_status;
 				$this->duration     = $obj->duree;
 				$this->datec        = $this->db->jdate($obj->datec);
 				$this->dateo        = $this->db->jdate($obj->dateo);
@@ -705,7 +705,7 @@ 
 			if (!$error) {
 				$this->ref = $num;
 				$this->status = self::STATUS_VALIDATED;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->date_validation = $now;
 				$this->db->commit();
 				return 1;
@@ -739,13 +739,13 @@ 
 
 			$now = dol_now();
 
-			$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' SET fk_statut = ' . self::STATUS_CLOSED . ',';
-			$sql .= " datet = '" . $this->db->idate($now) . "',";
-			$sql .= " fk_user_modif = " . ((int) $user->id);
-			$sql .= " WHERE rowid = " . ((int) $this->id);
-			$sql .= " AND fk_statut > " . self::STATUS_DRAFT;
-			$sql .= " AND entity = " . ((int) $conf->entity);
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET fk_statut = '.self::STATUS_CLOSED.',';
+			$sql .= " datet = '".$this->db->idate($now)."',";
+			$sql .= " fk_user_modif = ".((int) $user->id);
+			$sql .= " WHERE rowid = ".((int) $this->id);
+			$sql .= " AND fk_statut > ".self::STATUS_DRAFT;
+			$sql .= " AND entity = ".((int) $conf->entity);
 
 			if ($this->db->query($sql)) {
 				if (!$notrigger) {
@@ -870,9 +870,9 @@ 
 			$statuscode = 'status6';
 		}
 
-		$signed_label = ' (' . $this->getLibSignedStatus() . ')';
-		$status_label = $this->signed_status ? $this->labelStatus[$status] . $signed_label : $this->labelStatus[$status];
-		$status_label_short = $this->signed_status ? $this->labelStatusShort[$status] . $signed_label : $this->labelStatusShort[$status];
+		$signed_label = ' ('.$this->getLibSignedStatus().')';
+		$status_label = $this->signed_status ? $this->labelStatus[$status].$signed_label : $this->labelStatus[$status];
+		$status_label_short = $this->signed_status ? $this->labelStatusShort[$status].$signed_label : $this->labelStatusShort[$status];
 
 		return dolGetStatus($status_label, $status_label_short, '', $statuscode, $mode);
 	}
@@ -1053,8 +1053,8 @@ 
 		if (getDolGlobalString('FICHEINTER_ADDON')) {
 			$mybool = false;
 
-			$file = "mod_" . getDolGlobalString('FICHEINTER_ADDON').".php";
-			$classname = "mod_" . getDolGlobalString('FICHEINTER_ADDON');
+			$file = "mod_".getDolGlobalString('FICHEINTER_ADDON').".php";
+			$classname = "mod_".getDolGlobalString('FICHEINTER_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1382,7 +1382,7 @@ 
 		$this->id = 0;
 		$this->ref = '';
 		$this->status = self::STATUS_DRAFT;
-		$this->statut = self::STATUS_DRAFT;	//  deprecated
+		$this->statut = self::STATUS_DRAFT; //  deprecated
 
 		// Clear fields
 		$this->user_author_id     = $user->id;
@@ -1454,7 +1454,7 @@ 
 			$line->fk_fichinter = $fichinterid;
 			$line->desc         = $desc;
 			$line->date         = $date_intervention;
-			$line->datei        = $date_intervention;	// For backward compatibility
+			$line->datei        = $date_intervention; // For backward compatibility
 			$line->duration     = $duration;
 
 			if (is_array($array_options) && count($array_options) > 0) {
@@ -1506,7 +1506,7 @@ 
 			$line = new FichinterLigne($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
 			$line->date = ($now - 3600 * (1 + $xnbp));
-			$line->datei = ($now - 3600 * (1 + $xnbp));	// For backward compatibility
+			$line->datei = ($now - 3600 * (1 + $xnbp)); // For backward compatibility
 			$line->duration = 600;
 			$line->fk_fichinter = 0;
 			$this->lines[$xnbp] = $line;
@@ -1551,7 +1551,7 @@ 
 				//For invoicing we calculing hours
 				$line->qty = round($objp->duree / 3600, 2);
 				$line->date	= $this->db->jdate($objp->date);
-				$line->datei = $this->db->jdate($objp->date);	// For backward compatibility
+				$line->datei = $this->db->jdate($objp->date); // For backward compatibility
 				$line->rang	= $objp->rang;
 				$line->product_type = 1;
 				$line->fetch_optionals();
@@ -1738,19 +1738,19 @@ 
 	 */
 	public $fk_fichinter;
 
-	public $desc; 		// Description ligne
+	public $desc; // Description ligne
 
 	/**
 	 * @var int Date of intervention
 	 */
-	public $date; 		// Date intervention
+	public $date; // Date intervention
 	/**
 	 * @var int Date of intervention
 	 * @deprecated
 	 */
-	public $datei; 		// Date intervention
+	public $datei; // Date intervention
 
-	public $duration; 	// Duration of intervention
+	public $duration; // Duration of intervention
 	public $rang = 0;
 	public $tva_tx;
 
@@ -1805,10 +1805,10 @@ 
 		if ($resql) {
 			$objp = $this->db->fetch_object($resql);
 			$this->rowid          	= $objp->rowid;
-			$this->id               = $objp->rowid;
+			$this->id = $objp->rowid;
 			$this->fk_fichinter   	= $objp->fk_fichinter;
 			$this->date = $this->db->jdate($objp->date);
-			$this->datei = $this->db->jdate($objp->date);	// For backward compatibility
+			$this->datei = $this->db->jdate($objp->date); // For backward compatibility
 			$this->desc           	= $objp->description;
 			$this->duration       	= $objp->duree;
 			$this->rang           	= $objp->rang;

htdocs/fichinter/list.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,7 @@ 
 $search_date_endday = GETPOSTINT('search_date_endday');
 $search_date_endmonth = GETPOSTINT('search_date_endmonth');
 $search_date_endyear = GETPOSTINT('search_date_endyear');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $optioncss = GETPOST('optioncss', 'alpha');
 $socid = GETPOSTINT('socid');
@@ -105,7 +105,7 @@ 
 
 // Initialize a technical object to manage hooks of page. Note that conf->hooks_modules contains an array of hook context
 $object = new Fichinter($db);
-$hookmanager->initHooks(array($contextpage)); 	// Note that conf->hooks_modules contains array of activated contexes
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array of activated contexes
 
 $extrafields = new ExtraFields($db);
 
@@ -153,7 +153,7 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Security check
 $id = GETPOSTINT('id');
@@ -418,7 +418,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist mod-fichinter page-list');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist mod-fichinter page-list'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
@@ -574,7 +574,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) : '');
 
@@ -805,7 +805,7 @@ 
 	$objectstatic->id = $obj->rowid;
 	$objectstatic->ref = $obj->ref;
 	$objectstatic->ref_client = $obj->ref_client;
-	$objectstatic->statut = $obj->status;	// deprecated
+	$objectstatic->statut = $obj->status; // deprecated
 	$objectstatic->status = $obj->status;
 	$objectstatic->signed_status = $obj->signed_status;
 
@@ -978,7 +978,7 @@ 
 		if (!empty($arrayfields['f.note_public']['checked'])) {
 			print '<td class="sensiblehtmlcontent center">';
 			print dolPrintHTML($obj->note_public);
-			print '</td>';if (!$i) {
+			print '</td>'; if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}

htdocs/user/list.php

Spacing +4 added lines, -4 removed lines

@@ -155,11 +155,11 @@ 
 }
 
 // Extra fields
-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_array_fields.tpl.php';
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Init search fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -485,7 +485,7 @@ 
 			if ($searchCategoryUserOperator == 0) {
 				$searchCategoryUserSqlList[] = " EXISTS (SELECT ck.fk_user FROM ".MAIN_DB_PREFIX."categorie_user as ck WHERE u.rowid = ck.fk_user AND ck.fk_categorie = ".((int) $searchCategoryUser).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryUser);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryUser);
 			}
 		}
 	}
@@ -1229,7 +1229,7 @@ 
 			if ($api_key) {
 				if ($canreadsecretapi) {
 					print '<span class="opacitymedium">';
-					print showValueWithClipboardCPButton($object->api_key, 1, dol_trunc($api_key, 3));		// TODO Add an option to also reveal the hash, not only copy paste
+					print showValueWithClipboardCPButton($object->api_key, 1, dol_trunc($api_key, 3)); // TODO Add an option to also reveal the hash, not only copy paste
 					print '</span>';
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';

htdocs/emailcollector/class/emailcollector.class.php

Spacing +65 added lines, -65 removed lines

@@ -24,25 +24,25 @@ 
  */
 
 // Put here all includes required by your class file
-include_once DOL_DOCUMENT_ROOT .'/emailcollector/lib/emailcollector.lib.php';
-
-require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
-
-require_once DOL_DOCUMENT_ROOT .'/comm/propal/class/propal.class.php';                   // Customer Proposal
-require_once DOL_DOCUMENT_ROOT .'/commande/class/commande.class.php';                    // Sale Order
-require_once DOL_DOCUMENT_ROOT .'/compta/facture/class/facture.class.php';               // Customer Invoice
-require_once DOL_DOCUMENT_ROOT .'/contact/class/contact.class.php';                      // Contact / Address
-require_once DOL_DOCUMENT_ROOT .'/expedition/class/expedition.class.php';                // Shipping / Delivery
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.commande.class.php';           // Purchase Order
-require_once DOL_DOCUMENT_ROOT .'/fourn/class/fournisseur.facture.class.php';            // Purchase Invoice
-require_once DOL_DOCUMENT_ROOT .'/projet/class/project.class.php';                       // Project
-require_once DOL_DOCUMENT_ROOT .'/reception/class/reception.class.php';                  // Reception
-require_once DOL_DOCUMENT_ROOT .'/recruitment/class/recruitmentcandidature.class.php';   // Recruiting
-require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';                      // Third-Party
-require_once DOL_DOCUMENT_ROOT .'/supplier_proposal/class/supplier_proposal.class.php';  // Supplier Proposal
-require_once DOL_DOCUMENT_ROOT .'/ticket/class/ticket.class.php';                        // Ticket
+include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php'; // Customer Proposal
+require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php'; // Sale Order
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; // Customer Invoice
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php'; // Contact / Address
+require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; // Shipping / Delivery
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; // Purchase Order
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; // Purchase Invoice
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php'; // Project
+require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php'; // Reception
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php'; // Recruiting
+require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'; // Third-Party
+require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; // Supplier Proposal
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php'; // Ticket
 //require_once DOL_DOCUMENT_ROOT .'/expensereport/class/expensereport.class.php';        // Expense Report
 //require_once DOL_DOCUMENT_ROOT .'/holiday/class/holiday.class.php';                    // Holidays (leave request)
 
@@ -784,7 +784,7 @@ 
 		} elseif (empty($this->imap_encryption) || ($this->imap_encryption == 'ssl' && getDolGlobalString('IMAP_FORCE_NOSSL'))) {
 			$flags .= '';
 		} else {
-			$flags .= '/' . $this->imap_encryption;
+			$flags .= '/'.$this->imap_encryption;
 		}
 
 		$flags .= '/novalidate-cert';
@@ -814,8 +814,8 @@ 
 	{
 		if (function_exists('mb_convert_encoding')) {
 			// change spaces by entropy because mb_convert fail with spaces
-			$str = preg_replace("/ /", "xxxSPACExxx", $str);		// the replacement string must be valid in utf7 so _ can't be used
-			$str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str);	// the replacement string must be valid in utf7 so _ can't be used
+			$str = preg_replace("/ /", "xxxSPACExxx", $str); // the replacement string must be valid in utf7 so _ can't be used
+			$str = preg_replace("/\[Gmail\]/", "xxxGMAILxxx", $str); // the replacement string must be valid in utf7 so _ can't be used
 			// if mb_convert work
 			if ($str = mb_convert_encoding($str, "UTF-7")) {
 				// change characters
@@ -1436,7 +1436,7 @@ 
 				}
 
 				if ($rule['type'] == 'from') {
-					$tmprulevaluearray = explode('*', $rule['rulevalue']);	// Search on abc*def means searching on 'abc' and on 'def'
+					$tmprulevaluearray = explode('*', $rule['rulevalue']); // Search on abc*def means searching on 'abc' and on 'def'
 					if (count($tmprulevaluearray) >= 2) {
 						foreach ($tmprulevaluearray as $tmprulevalue) {
 							$search .= ($search ? ' ' : '').$not.'FROM "'.str_replace('"', '', $tmprulevalue).'"';
@@ -1446,7 +1446,7 @@ 
 					}
 				}
 				if ($rule['type'] == 'to') {
-					$tmprulevaluearray = explode('*', $rule['rulevalue']);	// Search on abc*def means searching on 'abc' and on 'def'
+					$tmprulevaluearray = explode('*', $rule['rulevalue']); // Search on abc*def means searching on 'abc' and on 'def'
 					if (count($tmprulevaluearray) >= 2) {
 						foreach ($tmprulevaluearray as $tmprulevalue) {
 							$search .= ($search ? ' ' : '').$not.'TO "'.str_replace('"', '', $tmprulevalue).'"';
@@ -1574,7 +1574,7 @@ 
 					$tmpsourcedir = $this->getEncodedUtf7($sourcedir);
 				}
 
-				$f = $client->getFolders(false, $tmpsourcedir);	// Note the search of directory do a search on sourcedir*
+				$f = $client->getFolders(false, $tmpsourcedir); // Note the search of directory do a search on sourcedir*
 				if ($f) {
 					$folder = $f[0];
 					if ($folder instanceof Webklex\PHPIMAP\Folder) {
@@ -1634,7 +1634,7 @@ 
 			}
 		}
 
-		$arrayofemailtodelete = array();	// Track email to delete to make the deletion at end.
+		$arrayofemailtodelete = array(); // Track email to delete to make the deletion at end.
 
 		// Loop on each email found
 		if (!$error && !empty($arrayofemail) && count($arrayofemail) > 0) {
@@ -1667,7 +1667,7 @@ 
 				// GET header and overview datas
 				if (getDolGlobalString('MAIN_IMAP_USE_PHPIMAP')) {
 					'@phan-var-force Webklex\PHPIMAP\Message $imapemail';
-					$header = $imapemail->getHeader()->raw;  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$header = $imapemail->getHeader()->raw; // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
 					$overview = $imapemail->getAttributes();
 				} else {
 					$header = imap_fetchheader($connection, $imapemail, FT_UID);
@@ -1869,7 +1869,7 @@ 
 						$attachments = [];
 					}
 				} else {
-					$this->getmsg($connection, $imapemail);	// This set global var $charset, $htmlmsg, $plainmsg, $attachments
+					$this->getmsg($connection, $imapemail); // This set global var $charset, $htmlmsg, $plainmsg, $attachments
 				}
 				'@phan-var-force Webklex\PHPIMAP\Attachment[] $attachments';
 
@@ -1966,10 +1966,10 @@ 
 					$sendtocc = empty($overview['cc']) ? '' : $overview['cc'];
 					$sendtobcc = empty($overview['bcc']) ? '' : $overview['bcc'];
 
-					$tmpdate = $overview['date']->toDate();  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
-					$tmptimezone = $tmpdate->getTimezone()->getName();  // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$tmpdate = $overview['date']->toDate(); // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
+					$tmptimezone = $tmpdate->getTimezone()->getName(); // @phan-suppress-current-line PhanPluginUnknownObjectMethodCall
 
-					$dateemail = dol_stringtotime((string) $overview['date'], 'gmt');    // if $overview['timezone'] is "+00:00"
+					$dateemail = dol_stringtotime((string) $overview['date'], 'gmt'); // if $overview['timezone'] is "+00:00"
 					if (preg_match('/^([+\-])(\d\d):(\d\d)/', $tmptimezone, $reg)) {
 						if ($reg[1] == '+' && ($reg[2] != '00' || $reg[3] != '00')) {
 							$dateemail -= (3600 * (int) $reg[2]);
@@ -1983,7 +1983,7 @@ 
 					$subject = $overview['subject'];
 				} else {
 					$fromstring = $overview[0]->from;
-					$replytostring = (!empty($overview['in_reply-to']) ? $overview['in_reply-to'] : (!empty($headers['Reply-To']) ? $headers['Reply-To'] : "")) ;
+					$replytostring = (!empty($overview['in_reply-to']) ? $overview['in_reply-to'] : (!empty($headers['Reply-To']) ? $headers['Reply-To'] : ""));
 
 					$sender = !empty($overview[0]->sender) ? $overview[0]->sender : '';
 					$to = $overview[0]->to;
@@ -2054,17 +2054,17 @@ 
 				foreach ($arrayofreferences as $reference) {
 					//print "Process mail ".$iforemailloop." email_msgid ".$msgid.", date ".dol_print_date($dateemail, 'dayhour', 'gmt').", subject ".$subject.", reference ".dol_escape_htmltag($reference)."<br>\n";
 					if (!empty($trackidfoundintorecipienttype)) {
-						$resultsearchtrackid = -1;		// trackid found
+						$resultsearchtrackid = -1; // trackid found
 						$reg[1] = $trackidfoundintorecipienttype;
 						$reg[2] = $trackidfoundintorecipientid;
 					} elseif (!empty($trackidfoundintomsgidtype)) {
-						$resultsearchtrackid = -1;		// trackid found
+						$resultsearchtrackid = -1; // trackid found
 						$reg[1] = $trackidfoundintomsgidtype;
 						$reg[2] = $trackidfoundintomsgidid;
 					} else {
-						$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg);	// trackid found or not
+						$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg); // trackid found or not
 						if (empty($resultsearchtrackid) && getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE')) {
-							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg);	// trackid found
+							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg); // trackid found
 						}
 					}
 
@@ -2360,7 +2360,7 @@ 
 
 						// Make Operation
 						dol_syslog("Execute action ".$operation['type']." actionparam=".$operation['actionparam'].' thirdpartystatic->id='.$thirdpartystatic->id.' contactstatic->id='.$contactstatic->id.' projectstatic->id='.$projectstatic->id);
-						dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type);	// If a Dolibarr tracker id is found, we should now the id of object
+						dol_syslog("Execute action fk_element_id=".$fk_element_id." fk_element_type=".$fk_element_type); // If a Dolibarr tracker id is found, we should now the id of object
 
 						// Try to guess if this is an email in or out.
 						$actioncode = 'EMAIL_IN';
@@ -2415,7 +2415,7 @@ 
 									$operationslog .= '<br>Ticket not found using trackid='.$trackid.' or msgid='.$msgid;
 									$ticketalreadyexists = 0;
 								} else {
-									$operationslog .= '<br>Ticket already found using trackid='.$trackid.' or msgid='.$msgid;	// We change the operation type to do
+									$operationslog .= '<br>Ticket already found using trackid='.$trackid.' or msgid='.$msgid; // We change the operation type to do
 									$ticketalreadyexists = 1;
 									$operation['type'] = 'recordevent';
 								}
@@ -2652,11 +2652,11 @@ 
 									$result = $contactstatic->fetch(0, null, '', $from);
 									if ($result < 0) {
 										$errorforactions++;
-										$this->error = 'Error when getting contact with email ' . $from;
+										$this->error = 'Error when getting contact with email '.$from;
 										$this->errors[] = $this->error;
 										break;
 									} elseif ($result == 0) {
-										dol_syslog("Contact with email " . $from . " was not found. We try to create it.");
+										dol_syslog("Contact with email ".$from." was not found. We try to create it.");
 										$contactstatic = new Contact($this->db);
 
 										// Create contact
@@ -2671,28 +2671,28 @@ 
 										} else {
 											// Search country by name or code
 											if (!empty($contactstatic->country)) {
-												require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+												require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 												$result = getCountry('', 3, $this->db, null, 1, $contactstatic->country);
 												if ($result == 'NotDefined') {
 													$errorforactions++;
-													$this->error = "Error country not found by this name '" . $contactstatic->country . "'";
+													$this->error = "Error country not found by this name '".$contactstatic->country."'";
 												} elseif (!($result > 0)) {
 													$errorforactions++;
-													$this->error = "Error when search country by this name '" . $contactstatic->country . "'";
+													$this->error = "Error when search country by this name '".$contactstatic->country."'";
 													$this->errors[] = $this->db->lasterror();
 												} else {
 													$contactstatic->country_id = $result;
 													$operationslog .= '<br>We set property country_id='.dol_escape_htmltag($result);
 												}
 											} elseif (!empty($contactstatic->country_code)) {
-												require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+												require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 												$result = getCountry($contactstatic->country_code, 3, $this->db);
 												if ($result == 'NotDefined') {
 													$errorforactions++;
-													$this->error = "Error country not found by this code '" . $contactstatic->country_code . "'";
+													$this->error = "Error country not found by this code '".$contactstatic->country_code."'";
 												} elseif (!($result > 0)) {
 													$errorforactions++;
-													$this->error = "Error when search country by this code '" . $contactstatic->country_code . "'";
+													$this->error = "Error when search country by this code '".$contactstatic->country_code."'";
 													$this->errors[] = $this->db->lasterror();
 												} else {
 													$contactstatic->country_id = $result;
@@ -2703,28 +2703,28 @@ 
 											if (!$errorforactions) {
 												// Search state by name or code (for country if defined)
 												if (!empty($contactstatic->state)) {
-													require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+													require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 													$result = dol_getIdFromCode($this->db, $contactstatic->state, 'c_departements', 'nom', 'rowid');
 													if (empty($result)) {
 														$errorforactions++;
-														$this->error = "Error state not found by this name '" . $contactstatic->state . "'";
+														$this->error = "Error state not found by this name '".$contactstatic->state."'";
 													} elseif (!($result > 0)) {
 														$errorforactions++;
-														$this->error = "Error when search state by this name '" . $contactstatic->state . "'";
+														$this->error = "Error when search state by this name '".$contactstatic->state."'";
 														$this->errors[] = $this->db->lasterror();
 													} else {
 														$contactstatic->state_id = $result;
 														$operationslog .= '<br>We set property state_id='.dol_escape_htmltag($result);
 													}
 												} elseif (!empty($contactstatic->state_code)) {
-													require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+													require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 													$result = dol_getIdFromCode($this->db, $contactstatic->state_code, 'c_departements', 'code_departement', 'rowid');
 													if (empty($result)) {
 														$errorforactions++;
-														$this->error = "Error state not found by this code '" . $contactstatic->state_code . "'";
+														$this->error = "Error state not found by this code '".$contactstatic->state_code."'";
 													} elseif (!($result > 0)) {
 														$errorforactions++;
-														$this->error = "Error when search state by this code '" . $contactstatic->state_code . "'";
+														$this->error = "Error when search state by this code '".$contactstatic->state_code."'";
 														$this->errors[] = $this->db->lasterror();
 													} else {
 														$contactstatic->state_id = $result;
@@ -2789,8 +2789,8 @@ 
 								$actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
 								$actioncomm->note_private = $descriptionfull;
 								$actioncomm->fk_project  = $projectstatic->id;
-								$actioncomm->datep       = $dateemail;	// date of email
-								$actioncomm->datef       = $dateemail;	// date of email
+								$actioncomm->datep       = $dateemail; // date of email
+								$actioncomm->datef       = $dateemail; // date of email
 								$actioncomm->percentage  = -1; // Not applicable
 								$actioncomm->socid       = $thirdpartystatic->id;
 								$actioncomm->contact_id = $contactstatic->id;
@@ -2989,7 +2989,7 @@ 
 								}
 								$hookmanager->initHooks(array('emailcolector'));
 								$parameters = array('arrayobject' => $arrayobject);
-								$reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters);    // Note that $action and $object may have been modified by some hooks
+								$reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters); // Note that $action and $object may have been modified by some hooks
 								if ($reshook > 0) {
 									$arrayobject = $hookmanager->resArray;
 								}
@@ -2998,10 +2998,10 @@ 
 
 								foreach ($arrayobject as $key => $objectdesc) {
 									$sql = 'SELECT DISTINCT t.rowid ';
-									$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->db->sanitize($objectdesc['table']) . ' AS t';
+									$sql .= ' FROM '.MAIN_DB_PREFIX.$this->db->sanitize($objectdesc['table']).' AS t';
 									$sql .= ' WHERE ';
 									foreach ($objectdesc['fields'] as $field) {
-										$sql .= "('" .$this->db->escape($subject) . "'  LIKE CONCAT('%',  t." . $this->db->sanitize($field) . ", '%') AND t." . $this->db->sanitize($field) . " <> '') OR ";
+										$sql .= "('".$this->db->escape($subject)."'  LIKE CONCAT('%',  t.".$this->db->sanitize($field).", '%') AND t.".$this->db->sanitize($field)." <> '') OR ";
 									}
 									$sql = substr($sql, 0, -4);
 
@@ -3021,8 +3021,8 @@ 
 									foreach ($ids as $val) {
 										$res = $objectmanaged->fetch($val);
 										if ($res) {
-											$path = ($objectmanaged->entity > 1 ? "/" . $objectmanaged->entity : '');
-											$dirs[] = DOL_DATA_ROOT . $path . "/" . $elementpath . '/' . dol_sanitizeFileName($objectmanaged->ref) . '/';
+											$path = ($objectmanaged->entity > 1 ? "/".$objectmanaged->entity : '');
+											$dirs[] = DOL_DATA_ROOT.$path."/".$elementpath.'/'.dol_sanitizeFileName($objectmanaged->ref).'/';
 										} else {
 											$this->errors[] = 'object not found';
 										}
@@ -3031,7 +3031,7 @@ 
 								foreach ($dirs as $target) {
 									$prefix = $this->actions[$this->id]['actionparam'];
 									foreach ($data as $filename => $content) {
-										$resr = saveAttachment($target, $prefix . '_' . $filename, $content);
+										$resr = saveAttachment($target, $prefix.'_'.$filename, $content);
 										if ($resr == -1) {
 											$this->errors[] = 'Doc not saved';
 										}
@@ -3078,7 +3078,7 @@ 
 								$percent_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'percent');
 
 								$projecttocreate->title = $subject;
-								$projecttocreate->date_start = $dateemail;	// date of email
+								$projecttocreate->date_start = $dateemail; // date of email
 								$projecttocreate->date_end = 0;
 								$projecttocreate->opp_status = $id_opp_status;
 								$projecttocreate->opp_percent = $percent_opp_status;
@@ -3342,7 +3342,7 @@ 
 								$candidaturetocreate->note_private = $descriptionfull;
 								$candidaturetocreate->entity = $conf->entity;
 								$candidaturetocreate->email_msgid = $msgid;
-								$candidaturetocreate->email_date = $dateemail;		// date of email
+								$candidaturetocreate->email_date = $dateemail; // date of email
 								$candidaturetocreate->status = $candidaturetocreate::STATUS_DRAFT;
 								//$candidaturetocreate->fk_contact = $contactstatic->id;
 
@@ -3732,8 +3732,8 @@ 
 				 * append increment number to the original filename
 				 */
 				while (file_exists($destdir.$file_name.".".$extension)) {
-					$file_name = $file_name_original . ' (' . $num . ')';
-					$file_name_complete = $file_name . "." . $extension;
+					$file_name = $file_name_original.' ('.$num.')';
+					$file_name_complete = $file_name.".".$extension;
 					$destination = $destdir.$file_name_complete;
 					$num++;
 				}
@@ -3847,7 +3847,7 @@ 
 	 */
 	private function saveAttachment($destdir, $filename, $content)
 	{
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/images.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
 		$tmparraysize = getDefaultImageSizes();
 		$maxwidthsmall = $tmparraysize['maxwidthsmall'];

htdocs/core/modules/DolibarrModules.class.php

Indentation -1 removed lines

@@ -424,7 +424,6 @@
 	 * 				Another example : array('always'=>array("modBanque", "modFacture", "modProduct", "modCategorie"), 'FR'=>array('modBlockedLog'));
 	 * Note: Example in modTakePos:  array('always'=>array("modBanque", "modFacture", "modProduct", "modCategorie"), 'FR'=>array('modBlockedLog'));
 	 *       Example in modAccounting: array("modFacture", "modBanque", "modTax");
-
 	 * @see $requiredby
 	 */
 	public $depends;

Spacing +40 added lines, -40 removed lines

@@ -140,7 +140,7 @@ 
 
 	const KEY_ID = 0;
 	const KEY_LABEL = 1;
-	const KEY_TYPE = 2;	// deprecated
+	const KEY_TYPE = 2; // deprecated
 	const KEY_DEFAULT = 3;
 	const KEY_FIRST_LEVEL = 4;
 	const KEY_SECOND_LEVEL = 5;
@@ -714,7 +714,7 @@ 
 				$moduleNameInConf = 'supplier_proposal';
 			}
 
-			unset($conf->modules[$moduleNameInConf]);	// Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
+			unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
 
 			return 1;
 		} else {
@@ -810,7 +810,7 @@ 
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile) {     // Mostly for external modules
-			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024);	// Max size loaded 1Mb
+			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
 
 			if ((float) DOL_VERSION >= 6.0) {
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -1574,7 +1574,7 @@ 
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1597,15 +1597,15 @@ 
 	public function insert_cronjobs()
 	{
 		// phpcs:enable
-		include_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
-		include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
 
 		global $conf, $user;
 
 		$err = 0;
 
 		if (is_array($this->cronjobs)) {
-			dol_syslog(get_class($this) . "::insert_cronjobs", LOG_DEBUG);
+			dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
 
 			foreach ($this->cronjobs as $key => $value) {
 				$now = dol_now();
@@ -1632,25 +1632,25 @@ 
 				$test = isset($value['test']) ? $value['test'] : ''; // Line must be enabled or not (so visible or not)
 
 				// Search if cron entry already present
-				$sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "cronjob";
+				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
 				//$sql .= " WHERE module_name = '" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "'";
 				$sql .= " WHERE label = '".$this->db->escape($label)."'";
 				if ($classesname) {
-					$sql .= " AND classesname = '" . $this->db->escape($classesname) . "'";
+					$sql .= " AND classesname = '".$this->db->escape($classesname)."'";
 				}
 				if ($objectname) {
-					$sql .= " AND objectname = '" . $this->db->escape($objectname) . "'";
+					$sql .= " AND objectname = '".$this->db->escape($objectname)."'";
 				}
 				if ($methodename) {
-					$sql .= " AND methodename = '" . $this->db->escape($methodename) . "'";
+					$sql .= " AND methodename = '".$this->db->escape($methodename)."'";
 				}
 				if ($command) {
-					$sql .= " AND command = '" . $this->db->escape($command) . "'";
+					$sql .= " AND command = '".$this->db->escape($command)."'";
 				}
 				if ($params) {
-					$sql .= " AND params = '" . $this->db->escape($params) . "'";
+					$sql .= " AND params = '".$this->db->escape($params)."'";
 				}
-				$sql .= " AND entity = " . ((int) $entity); // Must be exact entity
+				$sql .= " AND entity = ".((int) $entity); // Must be exact entity
 
 				$result = $this->db->query($sql);
 				if (!$result) {
@@ -1976,9 +1976,9 @@ 
 
 				// If the module is active
 				foreach ($this->rights as $key => $value) {
-					$r_id = $this->rights[$key][self::KEY_ID];	// permission id in llx_rights_def (not unique because primary key is couple id-entity)
+					$r_id = $this->rights[$key][self::KEY_ID]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
 					$r_label = $this->rights[$key][self::KEY_LABEL];
-					$r_type	= $this->rights[$key][self::KEY_TYPE] ?? 'w';	// TODO deprecated
+					$r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w'; // TODO deprecated
 					$r_default = $this->rights[$key][self::KEY_DEFAULT] ?? 0;
 					$r_perms = $this->rights[$key][self::KEY_FIRST_LEVEL] ?? '';
 					$r_subperms = $this->rights[$key][self::KEY_SECOND_LEVEL] ?? '';
@@ -2002,7 +2002,7 @@ 
 					}
 
 					// condition to show or hide a user right (default: 1) (eg isModEnabled('anothermodule') or ($conf->global->MAIN_FEATURES_LEVEL > 0) or etc..)
-					$r_enabled	= $this->rights[$key][self::KEY_ENABLED] ?? '1';
+					$r_enabled = $this->rights[$key][self::KEY_ENABLED] ?? '1';
 
 					// Search if perm already present
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
@@ -2019,7 +2019,7 @@ 
 							$sql .= ", libelle";
 							$sql .= ", module";
 							$sql .= ", module_origin";
-							$sql .= ", type";	// TODO deprecated
+							$sql .= ", type"; // TODO deprecated
 							$sql .= ", bydefault";
 							$sql .= ", perms";
 							$sql .= ", subperms";
@@ -2030,7 +2030,7 @@ 
 							$sql .= ", '".$this->db->escape($r_label)."'";
 							$sql .= ", '".$this->db->escape($r_module)."'";
 							$sql .= ", '".$this->db->escape($r_module_origin)."'";
-							$sql .= ", '".$this->db->escape($r_type)."'";	// TODO deprecated
+							$sql .= ", '".$this->db->escape($r_type)."'"; // TODO deprecated
 							$sql .= ", ".((int) $r_default);
 							$sql .= ", '".$this->db->escape($r_perms)."'";
 							$sql .= ", '".$this->db->escape($r_subperms)."'";
@@ -2252,7 +2252,7 @@ 
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
 		$sql .= " WHERE module = '".$this->db->escape($module)."'";
-		$sql .= " AND menu_handler = 'all'";	// We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
+		$sql .= " AND menu_handler = 'all'"; // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
 		$sql .= " AND entity IN (0, ".$conf->entity.")";
 
 		dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
@@ -2636,36 +2636,36 @@ 
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
+			$versionTitle = $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
 				$versionTitle .= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
-			$return .=  '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
-			$return .=  $this->getVersion(1);
-			$return .=  '</span>';
+			$return .= '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
+			$return .= $this->getVersion(1);
+			$return .= '</span>';
 		}
 
-		$return .=  '</div>
+		$return .= '</div>
 	    <div class="info-box-content info-box-text-module'.(!getDolGlobalString($const_name) ? '' : ' info-box-module-enabled'.($versiontrans ? ' info-box-content-warning' : '')).'">
 	    <span class="info-box-title">'.$this->getName().'</span>
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
-		$return .=  '<div class="valignmiddle inline-block info-box-more">';
+		$return .= '<div class="valignmiddle inline-block info-box-more">';
 		//if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
-		$return .=  '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-		$return .=  '</div><br>';
-
-		$return .=  '<div class="valignmiddle inline-block info-box-actions">';
-		$return .=  '<div class="valignmiddle inline-block info-box-setup">';
-		$return .=  $codetoconfig;
-		$return .=  '</div>';
-		$return .=  '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
-		$return .=  $codeenabledisable;
-		$return .=  '</div>';
-		$return .=  '</div>';
-
-		$return .=  '
+		$return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+		$return .= '</div><br>';
+
+		$return .= '<div class="valignmiddle inline-block info-box-actions">';
+		$return .= '<div class="valignmiddle inline-block info-box-setup">';
+		$return .= $codetoconfig;
+		$return .= '</div>';
+		$return .= '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
+		$return .= $codeenabledisable;
+		$return .= '</div>';
+		$return .= '</div>';
+
+		$return .= '
 	    </div><!-- /.info-box-content -->
 	    </div><!-- /.info-box -->
 	    </div>';
@@ -2685,7 +2685,7 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
-			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
 				// Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
 				$this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);

htdocs/core/triggers/interface_50_modLdap_Ldapsynchro.class.php

Spacing +8 added lines, -8 removed lines

@@ -112,7 +112,7 @@ 
 				if ($result > 0) {
 					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-						$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+						$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
 					$oldinfo = $object->oldcopy->_load_ldap_info();
@@ -192,7 +192,7 @@ 
 				if ($result > 0) {
 					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-						$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+						$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
 					$oldinfo = $object->oldcopy->_load_ldap_info();
@@ -225,7 +225,7 @@ 
 				if ($result > 0) {
 					$info = $object->_load_ldap_info();
 					$dn = $object->_load_ldap_dn($info);
-					$search = "(" . $object->_load_ldap_dn($info, 2) . ")";
+					$search = "(".$object->_load_ldap_dn($info, 2).")";
 					$uAC = $ldap->getAttributeValues($search, "userAccountControl");
 					if ($uAC["count"] == 1) {
 						$userAccountControl = intval($uAC[0]);
@@ -240,11 +240,11 @@ 
 						// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 						$resUpdate = $ldap->update($dn, $info, $user, $dn);
 						if ($resUpdate < 0) {
-							$this->error = "ErrorLDAP " . $ldap->error;
+							$this->error = "ErrorLDAP ".$ldap->error;
 						}
 					}
 				} else {
-					$this->error = "ErrorLDAP " . $ldap->error;
+					$this->error = "ErrorLDAP ".$ldap->error;
 				}
 			}
 		} elseif ($action == 'USER_DELETE') {
@@ -379,7 +379,7 @@ 
 				if ($result > 0) {
 					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-						$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+						$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
 					$oldinfo = $object->oldcopy->_load_ldap_info();
@@ -524,7 +524,7 @@ 
 				if ($result > 0) {
 					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-						$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+						$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
 					$oldinfo = $object->oldcopy->_load_ldap_info();
@@ -729,7 +729,7 @@ 
 				if ($result > 0) {
 					if (empty($object->oldcopy) || !is_object($object->oldcopy)) {
 						dol_syslog("Trigger ".$action." was called by a function that did not set previously the property ->oldcopy onto object", LOG_WARNING);
-						$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+						$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 					}
 
 					$object->oldcopy->listMembersForMemberType('', 1);

dev/tools/phan/config.php

Spacing +71 added lines, -71 removed lines

@@ -76,12 +76,12 @@ 
 	'bom' => 'Bom',
 	'bookcal' => 'BookCal',
 	'bookmark' => 'Bookmark',
-	'cashdesk' => null,  // TODO: fill in proper class
+	'cashdesk' => null, // TODO: fill in proper class
 	'category' => 'Categorie',
 	'clicktodial' => 'ClickToDial',
 	'collab' => 'Collab',
 	'comptabilite' => 'Comptabilite',
-	'contact' => null,  // TODO: fill in proper class
+	'contact' => null, // TODO: fill in proper class
 	'contract' => 'Contrat',
 	'cron' => 'Cron',
 	'datapolicy' => 'DataPolicy',
@@ -93,7 +93,7 @@ 
 	'don' => 'Don',
 	'dynamicprices' => 'DynamicPrices',
 	'ecm' => 'ECM',
-	'ecotax' => null,  // TODO: External module ?
+	'ecotax' => null, // TODO: External module ?
 	'emailcollector' => 'EmailCollector',
 	'eventorganization' => 'EventOrganization',
 	'expensereport' => 'ExpenseReport',
@@ -104,7 +104,7 @@ 
 	'fournisseur' => 'Fournisseur',
 	'ftp' => 'FTP',
 	'geoipmaxmind' => 'GeoIPMaxmind',
-	'google' => null,  // External ?
+	'google' => null, // External ?
 	'gravatar' => 'Gravatar',
 	'holiday' => 'Holiday',
 	'hrm' => 'HRM',
@@ -118,7 +118,7 @@ 
 	'ldap' => 'Ldap',
 	'loan' => 'Loan',
 	'mailing' => 'Mailing',
-	'mailman' => null,  // Same module as mailmanspip -> MailmanSpip ??
+	'mailman' => null, // Same module as mailmanspip -> MailmanSpip ??
 	'mailmanspip' => 'MailmanSpip',
 	'margin' => 'Margin',
 	'member' => 'Adherent',
@@ -131,7 +131,7 @@ 
 	'notification' => 'Notification',
 	'numberwords' => null, // Not provided by default, no module tests
 	'oauth' => 'OAuth',
-	'openstreetmap' => null,  // External module?
+	'openstreetmap' => null, // External module?
 	'opensurvey' => 'OpenSurvey',
 	'order' => 'Commande',
 	'partnership' => 'Partnership',
@@ -158,8 +158,8 @@ 
 	'stock' => 'Stock',
 	'stocktransfer' => 'StockTransfer',
 	'stripe' => 'Stripe',
-	'supplier_invoice' => null,  // Special case, uses invoice
-	'supplier_order' => null,  // Special case, uses invoice
+	'supplier_invoice' => null, // Special case, uses invoice
+	'supplier_order' => null, // Special case, uses invoice
 	'supplier_proposal' => 'SupplierProposal',
 	'syslog' => 'Syslog',
 	'takepos' => 'TakePos',
@@ -221,7 +221,7 @@ 
 	//	'processes' => 6,
 	'backward_compatibility_checks' => false,
 	'simplify_ast' => true,
-	'analyzed_file_extensions' => ['php','inc'],
+	'analyzed_file_extensions' => ['php', 'inc'],
 	'globals_type_map' => [
 		'action' => 'string',
 		'actioncode' => 'string',
@@ -272,7 +272,7 @@ 
 		'objsoc' => '\Societe',
 		'senderissupplier' => 'int<0,2>',
 		'user' => '\User',
-		'website' => 'string',  // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334  // Disable because Phan infers Website type
+		'website' => 'string', // See discussion https://github.com/Dolibarr/dolibarr/pull/28891#issuecomment-2002268334  // Disable because Phan infers Website type
 		'websitepage' => '\WebSitePage',
 		'websitepagefile' => 'string',
 		// 'object' => '\CommonObject',  // Deprecated, not enabled because conflicts with $object assignments
@@ -296,7 +296,7 @@ 
 	// your application should be included in this list.
 	'directory_list' => [
 		'htdocs',
-		PHAN_DIR . '/stubs/',
+		PHAN_DIR.'/stubs/',
 	],
 
 	// A directory list that defines files that will be excluded
@@ -314,7 +314,7 @@ 
 		'htdocs/includes/',
 		'htdocs/install/doctemplates/websites/',
 		'htdocs/core/class/lessc.class.php', // External library
-		PHAN_DIR . '/stubs/',
+		PHAN_DIR.'/stubs/',
 	],
 	//'exclude_file_regex' => '@^vendor/.*/(tests?|Tests?)/@',
 	'exclude_file_regex' => '@^('  // @phpstan-ignore-line
@@ -331,7 +331,7 @@ 
 		.'|htdocs/includes/stripe/.*'  // @phpstan-ignore-line
 		.'|htdocs/conf/conf.php'  // @phpstan-ignore-line
 		// .'|htdocs/[^h].*/.*'  // For testing @phpstan-ignore-line
-		.')@',  // @phpstan-ignore-line
+		.')@', // @phpstan-ignore-line
 
 	// A list of plugin files to execute.
 	// Plugins which are bundled with Phan can be added here by providing their name
@@ -347,14 +347,14 @@ 
 		'/^isModEnabled$/' => [0, $moduleNameRegex, 'UnknownModuleName'],
 		// Note: trick to have different key for same regex:
 		'/^isModEnable[d]$/' => [0, $deprecatedModuleNameRegex, "DeprecatedModuleName"],
-		'/^sanitizeVal$/' => [1, $sanitizeRegex,"UnknownSanitizeType"],
-		'/^checkVal$/' => [1, $sanitizeRegex,"UnknownCheckValSanitizeType"],
-		'/^\\\\ExtraFields::addExtraField$/' => [2, $extraFieldTypeRegex,"UnknownExtrafieldTypeBack"],
-		'/^dol_now$/' => [0, '{^(?:auto|gmt|tz(?:server|ref|user(?:rel)?))$}',"InvalidDolNowArgument"],
-		'/^dol_mktime$/' => [6, '{^(?:|0|1|auto|gmt|tz(?:server|ref|user(?:rel)?|,[+a-zA-Z-/]+))$}',"InvalidDolMktimeArgument"],  // '', 0, 1 match bool and int values
-		'/^dol_print_date$/' => [2, '{^(?:|0|1|auto|gmt|tz(?:server|user(?:rel)?))$}',"InvalidDolMktimeArgument"],  // '', 0, 1 match bool and int values
-		'/^GETPOSTFLOAT$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}',"InvalidGetPostFloatRounding"],
-		'/^price2num$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}',"InvalidPrice2NumRounding"],
+		'/^sanitizeVal$/' => [1, $sanitizeRegex, "UnknownSanitizeType"],
+		'/^checkVal$/' => [1, $sanitizeRegex, "UnknownCheckValSanitizeType"],
+		'/^\\\\ExtraFields::addExtraField$/' => [2, $extraFieldTypeRegex, "UnknownExtrafieldTypeBack"],
+		'/^dol_now$/' => [0, '{^(?:auto|gmt|tz(?:server|ref|user(?:rel)?))$}', "InvalidDolNowArgument"],
+		'/^dol_mktime$/' => [6, '{^(?:|0|1|auto|gmt|tz(?:server|ref|user(?:rel)?|,[+a-zA-Z-/]+))$}', "InvalidDolMktimeArgument"], // '', 0, 1 match bool and int values
+		'/^dol_print_date$/' => [2, '{^(?:|0|1|auto|gmt|tz(?:server|user(?:rel)?))$}', "InvalidDolMktimeArgument"], // '', 0, 1 match bool and int values
+		'/^GETPOSTFLOAT$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}', "InvalidGetPostFloatRounding"],
+		'/^price2num$/' => [1, '{^(?:|M[UTS]|C[UT]|\d+)$}', "InvalidPrice2NumRounding"],
 	],
 	'plugins' => [
 		__DIR__.'/plugins/NoVarDumpPlugin.php',
@@ -415,40 +415,40 @@ 
 		// Dolibarr uses a lot of internal deprecated stuff, not reporting
 		'PhanDeprecatedProperty',
 
-		'PhanCompatibleNegativeStringOffset',	// return false positive
-		'PhanPluginConstantVariableBool',		// a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanCompatibleNegativeStringOffset', // return false positive
+		'PhanPluginConstantVariableBool', // a lot of false positive, in most cases, we want to keep the code as it is
 		// 'PhanPluginUnknownArrayPropertyType',	// this option costs more time to be supported than it solves time
-		'PhanTypeArraySuspiciousNullable',		// this option costs more time to be supported than it solves time
-		'PhanTypeInvalidDimOffset',				// this option costs more time to be supported than it solves time
+		'PhanTypeArraySuspiciousNullable', // this option costs more time to be supported than it solves time
+		'PhanTypeInvalidDimOffset', // this option costs more time to be supported than it solves time
 		'PhanTypeObjectUnsetDeclaredProperty',
-		'PhanTypePossiblyInvalidDimOffset',			// a lot of false positive, in most cases, we want to keep the code as it is
+		'PhanTypePossiblyInvalidDimOffset', // a lot of false positive, in most cases, we want to keep the code as it is
 		// 'PhanPluginUnknownArrayFunctionReturnType',	// a lot of false positive, in most cases, we want to keep the code as it is
 
-		'PhanPluginWhitespaceTab',		// Dolibarr used tabs
-		'PhanPluginCanUsePHP71Void',	// Dolibarr is maintaining 7.0 compatibility
-		'PhanPluginShortArray',			// Dolibarr uses array()
-		'PhanPluginShortArrayList',		// Dolibarr uses array()
+		'PhanPluginWhitespaceTab', // Dolibarr used tabs
+		'PhanPluginCanUsePHP71Void', // Dolibarr is maintaining 7.0 compatibility
+		'PhanPluginShortArray', // Dolibarr uses array()
+		'PhanPluginShortArrayList', // Dolibarr uses array()
 		// Fixers From PHPDocToRealTypesPlugin:
-		'PhanPluginCanUseParamType',			// Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
-		'PhanPluginCanUseReturnType',			// Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
-		'PhanPluginCanUseNullableParamType',	// Fixer - Report/Add nullable parameter types in the function definition
-		'PhanPluginCanUseNullableReturnType',	// Fixer - Report/Add nullable return types in the function definition
+		'PhanPluginCanUseParamType', // Fixer - Report/Add types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseReturnType', // Fixer - Report/Add return types in the function definition (function abc(string $var) (adds string)
+		'PhanPluginCanUseNullableParamType', // Fixer - Report/Add nullable parameter types in the function definition
+		'PhanPluginCanUseNullableReturnType', // Fixer - Report/Add nullable return types in the function definition
 
-		'PhanPluginNonBoolBranch',			// Not essential - 31240+ occurrences
-		'PhanPluginNumericalComparison',	// Not essential - 19870+ occurrences
-		'PhanTypeMismatchArgument',			// Not essential - 12300+ occurrences
-		'PhanPluginNonBoolInLogicalArith',	// Not essential - 11040+ occurrences
-		'PhanPluginConstantVariableScalar',	// Not essential - 5180+ occurrences
+		'PhanPluginNonBoolBranch', // Not essential - 31240+ occurrences
+		'PhanPluginNumericalComparison', // Not essential - 19870+ occurrences
+		'PhanTypeMismatchArgument', // Not essential - 12300+ occurrences
+		'PhanPluginNonBoolInLogicalArith', // Not essential - 11040+ occurrences
+		'PhanPluginConstantVariableScalar', // Not essential - 5180+ occurrences
 		'PhanPluginDuplicateAdjacentStatement',
-		'PhanPluginDuplicateConditionalTernaryDuplication',		// 2750+ occurrences
-		'PhanPluginDuplicateConditionalNullCoalescing',	// Not essential - 990+ occurrences
-		'PhanPluginRedundantAssignmentInGlobalScope',	// Not essential, a lot of false warning
-		'PhanPluginRedundantAssignment',				// Not essential, useless
-		'PhanPluginDuplicateCatchStatementBody',  // Requires PHP7.1 - 50+ occurrences
+		'PhanPluginDuplicateConditionalTernaryDuplication', // 2750+ occurrences
+		'PhanPluginDuplicateConditionalNullCoalescing', // Not essential - 990+ occurrences
+		'PhanPluginRedundantAssignmentInGlobalScope', // Not essential, a lot of false warning
+		'PhanPluginRedundantAssignment', // Not essential, useless
+		'PhanPluginDuplicateCatchStatementBody', // Requires PHP7.1 - 50+ occurrences
 
 		// 'PhanPluginUnknownArrayMethodParamType',	// Too many troubles to manage. Is enabled in config_extended only.
 		// 'PhanPluginUnknownArrayMethodReturnType',	// Too many troubles to manage. Is enabled in config_extended only.
-		'PhanUndeclaredGlobalVariable',			// Too many false positives on .tpl.php files. Is enabled into config_extended only.
+		'PhanUndeclaredGlobalVariable', // Too many false positives on .tpl.php files. Is enabled into config_extended only.
 		// 'PhanPluginUnknownObjectMethodCall',	// False positive for some class. Is enabled in config_extended only.
 	],
 	// You can put relative paths to internal stubs in this config option.
@@ -468,31 +468,31 @@ 
 		//'xdebug'	=> 'vendor/phan/phan/.phan/internal_stubs/xdebug.phan_php',
 		//'memcached'  => PHAN_DIR . '/your_internal_stubs_folder_name/memcached.phan_php',
 		//'PDO'  => PHAN_DIR . '/stubs/PDO.phan_php',
-		'brotli'  => PHAN_DIR . '/stubs/brotli.phan_php',
-		'curl'  => PHAN_DIR . '/stubs/curl.phan_php',
-		'calendar'  => PHAN_DIR . '/stubs/calendar.phan_php',
-		'fileinfo'  => PHAN_DIR . '/stubs/fileinfo.phan_php',
-		'ftp'  => PHAN_DIR . '/stubs/ftp.phan_php',
-		'gd'  => PHAN_DIR . '/stubs/gd.phan_php',
-		'geoip'  => PHAN_DIR . '/stubs/geoip.phan_php',
-		'imagick'  => PHAN_DIR . '/stubs/imagick.phan_php',
-		'imap'  => PHAN_DIR . '/stubs/imap.phan_php',
-		'intl'  => PHAN_DIR . '/stubs/intl.phan_php',
-		'ldap'  => PHAN_DIR . '/stubs/ldap.phan_php',
-		'mcrypt'  => PHAN_DIR . '/stubs/mcrypt.phan_php',
-		'memcache'  => PHAN_DIR . '/stubs/memcache.phan_php',
-		'memcached' => PHAN_DIR . '/stubs/memcached.phan_php',
-		'mysqli'  => PHAN_DIR . '/stubs/mysqli.phan_php',
-		'pdo_cubrid'  => PHAN_DIR . '/stubs/pdo_cubrid.phan_php',
-		'pdo_mysql'  => PHAN_DIR . '/stubs/pdo_mysql.phan_php',
-		'pdo_pgsql'  => PHAN_DIR . '/stubs/pdo_pgsql.phan_php',
-		'pdo_sqlite'  => PHAN_DIR . '/stubs/pdo_sqlite.phan_php',
-		'pgsql'  => PHAN_DIR . '/stubs/pgsql.phan_php',
-		'session'  => PHAN_DIR . '/stubs/session.phan_php',
-		'simplexml'  => PHAN_DIR . '/stubs/SimpleXML.phan_php',
-		'soap'  => PHAN_DIR . '/stubs/soap.phan_php',
-		'sockets'  => PHAN_DIR . '/stubs/sockets.phan_php',
-		'tidy'  => PHAN_DIR . '/stubs/tidy.phan_php',
-		'zip'  => PHAN_DIR . '/stubs/zip.phan_php',
+		'brotli'  => PHAN_DIR.'/stubs/brotli.phan_php',
+		'curl'  => PHAN_DIR.'/stubs/curl.phan_php',
+		'calendar'  => PHAN_DIR.'/stubs/calendar.phan_php',
+		'fileinfo'  => PHAN_DIR.'/stubs/fileinfo.phan_php',
+		'ftp'  => PHAN_DIR.'/stubs/ftp.phan_php',
+		'gd'  => PHAN_DIR.'/stubs/gd.phan_php',
+		'geoip'  => PHAN_DIR.'/stubs/geoip.phan_php',
+		'imagick'  => PHAN_DIR.'/stubs/imagick.phan_php',
+		'imap'  => PHAN_DIR.'/stubs/imap.phan_php',
+		'intl'  => PHAN_DIR.'/stubs/intl.phan_php',
+		'ldap'  => PHAN_DIR.'/stubs/ldap.phan_php',
+		'mcrypt'  => PHAN_DIR.'/stubs/mcrypt.phan_php',
+		'memcache'  => PHAN_DIR.'/stubs/memcache.phan_php',
+		'memcached' => PHAN_DIR.'/stubs/memcached.phan_php',
+		'mysqli'  => PHAN_DIR.'/stubs/mysqli.phan_php',
+		'pdo_cubrid'  => PHAN_DIR.'/stubs/pdo_cubrid.phan_php',
+		'pdo_mysql'  => PHAN_DIR.'/stubs/pdo_mysql.phan_php',
+		'pdo_pgsql'  => PHAN_DIR.'/stubs/pdo_pgsql.phan_php',
+		'pdo_sqlite'  => PHAN_DIR.'/stubs/pdo_sqlite.phan_php',
+		'pgsql'  => PHAN_DIR.'/stubs/pgsql.phan_php',
+		'session'  => PHAN_DIR.'/stubs/session.phan_php',
+		'simplexml'  => PHAN_DIR.'/stubs/SimpleXML.phan_php',
+		'soap'  => PHAN_DIR.'/stubs/soap.phan_php',
+		'sockets'  => PHAN_DIR.'/stubs/sockets.phan_php',
+		'tidy'  => PHAN_DIR.'/stubs/tidy.phan_php',
+		'zip'  => PHAN_DIR.'/stubs/zip.phan_php',
 	],
 ];