Dolibarr / dolibarr

test/phpunit/SecurityTest.php

Spacing +282 added lines, -282 removed lines

@@ -24,32 +24,32 @@ 
  *		\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('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-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');
 }
 
@@ -63,7 +63,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -83,7 +83,7 @@ 
 	public function testSetLang()
 	{
 		global $conf;
-		$conf=$this->savconf;
+		$conf = $this->savconf;
 
 		$tmplangs = new Translate('', $conf);
 
@@ -105,7 +105,7 @@ 
 		// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
 
 		// Should be OK
-		$expectedresult=0;
+		$expectedresult = 0;
 
 		/*
 		$test = '';
@@ -113,107 +113,107 @@ 
 		$this->assertGreaterThanOrEqual(0, $result, 'Error on testSqlAndScriptInject kkk');
 		*/
 
-		$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php';
-		$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
+		$_SERVER["PHP_SELF"] = '/DIR WITH SPACE/htdocs/admin/index.php';
+		$result = testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for PHP_SELF that should be ok');
 
 		$test = 'This is a < inside string with < and > also and tag like <a> before the >';
-		$result=testSqlAndScriptInject($test, 0);
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject expected 0b');
 
 		$test = 'This is the union of all for the selection of the best';
-		$result=testSqlAndScriptInject($test, 0);
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject expected 0c');
 
-		$test='/user/perms.php?id=1&action=addrights&entity=1&rights=123&confirm=yes&token=123456789&updatedmodulename=lmscoursetracking';
-		$result=testSqlAndScriptInject($test, 1);
+		$test = '/user/perms.php?id=1&action=addrights&entity=1&rights=123&confirm=yes&token=123456789&updatedmodulename=lmscoursetracking';
+		$result = testSqlAndScriptInject($test, 1);
 		print "test=".$test." result=".$result."\n";
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject with a valid url');
 
 		// Should detect attack
-		$expectedresult=1;
+		$expectedresult = 1;
 
-		$_SERVER["PHP_SELF"]='/DIR WITH SPACE/htdocs/admin/index.php/<svg>';
-		$result=testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
+		$_SERVER["PHP_SELF"] = '/DIR WITH SPACE/htdocs/admin/index.php/<svg>';
+		$result = testSqlAndScriptInject($_SERVER["PHP_SELF"], 2);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject for PHP_SELF that should detect XSS');
 
 		$test = 'select @@version';
-		$result=testSqlAndScriptInject($test, 0);
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL1a. Should find an attack on POST param and did not.');
 
 		$test = 'select @@version';
-		$result=testSqlAndScriptInject($test, 1);
+		$result = testSqlAndScriptInject($test, 1);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL1b. Should find an attack on GET param and did not.');
 
 		$test = '... update ... set ... =';
-		$result=testSqlAndScriptInject($test, 1);
+		$result = testSqlAndScriptInject($test, 1);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL2a. Should find an attack on GET param and did not.');
 
 		$test = "delete\nfrom";
-		$result=testSqlAndScriptInject($test, 1);
+		$result = testSqlAndScriptInject($test, 1);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL2b. Should find an attack on GET param and did not.');
 
 		$test = 'action=update& ... set ... =';
-		$result=testSqlAndScriptInject($test, 1);
+		$result = testSqlAndScriptInject($test, 1);
 		$this->assertEquals(0, $result, 'Error on testSqlAndScriptInject for SQL2b. Should not find an attack on GET param and did.');
 
 		$test = '... union ... selection ';
-		$result=testSqlAndScriptInject($test, 1);
+		$result = testSqlAndScriptInject($test, 1);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL2c. Should find an attack on GET param and did not.');
 
 		$test = 'j&#x61;vascript:';
-		$result=testSqlAndScriptInject($test, 0);
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for javascript1. Should find an attack and did not.');
 
 		$test = 'j&#x61vascript:';
-		$result=testSqlAndScriptInject($test, 0);
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for javascript2. Should find an attack and did not.');
 
 		$test = 'javascript&colon&#x3B;alert(1)';
-		$result=testSqlAndScriptInject($test, 0);
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for javascript2');
 
-		$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
-		$result=testSqlAndScriptInject($test, 0);
+		$test = "<img src='1.jpg' onerror =javascript:alert('XSS')>";
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa1');
 
-		$test="<img src='1.jpg' onerror =javascript:alert('XSS')>";
-		$result=testSqlAndScriptInject($test, 2);
+		$test = "<img src='1.jpg' onerror =javascript:alert('XSS')>";
+		$result = testSqlAndScriptInject($test, 2);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa2');
 
-		$test='<IMG SRC=# onmouseover="alert(1)">';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG SRC=# onmouseover="alert(1)">';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa3');
-		$test='<IMG SRC onmouseover="alert(1)">';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG SRC onmouseover="alert(1)">';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa4');
-		$test='<IMG onmouseover="alert(1)">';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG onmouseover="alert(1)">';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa5');
-		$test='<IMG SRC=/ onerror="alert(1)">';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG SRC=/ onerror="alert(1)">';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa6');
-		$test='<IMG SRC=" &#14;  javascript:alert(1);">';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG SRC=" &#14;  javascript:alert(1);">';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject aaa7');
 
-		$test='<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG SRC=&#106;&#97;&#118;&#97;&#115;&#99;&#114;&#105;&#112;&#116;&#58;&#97;&#108;&#101;&#114;&#116;&#40;&#39;&#88;&#83;&#83;&#39;&#41;>';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject bbb');
 
-		$test='<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<SCRIPT SRC=http://xss.rocks/xss.js></SCRIPT>';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ccc');
 
-		$test='<IMG SRC="javascript:alert(\'XSS\');">';
-		$result=testSqlAndScriptInject($test, 1);
+		$test = '<IMG SRC="javascript:alert(\'XSS\');">';
+		$result = testSqlAndScriptInject($test, 1);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ddd');
 
-		$test='<IMG """><SCRIPT>alert("XSS")</SCRIPT>">';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<IMG """><SCRIPT>alert("XSS")</SCRIPT>">';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
 
-		$test='<!-- Google analytics -->
+		$test = '<!-- Google analytics -->
 			<script>
 			  (function(i,s,o,g,r,a,m){i[\'GoogleAnalyticsObject\']=r;i[r]=i[r]||function(){
 			  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -224,60 +224,60 @@ 
 			  ga(\'send\', \'pageview\');
 
 			</script>';
-		$result=testSqlAndScriptInject($test, 0);
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject eee');
 
-		$test="<IMG SRC=\"jav\tascript:alert('XSS');\">";		// Is locked by some browser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
-		$test="<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">";	// Same
+		$test = "<IMG SRC=\"jav\tascript:alert('XSS');\">"; // Is locked by some browser like chrome because the default directive no-referrer-when-downgrade is sent when requesting the SRC and then refused because of browser protection on img src load without referrer.
+		$test = "<IMG SRC=\"jav&#x0D;ascript:alert('XSS');\">"; // Same
 
-		$test='<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<SCRIPT/XSS SRC="http://xss.rocks/xss.js"></SCRIPT>';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff1');
-		$test='<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<SCRIPT/SRC="http://xss.rocks/xss.js"></SCRIPT>';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject fff2');
 
 		// This case seems to be filtered by browsers now.
-		$test='<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
+		$test = '<BODY onload!#$%&()*~+-_.,:;?@[/|\]^`=alert(1)>';
 		//$result=testSqlAndScriptInject($test, 0);
 		//$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject ggg');
 
-		$test='<iframe src=http://xss.rocks/scriptlet.html <';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<iframe src=http://xss.rocks/scriptlet.html <';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject hhh');
 
-		$test='Set.constructor`alert\x281\x29```';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = 'Set.constructor`alert\x281\x29```';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject iii');
 
-		$test="on<!-- ab\nc -->error=alert(1)";
-		$result=testSqlAndScriptInject($test, 0);
+		$test = "on<!-- ab\nc -->error=alert(1)";
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject jjj');
 
-		$test="<img src=x one<a>rror=alert(document.location)";
-		$result=testSqlAndScriptInject($test, 0);
+		$test = "<img src=x one<a>rror=alert(document.location)";
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject kkk');
 
-		$test="<a onpointerdown=alert(document.domain)>XSS</a>";
-		$result=testSqlAndScriptInject($test, 0);
+		$test = "<a onpointerdown=alert(document.domain)>XSS</a>";
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject lll');
 
-		$test='<a onscrollend=alert(1) style="display:block;overflow:auto;border:1px+dashed;width:500px;height:100px;"><br><br><br><br><br><span+id=x>test</span></a>';	// Add the char %F6 into the variable
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<a onscrollend=alert(1) style="display:block;overflow:auto;border:1px+dashed;width:500px;height:100px;"><br><br><br><br><br><span+id=x>test</span></a>'; // Add the char %F6 into the variable
+		$result = testSqlAndScriptInject($test, 0);
 		//print "test=".$test." result=".$result."\n";
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject mmm');
 
 
-		$test="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submitted by CKEditor)";
-		$result=testSqlAndScriptInject($test, 0);	// result must be 0
+		$test = "Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submitted by CKEditor)";
+		$result = testSqlAndScriptInject($test, 0); // result must be 0
 		$this->assertEquals(0, $result, 'Error on testSqlAndScriptInject mmm, result should be 0 and is not');
 
-		$test ='<a href="j&Tab;a&Tab;v&Tab;asc&NewLine;ri&Tab;pt:&lpar;a&Tab;l&Tab;e&Tab;r&Tab;t&Tab;(document.cookie)&rpar;">XSS</a>';
-		$result=testSqlAndScriptInject($test, 0);
+		$test = '<a href="j&Tab;a&Tab;v&Tab;asc&NewLine;ri&Tab;pt:&lpar;a&Tab;l&Tab;e&Tab;r&Tab;t&Tab;(document.cookie)&rpar;">XSS</a>';
+		$result = testSqlAndScriptInject($test, 0);
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject nnn, result should be >= 1 and is not');
 
-		$test="/dolibarr/htdocs/index.php/".chr('246')."abc";	// Add the char %F6 into the variable
-		$result=testSqlAndScriptInject($test, 2);
+		$test = "/dolibarr/htdocs/index.php/".chr('246')."abc"; // Add the char %F6 into the variable
+		$result = testSqlAndScriptInject($test, 2);
 		//print "test=".$test." result=".$result."\n";
 		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject with a non valid UTF8 char');
 	}
@@ -289,11 +289,11 @@ 
 	 */
 	public function testGETPOST()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		// Force default mode
 		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;
@@ -301,211 +301,211 @@ 
 		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;
 		$conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 0;
 
-		$_COOKIE["id"]=111;
-		$_POST["param0"]='A real string with <a href="rrr" title="aa&quot;bb">aaa</a> and " and \' and &amp; inside content';
-		$_GET["param1"]="222";
-		$_POST["param1"]="333";
-		$_GET["param2"]='a/b#e(pr)qq-rr\cc';
-		$_GET["param3"]='"&#110;a/b#e(pr)qq-rr\cc';    // Same than param2 + " and &#110;
-		$_GET["param4a"]='..&#47;../dir';
-		$_GET["param4b"]='..&#92;..\dirwindows';
-		$_GET["param5"]="a_1-b";
-		$_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['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['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\'';
-		$_POST["param11"]=' Name <email@email.com> ';
-		$_POST["param12"]='<!DOCTYPE html><html>aaa</html>';
-		$_POST["param13"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61;vascript:alert(document.domain)\">XSS</a>';
-		$_POST["param13b"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61vascript:alert(document.domain)\">XSS</a>';
-		$_POST["param13c"]='aaa:<:bbb';
-		$_POST["param14"]="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submitted by CKEditor)";
-		$_POST["param15"]="<img onerror<=alert(document.domain)> src=>0xbeefed";
+		$_COOKIE["id"] = 111;
+		$_POST["param0"] = 'A real string with <a href="rrr" title="aa&quot;bb">aaa</a> and " and \' and &amp; inside content';
+		$_GET["param1"] = "222";
+		$_POST["param1"] = "333";
+		$_GET["param2"] = 'a/b#e(pr)qq-rr\cc';
+		$_GET["param3"] = '"&#110;a/b#e(pr)qq-rr\cc'; // Same than param2 + " and &#110;
+		$_GET["param4a"] = '..&#47;../dir';
+		$_GET["param4b"] = '..&#92;..\dirwindows';
+		$_GET["param5"] = "a_1-b";
+		$_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['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['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\'';
+		$_POST["param11"] = ' Name <email@email.com> ';
+		$_POST["param12"] = '<!DOCTYPE html><html>aaa</html>';
+		$_POST["param13"] = '&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61;vascript:alert(document.domain)\">XSS</a>';
+		$_POST["param13b"] = '&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61vascript:alert(document.domain)\">XSS</a>';
+		$_POST["param13c"] = 'aaa:<:bbb';
+		$_POST["param14"] = "Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submitted by CKEditor)";
+		$_POST["param15"] = "<img onerror<=alert(document.domain)> src=>0xbeefed";
 		//$_POST["param15b"]="<html><head><title>Example HTML</title></head><body><div><p>This is a paragraph.</div><ul><li>Item 1</li><li>Item 2</li></ol></body><html>";
-		$_POST["param16"]='<a style="z-index: 1000">abc</a>';
-		$_POST["param17"]='<span style="background-image: url(logout.php)">abc</span>';
-		$_POST["param18"]='<span style="background-image: url(...?...action=aaa)">abc</span>';
-		$_POST["param19"]='<a href="j&Tab;a&Tab;v&Tab;asc&NewLine;ri&Tab;pt:&lpar;alert(document.cookie)&rpar;">XSS</a>';
+		$_POST["param16"] = '<a style="z-index: 1000">abc</a>';
+		$_POST["param17"] = '<span style="background-image: url(logout.php)">abc</span>';
+		$_POST["param18"] = '<span style="background-image: url(...?...action=aaa)">abc</span>';
+		$_POST["param19"] = '<a href="j&Tab;a&Tab;v&Tab;asc&NewLine;ri&Tab;pt:&lpar;alert(document.cookie)&rpar;">XSS</a>';
 		//$_POST["param19"]='<a href="javascript:alert(document.cookie)">XSS</a>';
 
 
 
-		$result=GETPOST('id', 'int');              // Must return nothing
+		$result = GETPOST('id', 'int'); // Must return nothing
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('', $result);
 
-		$result=GETPOST("param1", 'int');
+		$result = GETPOST("param1", 'int');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(222, $result, 'Test on param1 with no 3rd param');
 
-		$result=GETPOST("param1", 'int', 2);
+		$result = GETPOST("param1", 'int', 2);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(333, $result, 'Test on param1 with 3rd param = 2');
 
 		// 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');
 
-		$result=GETPOST("param2", 'alpha');
+		$result = GETPOST("param2", 'alpha');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, $_GET["param2"], '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($result, 'na/b#e(pr)qq-rr\cc', '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($result, 'dir');
 
-		$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($result, 'dirwindows');
 
 		// Test with aZ09
 
-		$result=GETPOST("param1", 'aZ09');
+		$result = GETPOST("param1", 'aZ09');
 		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);
 
-		$result=GETPOST("param5", 'aZ09');
+		$result = GETPOST("param5", 'aZ09');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($_GET["param5"], $result);
 
 		// Test with nohtml
 
-		$result=GETPOST("param6", 'nohtml');
+		$result = GETPOST("param6", 'nohtml');
 		print __METHOD__." result6=".$result."\n";
 		$this->assertEquals('">', $result);
 
 		// Test with alpha = alphanohtml. We must convert the html entities like &#110; and disable all entities
 
-		$result=GETPOST("param6", 'alphanohtml');
+		$result = GETPOST("param6", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('>', $result);
 
-		$result=GETPOST("param6b", 'alphanohtml');
+		$result = GETPOST("param6b", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('abc', $result);
 
-		$result=GETPOST("param8a", 'alphanohtml');
+		$result = GETPOST("param8a", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("Hackersvg onload='console.log(123)'", $result);
 
-		$result=GETPOST("param8b", 'alphanohtml');
+		$result = GETPOST("param8b", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('img src=x onerror=alert(document.location) t=', $result, 'Test a string with non closing html tag with alphanohtml');
 
-		$result=GETPOST("param8c", 'alphanohtml');
+		$result = GETPOST("param8c", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($_POST['param8c'], $result, 'Test a string with non closing html tag with alphanohtml');
 
-		$result=GETPOST("param8d", 'alphanohtml');
+		$result = GETPOST("param8d", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('abc123 is html to clean', $result, 'Test a string with non closing html tag with alphanohtml');
 
-		$result=GETPOST("param8e", 'alphanohtml');
+		$result = GETPOST("param8e", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($_POST['param8e'], $result, 'Test a string with non closing html tag with alphanohtml');
 
-		$result=GETPOST("param8f", 'alphanohtml');
+		$result = GETPOST("param8f", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('abcsvg animate onbegin=alert(document.domain) a', $result, 'Test a string with html tag open with several <');
 
-		$result=GETPOST("param9", 'alphanohtml');
+		$result = GETPOST("param9", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($_POST["param9"], $result);
 
-		$result=GETPOST("param10", 'alphanohtml');
+		$result = GETPOST("param10", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($_POST["param9"], $result, 'We should get param9 after processing param10');
 
-		$result=GETPOST("param11", 'alphanohtml');
+		$result = GETPOST("param11", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals("Name", $result, 'Test an email string with alphanohtml');
 
-		$result=GETPOST("param13", 'alphanohtml');
+		$result = GETPOST("param13", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('n n > <  XSS', $result, 'Test that html entities are decoded with alpha');
 
-		$result=GETPOST("param13c", 'alphanohtml');
+		$result = GETPOST("param13c", 'alphanohtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('aaa:<:bbb', $result, 'Test 13c');
 
 
 		// Test with alphawithlgt
 
-		$result=GETPOST("param11", 'alphawithlgt');
+		$result = GETPOST("param11", 'alphawithlgt');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(trim($_POST["param11"]), $result, 'Test an email string with alphawithlgt');
 
 
 		// Test with restricthtml: we must remove html open/close tag and content but not htmlentities (we can decode html entities for ascii chars like &#110;)
 
-		$result=GETPOST("param0", 'restricthtml');
+		$result = GETPOST("param0", 'restricthtml');
 		$resultexpected = 'A real string with <a href="rrr" title="aa&quot;bb">aaa</a> and " and \' and &amp; inside content';
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($resultexpected, $result, 'Test on param0');
 
-		$result=GETPOST("param6", 'restricthtml');
+		$result = GETPOST("param6", 'restricthtml');
 		print __METHOD__." result for param6=".$result." - before=".$_POST["param6"]."\n";
 		$this->assertEquals('&quot;&gt;', $result);
 
-		$result=GETPOST("param7", 'restricthtml');
+		$result = GETPOST("param7", 'restricthtml');
 		print __METHOD__." result param7 = ".$result."\n";
 		$this->assertEquals('"c:\this is a path~1\aaan &#x;;;;" abcdef', $result);
 
-		$result=GETPOST("param8e", 'restricthtml');
+		$result = GETPOST("param8e", 'restricthtml');
 		print __METHOD__." result param8e = ".$result."\n";
 		$this->assertEquals('', $result);
 
-		$result=GETPOST("param12", 'restricthtml');
+		$result = GETPOST("param12", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(trim($_POST["param12"]), $result, 'Test a string with DOCTYPE and restricthtml');
 
-		$result=GETPOST("param13", 'restricthtml');
+		$result = GETPOST("param13", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"alert(document.domain)\">XSS</a>', $result, 'Test 13 that HTML entities are decoded with restricthtml, but only for common alpha chars');
 
-		$result=GETPOST("param13b", 'restricthtml');
+		$result = GETPOST("param13b", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('n n &gt; &lt; &quot; <a href=\"alert(document.domain)\">XSS</a>', $result, 'Test 13b that HTML entities are decoded with restricthtml, but only for common alpha chars');
 
-		$result=GETPOST("param14", 'restricthtml');
+		$result = GETPOST("param14", 'restricthtml');
 		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 onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+		$result = GETPOST("param15", 'restricthtml'); // param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals("<img onerror=alert(document.domain) src=>0xbeefed", $result, 'Test 15');	// The GETPOST return a harmull string
+		$this->assertEquals("<img onerror=alert(document.domain) src=>0xbeefed", $result, 'Test 15'); // The GETPOST return a harmull string
 
-		$result=GETPOST("param19", 'restricthtml');
+		$result = GETPOST("param19", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('<a href="&lpar;alert(document.cookie)&rpar;">XSS</a>', $result, 'Test 19');
 
@@ -515,22 +515,22 @@ 
 		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 0;
 
 		//$_POST["param0"] = 'A real string with <a href="rrr" title="aabb">aaa</a> and " inside content';
-		$result=GETPOST("param0", 'restricthtml');
+		$result = GETPOST("param0", 'restricthtml');
 		$resultexpected = 'A real string with <a href="rrr" title=\'aa"bb\'>aaa</a> and " and \' and &amp; inside content';
 		print __METHOD__." result for param0=".$result."\n";
 		$this->assertEquals($resultexpected, $result, 'Test on param0');
 
-		$result=GETPOST("param15", 'restricthtml');		// param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+		$result = GETPOST("param15", 'restricthtml'); // param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 		print __METHOD__." result for param15=".$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
@@ -542,19 +542,19 @@ 
 			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;
 			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
 
-			$result=GETPOST("param0", 'restricthtml');
+			$result = GETPOST("param0", 'restricthtml');
 			$resultexpected = 'A real string with <a href="rrr" title="aa&quot;bb">aaa</a> and " and \' and & inside content';
 			print __METHOD__." result for param0=".$result."\n";
 			$this->assertEquals($resultexpected, $result, 'Test on param0');
 
-			$result=GETPOST("param15", 'restricthtml');		// param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+			$result = GETPOST("param15", 'restricthtml'); // param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 			print __METHOD__." result=".$result."\n";
 
-			$result=GETPOST("param6", 'restricthtml');
+			$result = GETPOST("param6", 'restricthtml');
 			print __METHOD__." result for param6=".$result." - before=".$_POST["param6"]."\n";
 			$this->assertEquals('"&gt;', $result);
 
-			$result=GETPOST("param7", 'restricthtml');
+			$result = GETPOST("param7", 'restricthtml');
 			print __METHOD__." result param7 = ".$result."\n";
 			$this->assertEquals('"c:\this is a path~1\aaan &amp;#x110;" abcdef', $result);
 		}
@@ -566,19 +566,19 @@ 
 			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 1;
 			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
 
-			$result=GETPOST("param0", 'restricthtml');
+			$result = GETPOST("param0", 'restricthtml');
 			$resultexpected = 'A real string with <a href="rrr" title=\'aa"bb\'>aaa</a> and " and \' and & inside content';
 			print __METHOD__." result for param0=".$result."\n";
 			$this->assertEquals($resultexpected, $result, 'Test on param0');
 
-			$result=GETPOST("param15", 'restricthtml');		// param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
+			$result = GETPOST("param15", 'restricthtml'); // param15 = <img onerror<=alert(document.domain)> src=>0xbeefed that is a dangerous string
 			print __METHOD__." result=".$result."\n";
 
-			$result=GETPOST("param6", 'restricthtml');
+			$result = GETPOST("param6", 'restricthtml');
 			print __METHOD__." result for param6=".$result." - before=".$_POST["param6"]."\n";
 			$this->assertEquals('"&gt;', $result);
 
-			$result=GETPOST("param7", 'restricthtml');
+			$result = GETPOST("param7", 'restricthtml');
 			print __METHOD__." result param7 = ".$result."\n";
 			$this->assertEquals('"c:\this is a path~1\aaan 110;" abcdef', $result);
 		}
@@ -590,19 +590,19 @@ 
 		unset($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY);
 		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 1;
 
-		$result=GETPOST("param15", 'restricthtml');
+		$result = GETPOST("param15", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('<img src="">0xbeefed', $result, 'Test 15c');
 
-		$result=GETPOST('param16', 'restricthtml');
+		$result = GETPOST('param16', 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('<a style=" 1000">abc</a>', $result, 'Test tag a with forbidden attribute z-index');
 
-		$result=GETPOST('param17', 'restricthtml');
+		$result = GETPOST('param17', 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('<span style="background-image: url()">abc</span>', $result, 'Test anytag with a forbidden value for attribute');
 
-		$result=GETPOST('param18', 'restricthtml');
+		$result = GETPOST('param18', 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('<span style="background-image: url(...?...aaa)">abc</span>', $result, 'Test anytag with a forbidden value for attribute');
 
@@ -611,75 +611,75 @@ 
 
 		// Special test for GETPOST of backtopage, backtolist or backtourl parameter
 
-		$_POST["backtopage"]='//www.google.com';
-		$result=GETPOST("backtopage");
+		$_POST["backtopage"] = '//www.google.com';
+		$result = GETPOST("backtopage");
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('www.google.com', $result, 'Test for backtopage param');
 
-		$_POST["backtopage"]='https:https://www.google.com';
-		$result=GETPOST("backtopage");
+		$_POST["backtopage"] = 'https:https://www.google.com';
+		$result = GETPOST("backtopage");
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('www.google.com', $result, 'Test for backtopage param');
 
-		$_POST["backtolist"]='::HTTPS://www.google.com';
-		$result=GETPOST("backtolist");
+		$_POST["backtolist"] = '::HTTPS://www.google.com';
+		$result = GETPOST("backtolist");
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('www.google.com', $result, 'Test for backtopage param');
 
-		$_POST["backtopage"]='http:www.google.com';
-		$result=GETPOST("backtopage");
+		$_POST["backtopage"] = 'http:www.google.com';
+		$result = GETPOST("backtopage");
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('httpwww.google.com', $result, 'Test for backtopage param');
 
-		$_POST["backtopage"]='/mydir/mypage.php?aa=a%10a';
-		$result=GETPOST("backtopage");
+		$_POST["backtopage"] = '/mydir/mypage.php?aa=a%10a';
+		$result = GETPOST("backtopage");
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('/mydir/mypage.php?aa=a%10a', $result, 'Test for backtopage param');
 
-		$_POST["backtopage"]='javascripT&javascript#javascriptxjavascript3a alert(1)';
-		$result=GETPOST("backtopage");
+		$_POST["backtopage"] = 'javascripT&javascript#javascriptxjavascript3a alert(1)';
+		$result = GETPOST("backtopage");
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('x3aalert(1)', $result, 'Test for backtopage param');
 
 
 		$conf->global->MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT = 3;
-		$_POST["pagecontentwithlinks"]='<img src="aaa"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
-		$result=GETPOST("pagecontentwithlinks", 'restricthtml');
+		$_POST["pagecontentwithlinks"] = '<img src="aaa"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
+		$result = GETPOST("pagecontentwithlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('ErrorTooManyLinksIntoHTMLString', $result, 'Test on limit on GETPOST fails');
 
 		// Test that img src="data:..." is excluded from the count of external links
 		$conf->global->MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT = 3;
-		$_POST["pagecontentwithlinks"]='<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
-		$result=GETPOST("pagecontentwithlinks", 'restricthtml');
+		$_POST["pagecontentwithlinks"] = '<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
+		$result = GETPOST("pagecontentwithlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>', $result, 'Test on limit on GETPOST fails');
 
 		$conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 2;
 
 		// Test that no links is allowed
-		$_POST["pagecontentwithlinks"]='<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
-		$result=GETPOST("pagecontentwithlinks", 'restricthtml');
+		$_POST["pagecontentwithlinks"] = '<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
+		$result = GETPOST("pagecontentwithlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('ErrorHTMLLinksNotAllowed', $result, 'Test on limit on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 2 (no links allowed)');
 
 		$conf->global->MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1;
 
 		// Test that links on wrapper or local url are allowed
-		$_POST["pagecontentwithnowrapperlinks"]='<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
-		$result=GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
+		$_POST["pagecontentwithnowrapperlinks"] = '<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>';
+		$result = GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('<img src="data:abc"><img src="bbb"><img src="/ccc"><span style="background: url(/ddd)"></span>', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (links on data or relative links ar allowed)');
 
 		// Test that links not on wrapper and not data are disallowed
-		$_POST["pagecontentwithnowrapperlinks"]='<img src="https://aaa">';
-		$result=GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
+		$_POST["pagecontentwithnowrapperlinks"] = '<img src="https://aaa">';
+		$result = GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('ErrorHTMLExternalLinksNotAllowed', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (no links to http allowed)');
 
 		// Test that links not on wrapper and not data are disallowed
-		$_POST["pagecontentwithnowrapperlinks"]='<span style="background: url(http://ddd)"></span>';
-		$result=GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
+		$_POST["pagecontentwithnowrapperlinks"] = '<span style="background: url(http://ddd)"></span>';
+		$result = GETPOST("pagecontentwithnowrapperlinks", 'restricthtml');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('ErrorHTMLExternalLinksNotAllowed', $result, 'Test on MAIN_DISALLOW_URL_INTO_DESCRIPTIONS = 1 (no links to http allowed)');
 
@@ -693,15 +693,15 @@ 
 	 */
 	public function testEncodeDecode()
 	{
-		$stringtotest="This is a string to test encode/decode. This is a string to test encode/decode. This is a string to test encode/decode.";
+		$stringtotest = "This is a string to test encode/decode. This is a string to test encode/decode. This is a string to test encode/decode.";
 
-		$encodedstring=dol_encode($stringtotest);
-		$decodedstring=dol_decode($encodedstring);
+		$encodedstring = dol_encode($stringtotest);
+		$decodedstring = dol_decode($encodedstring);
 		print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
 		$this->assertEquals($stringtotest, $decodedstring, 'Use dol_encode/decode with no parameter');
 
-		$encodedstring=dol_encode($stringtotest, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
-		$decodedstring=dol_decode($encodedstring, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+		$encodedstring = dol_encode($stringtotest, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
+		$decodedstring = dol_decode($encodedstring, 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ');
 		print __METHOD__." encodedstring=".$encodedstring." ".base64_encode($stringtotest)."\n";
 		$this->assertEquals($stringtotest, $decodedstring, 'Use dol_encode/decode with a key parameter');
 
@@ -720,7 +720,7 @@ 
 		$this->assertEquals('a &colon; b " c \' d &apos; e é', $decodedstring, 'Function did not sanitize correclty');
 
 		$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
-		$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES|ENT_HTML5);
+		$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES | ENT_HTML5);
 		$this->assertEquals('a : b " c \' d \' e é', $decodedstring, 'Function did not sanitize correclty');
 
 		return 0;
@@ -784,21 +784,21 @@ 
 	{
 		global $conf;
 
-		$genpass1=getRandomPassword(true);				// Should be a string return by dol_hash (if no option set, will be md5)
+		$genpass1 = getRandomPassword(true); // Should be a string return by dol_hash (if no option set, will be md5)
 		print __METHOD__." genpass1=".$genpass1."\n";
 		$this->assertEquals(strlen($genpass1), 32);
 
-		$genpass1=getRandomPassword(true, array('I'));	// Should be a string return by dol_hash (if no option set, will be md5)
+		$genpass1 = getRandomPassword(true, array('I')); // Should be a string return by dol_hash (if no option set, will be md5)
 		print __METHOD__." genpass1=".$genpass1."\n";
 		$this->assertEquals(strlen($genpass1), 32);
 
-		$conf->global->USER_PASSWORD_GENERATED='None';
-		$genpass2=getRandomPassword(false);				// Should return an empty string
+		$conf->global->USER_PASSWORD_GENERATED = 'None';
+		$genpass2 = getRandomPassword(false); // Should return an empty string
 		print __METHOD__." genpass2=".$genpass2."\n";
 		$this->assertEquals($genpass2, '');
 
-		$conf->global->USER_PASSWORD_GENERATED='Standard';
-		$genpass3=getRandomPassword(false);				// Should return a password of 12 chars
+		$conf->global->USER_PASSWORD_GENERATED = 'Standard';
+		$genpass3 = getRandomPassword(false); // Should return a password of 12 chars
 		print __METHOD__." genpass3=".$genpass3."\n";
 		$this->assertEquals(strlen($genpass3), 12);
 
@@ -812,16 +812,16 @@ 
 	 */
 	public function testRestrictedArea()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		//$dummyuser=new User($db);
 		//$result=restrictedArea($dummyuser,'societe');
 
-		$result=restrictedArea($user, 'societe');
+		$result = restrictedArea($user, 'societe');
 		$this->assertEquals(1, $result);
 	}
 
@@ -839,42 +839,42 @@ 
 		$url = 'ftp://mydomain.com';
 		$tmp = getURLContent($url);
 		print __METHOD__." url=".$url."\n";
-		$this->assertRegExp("/not supported/", $tmp['curl_error_msg'], "Should disable ftp connection");	// Test error if return does not contains 'not supported'
+		$this->assertRegExp("/not supported/", $tmp['curl_error_msg'], "Should disable ftp connection"); // Test error if return does not contains 'not supported'
 
-		$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
-		$tmp = getURLContent($url, 'GET', '', 0);	// We do NOT follow
+		$url = 'https://www.dolibarr.fr'; // This is a redirect 301 page
+		$tmp = getURLContent($url, 'GET', '', 0); // We do NOT follow
 		print __METHOD__." url=".$url."\n";
 		$this->assertEquals(301, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url 301 response');
 
-		$url = 'https://www.dolibarr.fr';	// This is a redirect 301 page
-		$tmp = getURLContent($url);		// We DO follow a page with return 300 so result should be 200
+		$url = 'https://www.dolibarr.fr'; // This is a redirect 301 page
+		$tmp = getURLContent($url); // We DO follow a page with return 300 so result should be 200
 		print __METHOD__." url=".$url."\n";
 		$this->assertEquals(200, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url 301 with a follow -> 200 but we get '.(empty($tmp['http_code']) ? 0 : $tmp['http_code']));
 
 		$url = 'http://localhost';
-		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0); // Only external URL
 		print __METHOD__." url=".$url."\n";
-		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that resolves to a local URL');	// Test we receive an error because localtest.me is not an external URL
+		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that resolves to a local URL'); // Test we receive an error because localtest.me is not an external URL
 
 		$url = 'http://127.0.0.1';
-		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0); // Only external URL
 		print __METHOD__." url=".$url."\n";
-		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that is a local URL');	// Test we receive an error because 127.0.0.1 is not an external URL
+		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that is a local URL'); // Test we receive an error because 127.0.0.1 is not an external URL
 
 		$url = 'http://127.0.2.1';
-		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0); // Only external URL
 		print __METHOD__." url=".$url."\n";
-		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that is a local URL');	// Test we receive an error because 127.0.2.1 is not an external URL
+		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that is a local URL'); // Test we receive an error because 127.0.2.1 is not an external URL
 
 		$url = 'https://169.254.0.1';
-		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0); // Only external URL
 		print __METHOD__." url=".$url."\n";
-		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that is a local URL');	// Test we receive an error because 169.254.0.1 is not an external URL
+		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that is a local URL'); // Test we receive an error because 169.254.0.1 is not an external URL
 
 		$url = 'http://[::1]';
-		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0); // Only external URL
 		print __METHOD__." url=".$url."\n";
-		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that is a local URL');	// Test we receive an error because [::1] is not an external URL
+		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Should GET url to '.$url.' that is a local URL'); // Test we receive an error because [::1] is not an external URL
 
 		/*$url = 'localtest.me';
 		 $tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL
@@ -883,9 +883,9 @@ 
 		 */
 
 		$url = 'http://192.0.0.192';
-		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0);		// Only external URL but on an IP in blacklist
+		$tmp = getURLContent($url, 'GET', '', 0, array(), array('http', 'https'), 0); // Only external URL but on an IP in blacklist
 		print __METHOD__." url=".$url." tmp['http_code'] = ".(empty($tmp['http_code']) ? 0 : $tmp['http_code'])."\n";
-		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Access should be refused and was not');	// Test we receive an error because ip is in blacklist
+		$this->assertEquals(400, (empty($tmp['http_code']) ? 0 : $tmp['http_code']), 'Access should be refused and was not'); // Test we receive an error because ip is in blacklist
 
 		return 0;
 	}
@@ -897,22 +897,22 @@ 
 	 */
 	public function testDolSanitizeUrl()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$test = 'javascripT&javascript#x3a alert(1)';
-		$result=dol_sanitizeUrl($test);
+		$result = dol_sanitizeUrl($test);
 		$this->assertEquals('x3a alert(1)', $result, 'Test on dol_sanitizeUrl A');
 
 		$test = 'javajavascriptscript&cjavascriptolon;alert(1)';
-		$result=dol_sanitizeUrl($test);
+		$result = dol_sanitizeUrl($test);
 		$this->assertEquals('alert(1)', $result, 'Test on dol_sanitizeUrl B');
 
 		$test = '/javas:cript/google.com';
-		$result=dol_sanitizeUrl($test);
+		$result = dol_sanitizeUrl($test);
 		$this->assertEquals('google.com', $result, 'Test on dol_sanitizeUrl C');
 	}
 
@@ -923,26 +923,26 @@ 
 	 */
 	public function testDolSanitizeEmail()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$test = 'aaa@mycompany.com <My name>, bbb@mycompany.com <Another name>';
-		$result=dol_sanitizeEmail($test);
+		$result = dol_sanitizeEmail($test);
 		$this->assertEquals($test, $result, 'Test on dol_sanitizeEmail A');
 
 		$test = "aaa@mycompany.com <My name>,\nbbb@mycompany.com <Another name>";
-		$result=dol_sanitizeEmail($test);
+		$result = dol_sanitizeEmail($test);
 		$this->assertEquals('aaa@mycompany.com <My name>,bbb@mycompany.com <Another name>', $result, 'Test on dol_sanitizeEmail B');
 
 		$test = 'aaa@mycompany.com <My name>,\nbbb@mycompany.com <Another name>';
-		$result=dol_sanitizeEmail($test);
+		$result = dol_sanitizeEmail($test);
 		$this->assertEquals('aaa@mycompany.com <My name>,nbbb@mycompany.com <Another name>', $result, 'Test on dol_sanitizeEmail C');
 
 		$test = 'aaa@mycompany.com <My name>, "bcc:bbb"@mycompany.com <Another name>';
-		$result=dol_sanitizeEmail($test);
+		$result = dol_sanitizeEmail($test);
 		$this->assertEquals('aaa@mycompany.com <My name>, bccbbb@mycompany.com <Another name>', $result, 'Test on dol_sanitizeEmail D');
 	}
 
@@ -953,19 +953,19 @@ 
 	 */
 	public function testDolSanitizeFileName()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		//$dummyuser=new User($db);
 		//$result=restrictedArea($dummyuser,'societe');
 
-		$result=dol_sanitizeFileName('bad file | evilaction');
+		$result = dol_sanitizeFileName('bad file | evilaction');
 		$this->assertEquals('bad file _ evilaction', $result);
 
-		$result=dol_sanitizeFileName('bad file -evilparam --evilparam ---evilparam ----evilparam');
+		$result = dol_sanitizeFileName('bad file -evilparam --evilparam ---evilparam ----evilparam');
 		$this->assertEquals('bad file _evilparam _evilparam _evilparam _evilparam', $result);
 	}
 
@@ -976,17 +976,17 @@ 
 	 */
 	public function testDolEval()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=dol_eval('1==1', 1, 0);
+		$result = dol_eval('1==1', 1, 0);
 		print "result1 = ".$result."\n";
 		$this->assertTrue($result);
 
-		$result=dol_eval('1==2', 1, 0);
+		$result = dol_eval('1==2', 1, 0);
 		print "result2 = ".$result."\n";
 		$this->assertFalse($result);
 
@@ -994,7 +994,7 @@ 
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 		$s = '(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : "Parent project not found"';
-		$result=dol_eval($s, 1, 1, '2');
+		$result = dol_eval($s, 1, 1, '2');
 		print "result3 = ".$result."\n";
 		$this->assertEquals('Parent project not found', $result);
 
@@ -1035,48 +1035,48 @@ 
 		print "result12 = ".$result."\n";
 		$this->assertStringContainsString('Bad string syntax to evaluate', $result);
 
-		$result=dol_eval("90402.38+267678+0", 1, 1, 1);
+		$result = dol_eval("90402.38+267678+0", 1, 1, 1);
 		print "result13 = ".$result."\n";
 		$this->assertEquals('358080.38', $result);
 
-		global $leftmenu;	// Used into strings to eval
+		global $leftmenu; // Used into strings to eval
 
 		$leftmenu = 'AAA';
-		$result=dol_eval('$conf->currency && preg_match(\'/^(AAA|BBB)/\',$leftmenu)', 1, 1, '1');
+		$result = dol_eval('$conf->currency && preg_match(\'/^(AAA|BBB)/\',$leftmenu)', 1, 1, '1');
 		print "result = ".$result."\n";
 		$this->assertTrue($result);
 
 		// Same with a value that does not match
 		$leftmenu = 'XXX';
-		$result=dol_eval('$conf->currency && preg_match(\'/^(AAA|BBB)/\',$leftmenu)', 1, 1, '1');
+		$result = dol_eval('$conf->currency && preg_match(\'/^(AAA|BBB)/\',$leftmenu)', 1, 1, '1');
 		print "result14 = ".$result."\n";
 		$this->assertFalse($result);
 
 		$leftmenu = 'AAA';
-		$result=dol_eval('$conf->currency && isStringVarMatching(\'leftmenu\', \'(AAA|BBB)\')', 1, 1, '1');
+		$result = dol_eval('$conf->currency && isStringVarMatching(\'leftmenu\', \'(AAA|BBB)\')', 1, 1, '1');
 		print "result15 = ".$result."\n";
 		$this->assertTrue($result);
 
 		$leftmenu = 'XXX';
-		$result=dol_eval('$conf->currency && isStringVarMatching(\'leftmenu\', \'(AAA|BBB)\')', 1, 1, '1');
+		$result = dol_eval('$conf->currency && isStringVarMatching(\'leftmenu\', \'(AAA|BBB)\')', 1, 1, '1');
 		print "result16 = ".$result."\n";
 		$this->assertFalse($result);
 
 		$string = '(isModEnabled("agenda") || isModEnabled("resource")) && getDolGlobalInt("MAIN_FEATURES_LEVEL") >= 0 && preg_match(\'/^(admintools|all|XXX)/\', $leftmenu)';
-		$result=dol_eval($string, 1, 1, '1');
+		$result = dol_eval($string, 1, 1, '1');
 		print "result17 = ".$result."\n";
 		$this->assertTrue($result);
 
-		$result=dol_eval('1 && getDolGlobalInt("doesnotexist1") && $conf->global->MAIN_FEATURES_LEVEL', 1, 0);	// Should return false and not a 'Bad string syntax to evaluate ...'
+		$result = dol_eval('1 && getDolGlobalInt("doesnotexist1") && $conf->global->MAIN_FEATURES_LEVEL', 1, 0); // Should return false and not a 'Bad string syntax to evaluate ...'
 		print "result18 = ".$result."\n";
 		$this->assertFalse($result);
 
-		$a='ab';
+		$a = 'ab';
 		$result = (string) dol_eval("(\$a.'s')", 1, 0);
 		print "result19 = ".$result."\n";
 		$this->assertStringContainsString('Bad string syntax to evaluate', $result);
 
-		$leftmenu='abs';
+		$leftmenu = 'abs';
 		$result = (string) dol_eval('$leftmenu(-5)', 1, 0);
 		print "result20 = ".$result."\n";
 		$this->assertStringContainsString('Bad string syntax to evaluate', $result);
@@ -1094,12 +1094,12 @@ 
 		global $conf;
 
 		// Set options for cleaning data
-		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0;	// disabled, does not work on HTML5 and some libxml versions
+		$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML = 0; // disabled, does not work on HTML5 and some libxml versions
 		// Enabled option MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY if possible
 		if (extension_loaded('tidy') && class_exists("tidy")) {
 			$conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML_TIDY = 1;
 		}
-		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0;	// disabled, does not work on HTML5 and some libxml versions
+		$conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES = 0; // disabled, does not work on HTML5 and some libxml versions
 
 
 
@@ -1112,7 +1112,7 @@ 
 		//$result = dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags(dol_htmlentitiesbr($stringtotest), 1, 1, 1, 0)), 1, 1, 'common', 0, 1);
 		$result = dolPrintHTML($stringtotest);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals($stringfixed, $result, 'Error');    // Expected '' because should failed because login 'auto' does not exists
+		$this->assertEquals($stringfixed, $result, 'Error'); // Expected '' because should failed because login 'auto' does not exists
 
 
 		// For a string that is already HTML (contains HTML tags) with special tags but badly formatted
@@ -1161,24 +1161,24 @@ 
 	 */
 	public function testCheckLoginPassEntity()
 	{
-		$login=checkLoginPassEntity('loginbidon', 'passwordbidon', 1, array('dolibarr'));
+		$login = checkLoginPassEntity('loginbidon', 'passwordbidon', 1, array('dolibarr'));
 		print __METHOD__." login=".$login."\n";
 		$this->assertEquals($login, '');
 
-		$login=checkLoginPassEntity('admin', 'passwordbidon', 1, array('dolibarr'));
+		$login = checkLoginPassEntity('admin', 'passwordbidon', 1, array('dolibarr'));
 		print __METHOD__." login=".$login."\n";
 		$this->assertEquals($login, '');
 
-		$login=checkLoginPassEntity('admin', 'admin', 1, array('dolibarr'));            // Should works because admin/admin exists
+		$login = checkLoginPassEntity('admin', 'admin', 1, array('dolibarr')); // Should works because admin/admin exists
 		print __METHOD__." login=".$login."\n";
 		$this->assertEquals($login, 'admin', 'The test to check if pass of user "admin" is "admin" has failed');
 
-		$login=checkLoginPassEntity('admin', 'admin', 1, array('http','dolibarr'));    // Should work because of second authentication method
+		$login = checkLoginPassEntity('admin', 'admin', 1, array('http', 'dolibarr')); // Should work because of second authentication method
 		print __METHOD__." login=".$login."\n";
 		$this->assertEquals($login, 'admin');
 
-		$login=checkLoginPassEntity('admin', 'admin', 1, array('forceuser'));
+		$login = checkLoginPassEntity('admin', 'admin', 1, array('forceuser'));
 		print __METHOD__." login=".$login."\n";
-		$this->assertEquals('', $login, 'Error');    // Expected '' because should failed because login 'auto' does not exists
+		$this->assertEquals('', $login, 'Error'); // Expected '' because should failed because login 'auto' does not exists
 	}
 }

test/phpunit/StripeTest.php

Spacing +11 added lines, -11 removed lines

@@ -24,7 +24,7 @@ 
  *		\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';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -56,14 +56,14 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		if (!isModEnabled('stripe')) {
 			print __METHOD__." Module Stripe must be enabled.\n";
 			die(1);
 		}
 
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -76,16 +76,16 @@ 
 	 */
 	public function testStripeOk()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$urltotest=getOnlinePaymentUrl(0, 'free');
+		$urltotest = getOnlinePaymentUrl(0, 'free');
 		print "urltotest=".$urltotest."\n";
 
-		$result=getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($urltotest, 'GET', '', 1, array(), array('http', 'https'), 2);
 
 		print __METHOD__." result=".$result['http_code']."\n";
 		$this->assertEquals(200, $result['http_code']);

test/phpunit/UserGroupTest.php

Spacing +49 added lines, -49 removed lines

@@ -24,7 +24,7 @@ 
  *      \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';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,15 +55,15 @@ 
 	 */
 	public function testUserGroupCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new UserGroup($db);
+		$localobject = new UserGroup($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
@@ -80,14 +80,14 @@ 
 	 */
 	public function testUserGroupFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new UserGroup($db);
-		$result=$localobject->fetch($id);
+		$localobject = new UserGroup($db);
+		$result = $localobject->fetch($id);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." id=".$id." result=".$result."\n";
@@ -104,14 +104,14 @@ 
 	 */
 	public function testUserGroupUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject->note='New note after update';
-		$result=$localobject->update($user);
+		$localobject->note = 'New note after update';
+		$result = $localobject->update($user);
 
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
@@ -128,13 +128,13 @@ 
 	 */
 	public function testUserGroupAddRight($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->addrights(1, 'bookmarks');
+		$result = $localobject->addrights(1, 'bookmarks');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -151,13 +151,13 @@ 
 	 */
 	public function testUserGroupDelRight($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->delrights(1, 'bookmarks');
+		$result = $localobject->delrights(1, 'bookmarks');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 
 		$this->assertLessThan($result, 0);
@@ -174,11 +174,11 @@ 
 	 */
 	public function testUserGroupOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$result = $localobject->generateDocument('templatenamethadoesnotexist', $langs);
 		print __METHOD__." result=".$result."\n";
@@ -197,15 +197,15 @@ 
 	 */
 	public function testUserGroupDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new UserGroup($db);
-		$result=$localobject->fetch($id);
-		$result=$localobject->delete($user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new UserGroup($db);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
 
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);

test/phpunit/BuildDocTest.php

Spacing +93 added lines, -93 removed lines

@@ -26,7 +26,7 @@ 
  *      			See also PdfDocTest to test methods
  */
 
-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';
@@ -66,7 +66,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -85,7 +85,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		if (!isModEnabled('facture')) {
 			print __METHOD__." invoice module not enabled\n";
@@ -131,20 +131,20 @@ 
 	 */
 	public function testFactureBuild()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$conf->facture->dir_output.='/temp';
+		$conf->facture->dir_output .= '/temp';
 
-		$localobjectcom=new Commande($db);
+		$localobjectcom = new Commande($db);
 		$localobjectcom->initAsSpecimen();
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->createFromOrder($localobjectcom, $user);
-		$localobject->date_lim_reglement = dol_now() + 3600 * 24 *30;
+		$localobject->date_lim_reglement = dol_now() + 3600 * 24 * 30;
 		$localobject->status = Facture::STATUS_DRAFT;
 
 		// To be sure we are not using the Swiss QR Code addition
@@ -155,7 +155,7 @@ 
 		$conf->global->MAIN_DISABLE_TCPDI = 1;
 
 		// Crabe (english)
-		$localobject->model_pdf='crabe';
+		$localobject->model_pdf = 'crabe';
 		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result." for generation from crabe\n";
@@ -164,55 +164,55 @@ 
 		$conf->global->MAIN_DISABLE_TCPDI = 0;
 
 		// Crabe (english)
-		$localobject->model_pdf='crabe';
+		$localobject->model_pdf = 'crabe';
 		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result." for generation from crabe with MAIN_DISABLE_TCPDI and a watermark\n";
 
 		// Crabe (japanese)
-		$newlangs1=new Translate("", $conf);
+		$newlangs1 = new Translate("", $conf);
 		$newlangs1->setDefaultLang('ja_JP');
-		$localobject->model_pdf='crabe';
+		$localobject->model_pdf = 'crabe';
 		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs1);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
 
 		// Crabe (saudiarabia)
-		$newlangs2a=new Translate("", $conf);
+		$newlangs2a = new Translate("", $conf);
 		$newlangs2a->setDefaultLang('sa_SA');
-		$localobject->model_pdf='crabe';
+		$localobject->model_pdf = 'crabe';
 		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs2a);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
 
 		// Crabe (english_saudiarabia)
-		$newlangs2b=new Translate("", $conf);
+		$newlangs2b = new Translate("", $conf);
 		$newlangs2b->setDefaultLang('en_SA');
-		$localobject->model_pdf='crabe';
+		$localobject->model_pdf = 'crabe';
 		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs2b);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
 
 		// Crabe (greek)
-		$newlangs3=new Translate("", $conf);
+		$newlangs3 = new Translate("", $conf);
 		$newlangs3->setDefaultLang('el_GR');
-		$localobject->model_pdf='crabe';
+		$localobject->model_pdf = 'crabe';
 		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs3);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
 
 		// Crabe (chinese)
-		$newlangs4=new Translate("", $conf);
+		$newlangs4 = new Translate("", $conf);
 		$newlangs4->setDefaultLang('zh_CN');
-		$localobject->model_pdf='crabe';
+		$localobject->model_pdf = 'crabe';
 		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs4);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
 
 		// Crabe (russian)
-		$newlangs5=new Translate("", $conf);
+		$newlangs5 = new Translate("", $conf);
 		$newlangs5->setDefaultLang('ru_RU');
-		$localobject->model_pdf='crabe';
+		$localobject->model_pdf = 'crabe';
 		$result = $localobject->generateDocument($localobject->model_pdf, $newlangs5);
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
@@ -227,18 +227,18 @@ 
 	*/
 	public function testFactureFournisseurBuild()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$conf->fournisseur->facture->dir_output.='/temp';
-		$localobject=new FactureFournisseur($db);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$conf->fournisseur->facture->dir_output .= '/temp';
+		$localobject = new FactureFournisseur($db);
 		$localobject->initAsSpecimen();
 
 		// Canelle
-		$localobject->model_pdf='canelle';
+		$localobject->model_pdf = 'canelle';
 		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
 		$this->assertLessThan($result, 0);
@@ -254,18 +254,18 @@ 
 	 */
 	public function testCommandeBuild()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$conf->commande->dir_output.='/temp';
-		$localobject=new Commande($db);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$conf->commande->dir_output .= '/temp';
+		$localobject = new Commande($db);
 		$localobject->initAsSpecimen();
 
 		// Einstein
-		$localobject->model_pdf='einstein';
+		$localobject->model_pdf = 'einstein';
 		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
 		$this->assertLessThan($result, 0);
@@ -282,19 +282,19 @@ 
 	 */
 	public function testCommandeFournisseurBuild()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$conf->fournisseur->commande->dir_output.='/temp';
-		$localobject=new CommandeFournisseur($db);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$conf->fournisseur->commande->dir_output .= '/temp';
+		$localobject = new CommandeFournisseur($db);
 		$localobject->initAsSpecimen();
 
 		// Muscadet
-		$localobject->model_pdf='muscadet';
-		$result= $localobject->generateDocument($localobject->model_pdf, $langs);
+		$localobject->model_pdf = 'muscadet';
+		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
@@ -309,18 +309,18 @@ 
 	 */
 	public function testPropalBuild()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$conf->propal->dir_output.='/temp';
-		$localobject=new Propal($db);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$conf->propal->dir_output .= '/temp';
+		$localobject = new Propal($db);
 		$localobject->initAsSpecimen();
 
 		// Azur
-		$localobject->model_pdf='azur';
+		$localobject->model_pdf = 'azur';
 		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
 		$this->assertLessThan($result, 0);
@@ -336,17 +336,17 @@ 
 	 */
 	public function testProjectBuild()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-		$conf->project->dir_output.='/temp';
-		$localobject=new Project($db);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+		$conf->project->dir_output .= '/temp';
+		$localobject = new Project($db);
 		$localobject->initAsSpecimen();
 
 		// Baleine
-		$localobject->model_pdf='baleine';
+		$localobject->model_pdf = 'baleine';
 		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
 		$this->assertLessThan($result, 0);
@@ -362,19 +362,19 @@ 
 	 */
 	public function testFichinterBuild()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$conf->ficheinter->dir_output.='/temp';
-		$localobject=new Fichinter($db);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$conf->ficheinter->dir_output .= '/temp';
+		$localobject = new Fichinter($db);
 		$localobject->initAsSpecimen();
 
 		// Soleil
-		$localobject->model_pdf='soleil';
-		$result=fichinter_create($db, $localobject, $localobject->model_pdf, $langs);
+		$localobject->model_pdf = 'soleil';
+		$result = fichinter_create($db, $localobject, $localobject->model_pdf, $langs);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
@@ -389,26 +389,26 @@ 
 	 */
 	public function testExpeditionBuild()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$conf->expedition->dir_output.='/temp';
-		$localobject=new Expedition($db);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$conf->expedition->dir_output .= '/temp';
+		$localobject = new Expedition($db);
 		$localobject->initAsSpecimen();
 
 		// Merou
-		$localobject->model_pdf='merou';
-		$result= $localobject->generateDocument($localobject->model_pdf, $langs);
+		$localobject->model_pdf = 'merou';
+		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";
 
 		// Rouget
-		$localobject->model_pdf='rouget';
-		$result= $localobject->generateDocument($localobject->model_pdf, $langs);
+		$localobject->model_pdf = 'rouget';
+		$result = $localobject->generateDocument($localobject->model_pdf, $langs);
 
 		$this->assertLessThan($result, 0);
 		print __METHOD__." result=".$result."\n";

test/phpunit/SocieteTest.php

Spacing +124 added lines, -124 removed lines

@@ -24,7 +24,7 @@ 
  *      \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';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -38,7 +38,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -57,10 +57,10 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		if ($conf->global->SOCIETE_CODECLIENT_ADDON != 'mod_codeclient_monkey') {
-			print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '" . getDolGlobalString('SOCIETE_CODECLIENT_ADDON')."'.\n";
+			print "\n".__METHOD__." third party ref checker must be setup to 'mod_codeclient_monkey' not to '".getDolGlobalString('SOCIETE_CODECLIENT_ADDON')."'.\n";
 			die(1);
 		}
 
@@ -74,7 +74,7 @@ 
 			die(1);
 		}
 
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -86,15 +86,15 @@ 
 	 */
 	public function testSocieteCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Societe($db);
+		$localobject = new Societe($db);
 		$localobject->initAsSpecimen();
-		$result=$localobject->create($user);
+		$result = $localobject->create($user);
 
 		print __METHOD__." result=".$result."\n";
 		$this->assertLessThanOrEqual($result, 0);
@@ -113,18 +113,18 @@ 
 	 */
 	public function testSocieteFetch($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject=new Societe($db);
-		$result=$localobject->fetch($id);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Societe($db);
+		$result = $localobject->fetch($id);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
-		$result=$localobject->verify();
+		$result = $localobject->verify();
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertEquals($result, 0);
 
@@ -142,43 +142,43 @@ 
 	 */
 	public function testSocieteUpdate($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$localobject->note_private='New private note after update';
-		$localobject->note_public='New public note after update';
-		$localobject->name='New name';
-		$localobject->address='New address';
-		$localobject->zip='New zip';
-		$localobject->town='New town';
-		$localobject->country_id=2;
-		$localobject->status=0;
-		$localobject->phone='New tel';
-		$localobject->fax='New fax';
-		$localobject->email='newemail@newemail.com';
-		$localobject->url='New url';
-		$localobject->idprof1='new idprof1';
-		$localobject->idprof2='new idprof2';
-		$localobject->idprof3='new idprof3';
-		$localobject->idprof4='new idprof4';
-
-		$result=$localobject->update($localobject->id, $user);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject->note_private = 'New private note after update';
+		$localobject->note_public = 'New public note after update';
+		$localobject->name = 'New name';
+		$localobject->address = 'New address';
+		$localobject->zip = 'New zip';
+		$localobject->town = 'New town';
+		$localobject->country_id = 2;
+		$localobject->status = 0;
+		$localobject->phone = 'New tel';
+		$localobject->fax = 'New fax';
+		$localobject->email = 'newemail@newemail.com';
+		$localobject->url = 'New url';
+		$localobject->idprof1 = 'new idprof1';
+		$localobject->idprof2 = 'new idprof2';
+		$localobject->idprof3 = 'new idprof3';
+		$localobject->idprof4 = 'new idprof4';
+
+		$result = $localobject->update($localobject->id, $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
-		$result=$localobject->update_note($localobject->note_private, '_private');
+		$result = $localobject->update_note($localobject->note_private, '_private');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (private) error');
 
-		$result=$localobject->update_note($localobject->note_public, '_public');
+		$result = $localobject->update_note($localobject->note_public, '_public');
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0, 'Holiday::update_note (public) error');
 
-		$newobject=new Societe($db);
-		$result=$newobject->fetch($localobject->id);
+		$newobject = new Societe($db);
+		$result = $newobject->fetch($localobject->id);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -215,42 +215,42 @@ 
 	public function testIdProfCheck($localobject)
 	{
 		// OK FR
-		$localobject->country_code='FR';
-		$localobject->idprof1=493861496;
-		$localobject->idprof2=49386149600021;
-		$result=$localobject->id_prof_check(1, $localobject);    // Must be > 0
+		$localobject->country_code = 'FR';
+		$localobject->idprof1 = 493861496;
+		$localobject->idprof2 = 49386149600021;
+		$result = $localobject->id_prof_check(1, $localobject); // Must be > 0
 		print __METHOD__." OK FR idprof1 result=".$result."\n";
 		$this->assertGreaterThanOrEqual(1, $result);
-		$result=$localobject->id_prof_check(2, $localobject);    // Must be > 0
+		$result = $localobject->id_prof_check(2, $localobject); // Must be > 0
 		print __METHOD__." OK FR idprof2 result=".$result."\n";
 		$this->assertGreaterThanOrEqual(1, $result);
 
 		// KO FR
-		$localobject->country_code='FR';
-		$localobject->idprof1='id1ko';
-		$localobject->idprof2='id2ko';
-		$result=$localobject->id_prof_check(1, $localobject);    // Must be <= 0
+		$localobject->country_code = 'FR';
+		$localobject->idprof1 = 'id1ko';
+		$localobject->idprof2 = 'id2ko';
+		$result = $localobject->id_prof_check(1, $localobject); // Must be <= 0
 		print __METHOD__." KO FR idprof1 result=".$result."\n";
 		$this->assertLessThan(1, $result);
-		$result=$localobject->id_prof_check(2, $localobject);    // Must be <= 0
+		$result = $localobject->id_prof_check(2, $localobject); // Must be <= 0
 		print __METHOD__." KO FR idprof2 result=".$result."\n";
 		$this->assertLessThan(1, $result);
 
 		// KO ES
-		$localobject->country_code='ES';
-		$localobject->idprof1='id1ko';
-		$result=$localobject->id_prof_check(1, $localobject);    // Must be <= 0
+		$localobject->country_code = 'ES';
+		$localobject->idprof1 = 'id1ko';
+		$result = $localobject->id_prof_check(1, $localobject); // Must be <= 0
 		print __METHOD__." KO ES idprof1 result=".$result."\n";
 		$this->assertLessThan(1, $result);
 
 		// OK AR
-		$localobject->country_code='AR';
-		$localobject->idprof1='id1ko';
-		$localobject->idprof2='id2ko';
-		$result=$localobject->id_prof_check(1, $localobject);    // Must be > 0
+		$localobject->country_code = 'AR';
+		$localobject->idprof1 = 'id1ko';
+		$localobject->idprof2 = 'id2ko';
+		$result = $localobject->id_prof_check(1, $localobject); // Must be > 0
 		print __METHOD__." OK AR idprof1 result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result);
-		$result=$localobject->id_prof_check(2, $localobject);    // Must be > 0
+		$result = $localobject->id_prof_check(2, $localobject); // Must be > 0
 		print __METHOD__." OK AR idprof2 result=".$result."\n";
 		$this->assertGreaterThanOrEqual(1, $result);
 
@@ -269,37 +269,37 @@ 
 	 */
 	public function testSocieteOther($localobject)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=$localobject->setAsCustomer();
+		$result = $localobject->setAsCustomer();
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
-		$result=$localobject->setPriceLevel(1, $user);
+		$result = $localobject->setPriceLevel(1, $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
-		$result=$localobject->set_remise_client(10, 'Gift', $user);
+		$result = $localobject->set_remise_client(10, 'Gift', $user);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
-		$result=$localobject->getNomUrl(1);
+		$result = $localobject->getNomUrl(1);
 		print __METHOD__." id=".$localobject->id." result=".$result."\n";
 		$this->assertNotEquals($result, '');
 
 		$localobject->country_code = 'FR';
 
-		$result=$localobject->isInEEC();
+		$result = $localobject->isInEEC();
 		print __METHOD__." id=".$localobject->id." country_code=".$localobject->country_code." result=".$result."\n";
 		$this->assertTrue($result);
 
 		$localobject->country_code = 'US';
 
-		$result=$localobject->isInEEC();
+		$result = $localobject->isInEEC();
 		print __METHOD__." id=".$localobject->id." country_code=".$localobject->country_code." result=".$result."\n";
 		$this->assertFalse($result);
 
@@ -329,16 +329,16 @@ 
 	 */
 	public function testGetOutstandingBills($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Societe($db);
+		$localobject = new Societe($db);
 		$localobject->fetch($id);
 
-		$result=$localobject->getOutstandingBills();
+		$result = $localobject->getOutstandingBills();
 
 		print __METHOD__." id=".$id." result=".var_export($result, true)."\n";
 		$this->assertTrue(array_key_exists('opened', $result), 'Result of getOutstandingBills failed');
@@ -358,16 +358,16 @@ 
 	 */
 	public function testSocieteDelete($id)
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobject=new Societe($db);
-		$result=$localobject->fetch($id);
+		$localobject = new Societe($db);
+		$result = $localobject->fetch($id);
 
-		$result=$localobject->delete($id, $user);
+		$result = $localobject->delete($id, $user);
 		print __METHOD__." id=".$id." result=".$result."\n";
 		$this->assertLessThan($result, 0);
 
@@ -382,57 +382,57 @@ 
 	 */
 	public function testSocieteGetFullAddress()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$localobjectadd=new Societe($db);
+		$localobjectadd = new Societe($db);
 		$localobjectadd->initAsSpecimen();
 
 		// France
 		unset($localobjectadd->country_code);
-		$localobjectadd->country_id=1;
-		$localobjectadd->name='New name';
-		$localobjectadd->address='New address';
-		$localobjectadd->zip='New zip';
-		$localobjectadd->town='New town';
-		$result=$localobjectadd->getFullAddress(1);
+		$localobjectadd->country_id = 1;
+		$localobjectadd->name = 'New name';
+		$localobjectadd->address = 'New address';
+		$localobjectadd->zip = 'New zip';
+		$localobjectadd->town = 'New town';
+		$result = $localobjectadd->getFullAddress(1);
 		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew zip New town\nFrance", $result);
 
 		// Belgium
 		unset($localobjectadd->country_code);
-		$localobjectadd->country_id=2;
-		$localobjectadd->name='New name';
-		$localobjectadd->address='New address';
-		$localobjectadd->zip='New zip';
-		$localobjectadd->town='New town';
-		$result=$localobjectadd->getFullAddress(1);
+		$localobjectadd->country_id = 2;
+		$localobjectadd->name = 'New name';
+		$localobjectadd->address = 'New address';
+		$localobjectadd->zip = 'New zip';
+		$localobjectadd->town = 'New town';
+		$result = $localobjectadd->getFullAddress(1);
 		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew zip New town\nBelgium", $result);
 
 		// Switzerland
 		unset($localobjectadd->country_code);
-		$localobjectadd->country_id=6;
-		$localobjectadd->name='New name';
-		$localobjectadd->address='New address';
-		$localobjectadd->zip='New zip';
-		$localobjectadd->town='New town';
-		$result=$localobjectadd->getFullAddress(1);
+		$localobjectadd->country_id = 6;
+		$localobjectadd->name = 'New name';
+		$localobjectadd->address = 'New address';
+		$localobjectadd->zip = 'New zip';
+		$localobjectadd->town = 'New town';
+		$result = $localobjectadd->getFullAddress(1);
 		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew zip New town\nSwitzerland", $result);
 
 		// USA
 		unset($localobjectadd->country_code);
-		$localobjectadd->country_id=11;
-		$localobjectadd->name='New name';
-		$localobjectadd->address='New address';
-		$localobjectadd->zip='New zip';
-		$localobjectadd->town='New town';
-		$localobjectadd->state='New state';
-		$result=$localobjectadd->getFullAddress(1);
+		$localobjectadd->country_id = 11;
+		$localobjectadd->name = 'New name';
+		$localobjectadd->address = 'New address';
+		$localobjectadd->zip = 'New zip';
+		$localobjectadd->town = 'New town';
+		$localobjectadd->state = 'New state';
+		$result = $localobjectadd->getFullAddress(1);
 		print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
 		$this->assertStringContainsString("New address\nNew town, New state, New zip\nUnited States", $result);
 

test/phpunit/MarginsLibTest.php

Spacing +10 added lines, -10 removed lines

@@ -24,7 +24,7 @@ 
  *		\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';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -55,13 +55,13 @@ 
 	 */
 	public function testGetMarginInfos()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
+		$result = getMarginInfos(10, 0, 19.6, 0, 0, 0, 8);
 		//var_dump($result);
 		print __METHOD__." result[0]=".$result[0]."\n";
 		$this->assertEquals(8, $result[0]);
@@ -70,13 +70,13 @@ 
 		print __METHOD__." result[2]=".$result[2]."\n";
 		$this->assertEquals(20, $result[2]);
 
-		$result=getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
+		$result = getMarginInfos(10, 10, 19.6, 0, 0, 0, 8);
 		print __METHOD__." result[0]=".$result[0]."\n";
 		$this->assertEquals(8, $result[0]);
 		print __METHOD__." result[1]=".$result[1]."\n";
 		$this->assertEquals(12.5, $result[1]);
 		print __METHOD__." result[2]=".$result[2]."\n";
-		$this->assertEquals(1/9*100, $result[2]);
+		$this->assertEquals(1 / 9 * 100, $result[2]);
 
 		return 0;
 	}

test/phpunit/WebservicesUserTest.php

Spacing +21 added lines, -21 removed lines

@@ -24,12 +24,12 @@ 
  *      \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';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/date.lib.php';
-require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
+require_once NUSOAP_PATH.'/nusoap.php'; // Include SOAP
 require_once dirname(__FILE__).'/CommonClassTest.class.php';
 
 if (empty($user->id)) {
@@ -37,9 +37,9 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_UMASK = '0666';
 
 
 /**
@@ -58,28 +58,28 @@ 
 	 */
 	public function testWSUserGetUser()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$WS_DOL_URL = DOL_MAIN_URL_ROOT.'/webservices/server_user.php';
 		$WS_METHOD  = 'getUser';
-		$ns='http://www.dolibarr.org/ns/';
+		$ns = 'http://www.dolibarr.org/ns/';
 
 		// Set the WebService URL
 		print __METHOD__." Create nusoap_client for URL=".$WS_DOL_URL."\n";
 		$soapclient = new nusoap_client($WS_DOL_URL);
 		if ($soapclient) {
-			$soapclient->soap_defencoding='UTF-8';
+			$soapclient->soap_defencoding = 'UTF-8';
 			$soapclient->decodeUTF8(false);
 		}
 
 		//$soapclient->setDebugLevel(5);
 
 		// Call the WebService method and store its result in $result.
-		$authentication=array(
+		$authentication = array(
 			'dolibarrkey'=>getDolGlobalString('WEBSERVICES_KEY'),
 			'sourceapplication'=>'DEMO',
 			'login'=>'admin',
@@ -88,20 +88,20 @@ 
 		);
 
 		// Test URL
-		$result='';
-		$parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'admin');
+		$result = '';
+		$parameters = array('authentication'=>$authentication, 'id'=>0, 'ref'=>'admin');
 		print __METHOD__." Call method ".$WS_METHOD."\n";
 		try {
 			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
 		if (!empty($result['faultstring'])) {
 			print $result['faultstring']."\n";
-			$result=0;
+			$result = 0;
 		}
-		if (! $result) {
+		if (!$result) {
 			//var_dump($soapclient);
 			print 'Error: '.$soapclient->error_str;
 			print "\n<br>\n";
@@ -115,16 +115,16 @@ 
 		$this->assertEquals('OK', empty($result['result']['result_code']) ? '' : $result['result']['result_code'], 'Test on ref admin');
 
 		// Test URL
-		$result='';
-		$parameters = array('authentication'=>$authentication,'id'=>0,'ref'=>'refthatdoesnotexists');
+		$result = '';
+		$parameters = array('authentication'=>$authentication, 'id'=>0, 'ref'=>'refthatdoesnotexists');
 		print __METHOD__."Call method ".$WS_METHOD."\n";
 		try {
 			$result = $soapclient->call($WS_METHOD, $parameters, $ns, '');
 		} catch (SoapFault $exception) {
 			echo $exception;
-			$result=0;
+			$result = 0;
 		}
-		if (! $result || !empty($result['faultstring'])) {
+		if (!$result || !empty($result['faultstring'])) {
 			//var_dump($soapclient);
 			print $soapclient->error_str;
 			print "\n<br>\n";

test/phpunit/ReceptionTest.php

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
  *      \remarks    To run this script as CLI:  phpunit filename.php
  */
 
-global $conf,$user,$langs,$db;
+global $conf, $user, $langs, $db;
 
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/societe/class/societe.class.php';
@@ -37,7 +37,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 /**
  * Class for PHPUnit tests
@@ -55,11 +55,11 @@ 
 	 */
 	public function testReceptionCreate()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		$soc = new Societe($db);
 		$soc->name = "ReceptionTest Unittest";

test/phpunit/AdminLibTest.php

Spacing +13 added lines, -13 removed lines

@@ -24,7 +24,7 @@ 
  *      \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';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
@@ -36,7 +36,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -58,22 +58,22 @@ 
 	 */
 	public function testVersionCompare()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
-		$result=versioncompare(array(3,1,-4), array(3,1,1));
+		$result = versioncompare(array(3, 1, -4), array(3, 1, 1));
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(-3, $result);
-		$result=versioncompare(array(3,1,0), array(3,1,1));
+		$result = versioncompare(array(3, 1, 0), array(3, 1, 1));
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(-3, $result);
-		$result=versioncompare(array(3,1,0), array(3,2,0));
+		$result = versioncompare(array(3, 1, 0), array(3, 2, 0));
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(-2, $result);
-		$result=versioncompare(array(3,1,0), array(3,1,0));
+		$result = versioncompare(array(3, 1, 0), array(3, 1, 0));
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(0, $result);
 
@@ -91,7 +91,7 @@ 
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modExpenseReport.class.php';
 		print "Enable module modExpenseReport";
-		$moduledescriptor=new modExpenseReport($db);
+		$moduledescriptor = new modExpenseReport($db);
 
 		$result = $moduledescriptor->remove();
 
@@ -102,7 +102,7 @@ 
 
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/modApi.class.php';
 		print "Enable module modAPI";
-		$moduledescriptor=new modApi($db);
+		$moduledescriptor = new modApi($db);
 
 		$result = $moduledescriptor->remove();