Dolibarr / dolibarr

test/phpunit/BlockedLogAndLNETest.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
  * \brief   PHPUnit test for the BlockedLog and LNE class.
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -58,7 +58,7 @@ 
 	 */
 	public function testBlockedLogAndLNETest()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;

test/phpunit/SecurityGETPOSTTest.php

Spacing +34 added lines, -34 removed lines

@@ -25,33 +25,33 @@ 
  *		\remarks	To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
 
-if (! defined('NOCSRFCHECK')) {
+if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (! defined('NOTOKENRENEWAL')) {
+if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1');
 }
-if (! defined('NOREQUIREMENU')) {
+if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1'); // If there is no menu to show
 }
-if (! defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
 }
-if (! defined('NOREQUIREAJAX')) {
+if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
-if (! defined("NOLOGIN")) {
-	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
-if (! defined("NOSESSION")) {
+if (!defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
 
-require_once dirname(__FILE__).'/../../htdocs/main.inc.php';	// We force include of main.inc.php instead of master.inc.php even if we are in CLI mode because it contains a lot of security components we want to test.
+require_once dirname(__FILE__).'/../../htdocs/main.inc.php'; // We force include of main.inc.php instead of master.inc.php even if we are in CLI mode because it contains a lot of security components we want to test.
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
@@ -80,7 +80,7 @@ 
 	 */
 	public function testGETPOST()
 	{
-		global $conf,$user,$langs,$db,$mysoc;
+		global $conf, $user, $langs, $db, $mysoc;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -97,7 +97,7 @@ 
 		$_GET["param1"] = "222";
 		$_POST["param1"] = "333";
 		$_GET["param2"] = 'a/b#e(pr)qq-rr\cc';
-		$_GET["param3"] = '"na/b#e(pr)qq-rr\cc';    // Same than param2 + " and n
+		$_GET["param3"] = '"na/b#e(pr)qq-rr\cc'; // Same than param2 + " and n
 		$_GET["param4a"] = '../../dir';
 		$_GET["param4b"] = '..\..\dirwindows';
 		$_GET["param4c"] = '\a123 \123 \u123 \x123';
@@ -105,11 +105,11 @@ 
 		$_POST["param6"] = "&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;";
 		$_POST["param6b"] = '<<<../>../>../svg><<<../>../>../animate =alert(1)>abc';
 		$_GET["param7"] = '"c:\this is a path~1\aaa&#110; &#x&#x31;&#x31;&#x30;;" abc<bad>def</bad>';
-		$_POST["param8a"] = "Hacker<svg o&#110;load='console.log(&quot;123&quot;)'";	// html tag is not closed so it is not detected as html tag but is still harmfull
-		$_POST['param8b'] = '<img src=x onerror=alert(document.location) t=';		// this is html obfuscated by non closing tag
+		$_POST["param8a"] = "Hacker<svg o&#110;load='console.log(&quot;123&quot;)'"; // html tag is not closed so it is not detected as html tag but is still harmfull
+		$_POST['param8b'] = '<img src=x onerror=alert(document.location) t='; // this is html obfuscated by non closing tag
 		$_POST['param8c'] = '< with space after is ok';
 		$_POST['param8d'] = '<abc123 is html to clean';
-		$_POST['param8e'] = '<123abc is not html to clean';	// other similar case: '<2021-12-12'
+		$_POST['param8e'] = '<123abc is not html to clean'; // other similar case: '<2021-12-12'
 		$_POST['param8f'] = 'abc<<svg <><<animate onbegin=alert(document.domain) a';
 		$_POST["param9"] = 'is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'objnotdefined\'';
 		$_POST["param10"] = 'is_object($object) ? ($object->id < 10 ? round($object->id / 2, 2) : (2 * $user->id) * (int) substr($mysoc->zip, 1, 2)) : \'<abc>objnotdefined\'';
@@ -129,7 +129,7 @@ 
 		$_GET["param20"] = '<link rel="dns-prefetch" href="//cdnjs.cloudflare.com" />';
 
 
-		$result = GETPOST('id', 'int');              // Must return nothing
+		$result = GETPOST('id', 'int'); // Must return nothing
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
 
@@ -143,7 +143,7 @@ 
 
 		// Test with alpha
 
-		$result = GETPOST("param0", 'alpha');		// a simple format, so " completely removed
+		$result = GETPOST("param0", 'alpha'); // a simple format, so " completely removed
 		$resultexpected = 'A real string with aaa and and \' and & inside content';
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($resultexpected, $result, 'Test on param0');
@@ -152,19 +152,19 @@ 
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('a/b#e(pr)qq-rr\cc', $result, 'Test on param2');
 
-		$result = GETPOST("param3", 'alpha');  // Must return string sanitized from char "
+		$result = GETPOST("param3", 'alpha'); // Must return string sanitized from char "
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('na/b#e(pr)qq-rr\cc', $result, 'Test on param3');
 
-		$result = GETPOST("param4a", 'alpha');  // Must return string sanitized from ../
+		$result = GETPOST("param4a", 'alpha'); // Must return string sanitized from ../
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dir', $result);
 
-		$result = GETPOST("param4b", 'alpha');  // Must return string sanitized from ../
+		$result = GETPOST("param4b", 'alpha'); // Must return string sanitized from ../
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('dirwindows', $result);
 
-		$result = GETPOST("param4c", 'alpha');  // Must return string sanitized from ../
+		$result = GETPOST("param4c", 'alpha'); // Must return string sanitized from ../
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('\a123 /123 /u123 /x123', $result);
 
@@ -174,19 +174,19 @@ 
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, $_GET["param1"]);
 
-		$result = GETPOST("param2", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
+		$result = GETPOST("param2", 'aZ09'); // Must return '' as string contains car not in aZ09 definition
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '');
 
-		$result = GETPOST("param3", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
+		$result = GETPOST("param3", 'aZ09'); // Must return '' as string contains car not in aZ09 definition
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '');
 
-		$result = GETPOST("param4a", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
+		$result = GETPOST("param4a", 'aZ09'); // Must return '' as string contains car not in aZ09 definition
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
 
-		$result = GETPOST("param4b", 'aZ09');  // Must return '' as string contains car not in aZ09 definition
+		$result = GETPOST("param4b", 'aZ09'); // Must return '' as string contains car not in aZ09 definition
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
 
@@ -297,13 +297,13 @@ 
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submitted by CKEditor)", $result, 'Test 14');
 
-		$result = GETPOST("param15", 'restricthtml');		// param15 = <img onxxxx<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+		$result = GETPOST("param15", 'restricthtml'); // param15 = <img onxxxx<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals("<img onxxxx=alert(document.domain) src=>0xbeefed", $result, 'Test 15');	// The GETPOST return a harmull string
+		$this->assertEquals("<img onxxxx=alert(document.domain) src=>0xbeefed", $result, 'Test 15'); // The GETPOST return a harmull string
 
-		$result = GETPOST("param15b", 'restricthtml');		// param15b = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+		$result = GETPOST("param15b", 'restricthtml'); // param15b = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals("<img alert(document.domain) src=>0xbeefed", $result, 'Test 15b');	// The GETPOST return a harmull string
+		$this->assertEquals("<img alert(document.domain) src=>0xbeefed", $result, 'Test 15b'); // The GETPOST return a harmull string
 
 		$result = GETPOST("param19", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
@@ -322,17 +322,17 @@ 
 		print __METHOD__." result for param0=".$result."\n";
 		$this->assertEquals($resultexpected, $result, 'Test on param0');
 
-		$result = GETPOST("param15b", 'restricthtml');		// param15b = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+		$result = GETPOST("param15b", 'restricthtml'); // param15b = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 		print __METHOD__." result for param15b=".$result."\n";
 		//$this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');   // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
 		//$this->assertEquals('<img onerror> src=&gt;0xbeefed', $result, 'Test 15b');	// ... on other PHP and libxml versions, we got a HTML that has been cleaned
 
-		$result = GETPOST("param6", 'restricthtml');		// param6 = "&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;"
+		$result = GETPOST("param6", 'restricthtml'); // param6 = "&quot;&gt;<svg o&#110;load='console.log(&quot;123&quot;)'&gt;"
 		print __METHOD__." result for param6=".$result." - before=".$_POST["param6"]."\n";
 		//$this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');   // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
 		//$this->assertEquals('"&gt;', $result);										// ... on other PHP and libxml versions, we got a HTML that has been cleaned
 
-		$result = GETPOST("param7", 'restricthtml');		// param7 = "c:\this is a path~1\aaa&#110; &#x&#x31;&#x31;&#x30;;" abc<bad>def</bad>
+		$result = GETPOST("param7", 'restricthtml'); // param7 = "c:\this is a path~1\aaa&#110; &#x&#x31;&#x31;&#x30;;" abc<bad>def</bad>
 		print __METHOD__." result param7 = ".$result."\n";
 		//$this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');   // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
 		//$this->assertEquals('"c:\this is a path~1\aaan 110;" abcdef', $result);		// ... on other PHP and libxml versions, we got a HTML that has been cleaned
@@ -354,7 +354,7 @@ 
 			print __METHOD__." result for param0=".$result."\n";
 			$this->assertEquals($resultexpected, $result, 'Test on param0');
 
-			$result = GETPOST("param15b", 'restricthtml');		// param15b = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+			$result = GETPOST("param15b", 'restricthtml'); // param15b = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 			print __METHOD__." result for param15b=".$result."\n";
 			//$this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');   // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
 			//$this->assertEquals('<img onerror> src=&gt;0xbeefed', $result, 'Test 15b');	// ... on other PHP and libxml versions, we got a HTML that has been cleaned
@@ -382,7 +382,7 @@ 
 			print __METHOD__." result for param0=".$result."\n";
 			$this->assertEquals($resultexpected, $result, 'Test on param0');
 
-			$result = GETPOST("param15b", 'restricthtml');		// param15b = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+			$result = GETPOST("param15b", 'restricthtml'); // param15b = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 			print __METHOD__." result=".$result."\n";
 			//$this->assertEquals('InvalidHTMLStringCantBeCleaned', $result, 'Test 15b');   // With some PHP and libxml version, we got this result when parsing invalid HTML, but ...
 			//$this->assertEquals('<img onerror> src=&gt;0xbeefed', $result, 'Test 15b');	// ... on other PHP and libxml versions, we got a HTML that has been cleaned

htdocs/admin/mails_templates.php

Spacing +3 added lines, -3 removed lines

@@ -1203,7 +1203,7 @@ 
 				}
 				print '<td colspan="'.($colspan - 1).'" class="" style="padding-left: 20px; padding-right: 20px;">';
 
-				$fieldsforcontent = array('topic', 'email_from','joinfiles', 'content');
+				$fieldsforcontent = array('topic', 'email_from', 'joinfiles', 'content');
 				if (getDolGlobalString('MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES')) {
 					$fieldsforcontent[] = 'content_lines';
 				}
@@ -1293,7 +1293,7 @@ 
 					continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
 				}
 				// Test on 'enabled'
-				if (! (int) dol_eval((string) $obj->enabled, 1, 1, '1')) {
+				if (!(int) dol_eval((string) $obj->enabled, 1, 1, '1')) {
 					$i++;
 					continue; // Email template not qualified
 				}
@@ -1603,7 +1603,7 @@ 
 					print $form->selectyesno($value, (isset($obj->$value) ? $obj->$value : ''), 1, false, 0, 1);
 				}
 			} else {
-				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->$value) ? $obj->$value : '').'" name="'. $value .'"'.($context == 'preview' ? ' disabled' : '').' spellcheck="false">';
+				print '<input type="text" '.$size.'class="flat'.($class ? ' '.$class : '').'" value="'.(isset($obj->$value) ? $obj->$value : '').'" name="'.$value.'"'.($context == 'preview' ? ' disabled' : '').' spellcheck="false">';
 			}
 			print '</td>';
 			$nboffieldsprinted++;

htdocs/core/customreports.php

Spacing +17 added lines, -17 removed lines

@@ -134,7 +134,7 @@ 
 if ((!is_string($objecttype) || empty($objecttype)) && isModEnabled('societe')) {
 	$objecttype = 'thirdparty';
 }
-'@phan-var-force string $objecttype';  // Help phan that suggests $objecttype can be null
+'@phan-var-force string $objecttype'; // Help phan that suggests $objecttype can be null
 
 require_once DOL_DOCUMENT_ROOT."/core/class/extrafields.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/html.form.class.php";
@@ -241,7 +241,7 @@ 
 }
 
 // Fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label('all');	// We load all extrafields definitions for all objects
+$extrafields->fetch_name_optionals_label('all'); // We load all extrafields definitions for all objects
 //$extrafields->fetch_name_optionals_label($object->table_element_line);
 
 if (!empty($object->table_element)) {
@@ -258,7 +258,7 @@ 
 
 // If string is not an universal filter string, we try to convert it into universal filter syntax string
 $errorstr = '';
-forgeSQLFromUniversalSearchCriteria($search_component_params_input, $errorstr);	// Try conversion UFS->SQL
+forgeSQLFromUniversalSearchCriteria($search_component_params_input, $errorstr); // Try conversion UFS->SQL
 //var_dump($errorstr);
 if ($errorstr) {
 	$value = $search_component_params_input;
@@ -270,14 +270,14 @@ 
 	$crits = explode(' ', trim($value)); // the string after the name of the field. Explode on each AND
 	$res = '';
 
-	$i1 = 0;	// count the nb of and criteria added (all fields / criteria)
+	$i1 = 0; // count the nb of and criteria added (all fields / criteria)
 	foreach ($crits as $crit) {		// Loop on each AND criteria
 		$crit = trim($crit);
 
-		$i2 = 0;	// count the nb of valid criteria added for this first criteria
+		$i2 = 0; // count the nb of valid criteria added for this first criteria
 		$newres = '';
 		$tmpcrits = explode('|', $crit);
-		$i3 = 0;	// count the nb of valid criteria added for this current field
+		$i3 = 0; // count the nb of valid criteria added for this current field
 		foreach ($tmpcrits as $tmpcrit) {
 			if ($tmpcrit !== '0' && empty($tmpcrit)) {
 				continue;
@@ -295,8 +295,8 @@ 
 				}
 			}
 
-			$field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit);		// the name of the field
-			$tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit);	// the condition after the name of the field
+			$field = preg_replace('/(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:).*$/', '', $tmpcrit); // the name of the field
+			$tmpcrit = preg_replace('/^.*(:[!<>=\s]+:|:in:|:notin:|:like:|:notlike:)/', '\1', $tmpcrit); // the condition after the name of the field
 			//var_dump($field); var_dump($tmpcrit); var_dump($i3);
 
 			$newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');
@@ -686,7 +686,7 @@ 
 		foreach ($arrayofmesures as $key => $val) {
 			$simplearrayofmesures[$key] = $arrayofmesures[$key]['label'];
 		}
-		print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300 widthcentpercentminusx', 1, 0, '', '', $langs->transnoentitiesnoconv("Measures"));	// Fill the array $arrayofmeasures with possible fields
+		print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300 widthcentpercentminusx', 1, 0, '', '', $langs->transnoentitiesnoconv("Measures")); // Fill the array $arrayofmeasures with possible fields
 		print '</div>';
 
 		// XAxis
@@ -694,14 +694,14 @@ 
 		print '<div class="divadvancedsearchfield">';
 		print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span><span class="fas fa-caret-down caretdownaxis" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span></div>';
 		//var_dump($arrayofxaxis);
-		print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400 widthcentpercentminusx');	// Fill the array $arrayofxaxis with possible fields
+		print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400 widthcentpercentminusx'); // Fill the array $arrayofxaxis with possible fields
 		print '</div>';
 
 		// Group by
 		$count = 0;
 		print '<div class="divadvancedsearchfield">';
 		print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("GroupBy")).'"></span></div>';
-		print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300 widthcentpercentminusx', $langs->trans("GroupBy"));	// Fill the array $arrayofgroupby with possible fields
+		print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300 widthcentpercentminusx', $langs->trans("GroupBy")); // Fill the array $arrayofgroupby with possible fields
 		print '</div>';
 	}
 
@@ -862,7 +862,7 @@ 
 			//var_dump($arrayofgroupby);
 			$tmpforloop = dolExplodeIntoArray($arrayofxaxis[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -889,7 +889,7 @@ 
 			//var_dump($arrayofgroupby[$val]); var_dump($tmpval);
 			$tmpforloop = dolExplodeIntoArray($arrayofgroupby[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -916,7 +916,7 @@ 
 			//var_dump($arrayofgroupby);
 			$tmpforloop = dolExplodeIntoArray($arrayofmesures[$val]['tablefromt'], ',');
 			foreach ($tmpforloop as $tmptable => $tmptablealias) {
-				if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+				if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 					$tmpforexplode = explode('__', $tmptablealias);
 					$endpart = end($tmpforexplode);
 					$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -951,7 +951,7 @@ 
 				$tmpval = explode('.', $val);
 				$tmpforloop = dolExplodeIntoArray($arrayoffilterfields[$val]['tablefromt'], ',');
 				foreach ($tmpforloop as $tmptable => $tmptablealias) {
-					if (! in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
+					if (!in_array($tmptable, $listoftablesalreadyadded)) {	// We do not add join for main table and tables already added
 						$tmpforexplode = explode('__', $tmptablealias);
 						$endpart = end($tmpforexplode);
 						$parenttableandfield = preg_replace('/__'.$endpart.'$/', '', $tmptablealias).'.'.$endpart;
@@ -987,9 +987,9 @@ 
 			 * @param 	array<int, string> $matches
 			 * @return 	string SQL filter condition
 			 */
-			function (array $matches): string {
+			function(array $matches): string {
 				global $db;
-				$column = $matches[1] . '.' . $matches[2];
+				$column = $matches[1].'.'.$matches[2];
 				$operator = $matches[3];
 				$year = (int) $matches[4];
 				$month = (int) $matches[5];