Dolibarr / dolibarr

test/phpunit/FilesLibTest.php

Spacing +163 added lines, -163 removed lines

@@ -25,7 +25,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;
 
 
 /**
@@ -65,11 +65,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -83,8 +83,8 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		global $conf, $user, $langs, $db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -96,7 +96,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -109,11 +109,11 @@ 
 	 */
 	protected function setUp(): void
 	{
-		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;
 
 		print __METHOD__."\n";
 	}
@@ -135,25 +135,25 @@ 
 	 */
 	public function testDolBasename()
 	{
-		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_basename('adir/afile');
+		$result = dol_basename('adir/afile');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('afile', $result);
 
-		$result=dol_basename('adir/afile/');
+		$result = dol_basename('adir/afile/');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('afile', $result);
 
-		$result=dol_basename('adir/νεο');    // With cyrillic data. Here basename fails to return correct value
+		$result = dol_basename('adir/νεο'); // With cyrillic data. Here basename fails to return correct value
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('νεο', $result);
 
-		$result=dol_basename('adir/νεο/');    // With cyrillic data. Here basename fails to return correct value
+		$result = dol_basename('adir/νεο/'); // With cyrillic data. Here basename fails to return correct value
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('νεο', $result);
 	}
@@ -166,14 +166,14 @@ 
 	 */
 	public function testDolCountNbOfLine()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
-		$result=dol_count_nb_of_line($file);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$file = dirname(__FILE__).'/Example_import_company_1.csv';
+		$result = dol_count_nb_of_line($file);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals(3, $result);
 
@@ -187,19 +187,19 @@ 
 	 */
 	public function testDolIsFileDir()
 	{
-		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;
 
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
+		$file = dirname(__FILE__).'/Example_import_company_1.csv';
 
-		$result=dol_is_file($file);
+		$result = dol_is_file($file);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result);
 
-		$result=dol_is_dir($file);
+		$result = dol_is_dir($file);
 		print __METHOD__." result=".$result."\n";
 		$this->assertFalse($result);
 
@@ -213,24 +213,24 @@ 
 	*/
 	public function testDolOther()
 	{
-		global $conf,$user,$langs,$db;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
-
-		$url='http://www.dolibarr.org';
-		$result=dol_is_url($url);
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$url = 'http://www.dolibarr.org';
+		$result = dol_is_url($url);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result);
 
-		$url='https://www.dolibarr.org';
-		$result=dol_is_url($url);
+		$url = 'https://www.dolibarr.org';
+		$result = dol_is_url($url);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result);
 
-		$url='file://www.dolibarr.org/download/file.zip';
-		$result=dol_is_url($url);
+		$url = 'file://www.dolibarr.org/download/file.zip';
+		$result = dol_is_url($url);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result);
 
@@ -244,41 +244,41 @@ 
 	 */
 	public function testDolMimeType()
 	{
-		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;
 
 		// file.png
-		$result=dol_mimetype('file.png', '', 0);
+		$result = dol_mimetype('file.png', '', 0);
 		$this->assertEquals('image/png', $result);
-		$result=dol_mimetype('file.png', '', 1);
+		$result = dol_mimetype('file.png', '', 1);
 		$this->assertEquals('png', $result);
-		$result=dol_mimetype('file.png', '', 2);
+		$result = dol_mimetype('file.png', '', 2);
 		$this->assertEquals('image.png', $result);
-		$result=dol_mimetype('file.png', '', 3);
+		$result = dol_mimetype('file.png', '', 3);
 		$this->assertEquals('', $result);
 		// file.odt
-		$result=dol_mimetype('file.odt', '', 0);
+		$result = dol_mimetype('file.odt', '', 0);
 		$this->assertEquals('application/vnd.oasis.opendocument.text', $result);
-		$result=dol_mimetype('file.odt', '', 1);
+		$result = dol_mimetype('file.odt', '', 1);
 		$this->assertEquals('vnd.oasis.opendocument.text', $result);
-		$result=dol_mimetype('file.odt', '', 2);
+		$result = dol_mimetype('file.odt', '', 2);
 		$this->assertEquals('ooffice.png', $result);
-		$result=dol_mimetype('file.odt', '', 3);
+		$result = dol_mimetype('file.odt', '', 3);
 		$this->assertEquals('', $result);
 		// file.php
-		$result=dol_mimetype('file.php', '', 0);
+		$result = dol_mimetype('file.php', '', 0);
 		$this->assertEquals('text/plain', $result);
-		$result=dol_mimetype('file.php', '', 1);
+		$result = dol_mimetype('file.php', '', 1);
 		$this->assertEquals('plain', $result);
-		$result=dol_mimetype('file.php', '', 2);
+		$result = dol_mimetype('file.php', '', 2);
 		$this->assertEquals('php.png', $result);
-		$result=dol_mimetype('file.php', '', 3);
+		$result = dol_mimetype('file.php', '', 3);
 		$this->assertEquals('php', $result);
 		// file.php.noexe
-		$result=dol_mimetype('file.php.noexe', '', 0);
+		$result = dol_mimetype('file.php.noexe', '', 0);
 		$this->assertEquals('text/plain', $result);
 	}
 
@@ -290,31 +290,31 @@ 
 	 */
 	public function testDolDeleteDir()
 	{
-		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;
 
-		$dirout=$conf->admin->dir_temp.'/test';
-		$dirout2=$conf->admin->dir_temp.'/test2';
+		$dirout = $conf->admin->dir_temp.'/test';
+		$dirout2 = $conf->admin->dir_temp.'/test2';
 
-		$count=0;
-		$result=dol_delete_dir_recursive($dirout, $count);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		$count = 0;
+		$result = dol_delete_dir_recursive($dirout, $count); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result);
 
-		$count=0;
-		$countdeleted=0;
-		$result=dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		$count = 0;
+		$countdeleted = 0;
+		$result = dol_delete_dir_recursive($dirout, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(0, $result);
 		$this->assertGreaterThanOrEqual(0, $countdeleted);
 
 		dol_mkdir($dirout2);
-		$count=0;
-		$countdeleted=0;
-		$result=dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted);	// If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
+		$count = 0;
+		$countdeleted = 0;
+		$result = dol_delete_dir_recursive($dirout2, $count, 1, 0, $countdeleted); // If it has no permission to delete, it will fails as if dir does not exists, so we can't test it
 		print __METHOD__." result=".$result."\n";
 		$this->assertGreaterThanOrEqual(1, $result);
 		$this->assertGreaterThanOrEqual(1, $countdeleted);
@@ -328,64 +328,64 @@ 
 	 */
 	public function testDolCopyMoveDelete()
 	{
-		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;
 
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
+		$file = dirname(__FILE__).'/Example_import_company_1.csv';
 
-		$result=dol_copy($file, '/adir/that/does/not/exists/file.csv');
+		$result = dol_copy($file, '/adir/that/does/not/exists/file.csv');
 		print __METHOD__." result=".$result."\n";
-		$this->assertLessThan(0, $result, 'copy dir that does not exists');    // We should have error
+		$this->assertLessThan(0, $result, 'copy dir that does not exists'); // We should have error
 
-		$result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
+		$result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv)');    // Should be 1
+		$this->assertGreaterThanOrEqual(1, $result, 'copy file ('.$file.') into a dir that exists ('.$conf->admin->dir_temp.'/file.csv)'); // Should be 1
 
 		// Again to test with overwriting=0
-		$result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 0);
+		$result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 0);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(0, $result, 'copy destination already exists, no overwrite');    // Should be 0
+		$this->assertEquals(0, $result, 'copy destination already exists, no overwrite'); // Should be 0
 
 		// Again to test with overwriting=1
-		$result=dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
+		$result = dol_copy($file, $conf->admin->dir_temp.'/file.csv', 0, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'copy destination already exists, overwrite');    // Should be 1
+		$this->assertGreaterThanOrEqual(1, $result, 'copy destination already exists, overwrite'); // Should be 1
 
 		// To test a move that should work
-		$result=dol_move($conf->admin->dir_temp.'/file.csv', $conf->admin->dir_temp.'/file2.csv', 0, 1);
+		$result = dol_move($conf->admin->dir_temp.'/file.csv', $conf->admin->dir_temp.'/file2.csv', 0, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'move with default mask');
 
 		// To test a move that should work with forced mask
-		$result=dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file should be rwxr-wr--
+		$result = dol_move($conf->admin->dir_temp.'/file2.csv', $conf->admin->dir_temp.'/file3.csv', '0754', 1); // file should be rwxr-wr--
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'move with forced mask');
 
 		// To test a delete that should success
-		$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv');
+		$result = dol_delete_file($conf->admin->dir_temp.'/file3.csv');
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'delete file');
 
 		// Again to test there is error when deleting a non existing file with option disableglob
-		$result=dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
+		$result = dol_delete_file($conf->admin->dir_temp.'/file3.csv', 1, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertFalse($result, 'delete file that does not exists with disableglo must return ko');
 
 		// Again to test there is no error when deleting a non existing file without option disableglob
-		$result=dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1);
+		$result = dol_delete_file($conf->admin->dir_temp.'/file3csv', 0, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'delete file that does not exists without disabling glob must return ok');
 
 		// Test copy with special char / delete with blob
-		$result=dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv', 0, 1);
+		$result = dol_copy($file, $conf->admin->dir_temp.'/file with [x] and é.csv', 0, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'copy file with special chars, overwrite');    // Should be 1
+		$this->assertGreaterThanOrEqual(1, $result, 'copy file with special chars, overwrite'); // Should be 1
 
 		// Try to delete using a glob criteria
-		$result=dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv');
+		$result = dol_delete_file($conf->admin->dir_temp.'/file with [x]*é.csv');
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'delete file using glob');
 	}
@@ -397,39 +397,39 @@ 
 	 */
 	public function testDolCompressUnCompress()
 	{
-		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;
 
 		// Format zip
 		print "\n";
 		print 'testDolCompressUnCompress zip'."\n";
 
-		$format='zip';
-		$filein=dirname(__FILE__).'/Example_import_company_1.csv';
-		$fileout=$conf->admin->dir_temp.'/test.'.$format;
-		$dirout=$conf->admin->dir_temp.'/testdir'.$format;
+		$format = 'zip';
+		$filein = dirname(__FILE__).'/Example_import_company_1.csv';
+		$fileout = $conf->admin->dir_temp.'/test.'.$format;
+		$dirout = $conf->admin->dir_temp.'/testdir'.$format;
 
 		dol_delete_file($fileout);
-		$count=0;
+		$count = 0;
 		dol_delete_dir_recursive($dirout, $count, 1);
 
 		$errorstring = '';
 
 		dol_mkdir($conf->admin->dir_temp);
-		$conf->global->MAIN_ENABLE_LOG_TO_HTML=1;
+		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 		$conf->modules['syslog'] = 'syslog';
-		$_REQUEST['logtohtml']=1;
-		$conf->logbuffer=array();
+		$_REQUEST['logtohtml'] = 1;
+		$conf->logbuffer = array();
 
-		$result=dol_compress_file($filein, $fileout, $format, $errorstring);
+		$result = dol_compress_file($filein, $fileout, $format, $errorstring);
 		print __METHOD__." compress result=".$result."\n";
 		print join(', ', $conf->logbuffer);
 		$this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring);
 
-		$result=dol_uncompress($fileout, $dirout);
+		$result = dol_uncompress($fileout, $dirout);
 		print __METHOD__." uncompress result=".join(',', $result)."\n";
 		print join(', ', $conf->logbuffer);
 		$this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout);
@@ -438,29 +438,29 @@ 
 		print "\n";
 		print 'testDolCompressUnCompress gz'."\n";
 
-		$format='gz';
-		$filein=dirname(__FILE__).'/Example_import_company_1.csv';
-		$fileout=$conf->admin->dir_temp.'/test.'.$format;
-		$dirout=$conf->admin->dir_temp.'/testdir'.$format;
+		$format = 'gz';
+		$filein = dirname(__FILE__).'/Example_import_company_1.csv';
+		$fileout = $conf->admin->dir_temp.'/test.'.$format;
+		$dirout = $conf->admin->dir_temp.'/testdir'.$format;
 
 		dol_delete_file($fileout);
-		$count=0;
+		$count = 0;
 		dol_delete_dir_recursive($dirout, $count, 1);
 
 		$errorstring = '';
 
 		dol_mkdir($conf->admin->dir_temp);
-		$conf->global->MAIN_ENABLE_LOG_TO_HTML=1;
+		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 		$conf->modules['syslog'] = 'syslog';
-		$_REQUEST['logtohtml']=1;
-		$conf->logbuffer=array();
+		$_REQUEST['logtohtml'] = 1;
+		$conf->logbuffer = array();
 
-		$result=dol_compress_file($filein, $fileout, $format, $errorstring);
+		$result = dol_compress_file($filein, $fileout, $format, $errorstring);
 		print __METHOD__." compress result=".$result."\n";
 		print join(', ', $conf->logbuffer);
 		$this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring);
 
-		$result=dol_uncompress($fileout, $dirout);
+		$result = dol_uncompress($fileout, $dirout);
 		print __METHOD__." uncompress result=".join(',', $result)."\n";
 		print join(', ', $conf->logbuffer);
 		$this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout);
@@ -472,7 +472,7 @@ 
 		if (preg_match($excludefiles, 'a/temp/b')) {
 			echo '----- Regex OK -----'."\n";
 		}
-		$result=dol_compress_dir($dirout, $conf->admin->dir_temp.'/testcompressdirzip.zip', 'zip', $excludefiles);
+		$result = dol_compress_dir($dirout, $conf->admin->dir_temp.'/testcompressdirzip.zip', 'zip', $excludefiles);
 		print __METHOD__." dol_compress_dir result=".$result."\n";
 		print join(', ', $conf->logbuffer);
 		$this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_dir of ".$dirout." into ".$conf->admin->dir_temp.'/testdir.zip');
@@ -485,11 +485,11 @@ 
 	 */
 	public function testDolCheckSecureAccessDocument()
 	{
-		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');
@@ -505,41 +505,41 @@ 
 		// Check access to SPECIMEN
 		$user->rights->facture->lire = 0;
 		$user->rights->facture->creer = 0;
-		$filename='SPECIMEN.pdf';             // Filename relative to module part
-		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+		$filename = 'SPECIMEN.pdf'; // Filename relative to module part
+		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
 		$this->assertEquals(1, $result['accessallowed']);
 
 
 		// Check read permission
 		$user->rights->facture->lire = 1;
 		$user->rights->facture->creer = 1;
-		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
-		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
 		$this->assertEquals(1, $result['accessallowed']);
 
 		$user->rights->facture->lire = 0;
 		$user->rights->facture->creer = 0;
-		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
-		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'read');
 		$this->assertEquals(0, $result['accessallowed']);
 
 		// Check write permission
 		$user->rights->facture->lire = 0;
 		$user->rights->facture->creer = 0;
-		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
-		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
 		$this->assertEquals(0, $result['accessallowed']);
 
 		$user->rights->facture->lire = 1;
 		$user->rights->facture->creer = 1;
-		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
-		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
 		$this->assertEquals(1, $result['accessallowed']);
 
 		$user->rights->facture->lire = 1;
 		$user->rights->facture->creer = 0;
-		$filename='FA010101/FA010101.pdf';    // Filename relative to module part
-		$result=dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
+		$filename = 'FA010101/FA010101.pdf'; // Filename relative to module part
+		$result = dol_check_secure_access_document('facture', $filename, 0, '', '', 'write');
 		$this->assertEquals(0, $result['accessallowed']);
 
 
@@ -555,31 +555,31 @@ 
 	 */
 	public function testDolDirMove()
 	{
-		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;
 
 		// To test a move of empty directory that should work
 		$dirsrcpath = $conf->admin->dir_temp.'/directory';
 		$dirdestpath = $conf->admin->dir_temp.'/directory2';
-		$file=dirname(__FILE__).'/Example_import_company_1.csv';
+		$file = dirname(__FILE__).'/Example_import_company_1.csv';
 		dol_mkdir($dirsrcpath);
 		dol_delete_dir_recursive($dirdestpath, 0, 1);
-		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		$result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'move of directory with empty directory');
 
 		// To test a move on existing directory with overwrite
 		dol_mkdir($dirsrcpath);
-		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		$result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'move of directory on existing directory with empty directory');
 
 		// To test a move on existing directory without overwrite
 		dol_mkdir($dirsrcpath);
-		$result=dol_move_dir($dirsrcpath, $dirdestpath, 0, 1, 1);
+		$result = dol_move_dir($dirsrcpath, $dirdestpath, 0, 1, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertFalse($result, 'move of directory on existing directory without overwrite');
 
@@ -587,7 +587,7 @@ 
 		dol_mkdir($dirsrcpath);
 		dol_delete_dir_recursive($dirdestpath, 0, 1);
 		dol_copy($file, $dirsrcpath.'/directory_file.csv');
-		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		$result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'move of directory with file in directory');
 
@@ -595,7 +595,7 @@ 
 		dol_mkdir($dirsrcpath);
 		dol_delete_dir_recursive($dirdestpath, 0, 1);
 		dol_copy($file, $dirsrcpath.'/file.csv');
-		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		$result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'move of directory with file without rename needed in directory');
 
@@ -603,7 +603,7 @@ 
 		dol_mkdir($dirsrcpath);
 		dol_delete_dir_recursive($dirdestpath, 0, 1);
 		dol_mkdir($dirsrcpath.'/directory');
-		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		$result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'move of directory with file with rename needed in directory');
 
@@ -611,7 +611,7 @@ 
 		dol_mkdir($dirsrcpath);
 		dol_delete_dir_recursive($dirdestpath, 0, 1);
 		dol_mkdir($dirsrcpath.'/notorename');
-		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		$result = dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
 		$this->assertTrue($result, 'move of directory with directory without rename needed in directory');
 	}

test/phpunit/RestAPIUserTest.php

Spacing +32 added lines, -32 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,8 +37,8 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
-$conf->global->MAIN_UMASK='0666';
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+$conf->global->MAIN_UMASK = '0666';
 
 
 /**
@@ -69,11 +69,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		if (!isModEnabled('api')) {
 			print __METHOD__." module api must be enabled.\n";
@@ -92,7 +92,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
@@ -105,7 +105,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -118,24 +118,24 @@ 
 	*/
 	protected function setUp(): void
 	{
-		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;
 
 		$this->api_url = DOL_MAIN_URL_ROOT.'/api/index.php';
 
-		$login='admin';
-		$password='admin';
-		$url=$this->api_url.'/login?login='.$login.'&password='.$password;
+		$login = 'admin';
+		$password = 'admin';
+		$url = $this->api_url.'/login?login='.$login.'&password='.$password;
 		// Call the API login method to save api_key for this test class.
 		// At first call, if token is not defined a random value is generated and returned.
-		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
 		print __METHOD__." result = ".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
+		$object = json_decode($result['content'], true); // If success content is just an id, if not an array
 
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertNotEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
@@ -164,28 +164,28 @@ 
 	 */
 	public function testRestGetUser()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		$url = $this->api_url.'/users/123456789?api_key='.$this->api_key;
 		//$addheaders=array('Content-Type: application/json');
 
 		print __METHOD__." Request GET url=".$url."\n";
-		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
 		//print __METHOD__." result for get on unexisting user: ".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object=json_decode($result['content'], true);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertEquals(404, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error code is not 404');
 
 		$url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
 		print __METHOD__." Request GET url=".$url."\n";
-		$result=getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
+		$result = getURLContent($url, 'GET', '', 1, array(), array('http', 'https'), 2);
 		print __METHOD__." result for get on an existing user: ".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object=json_decode($result['content'], true);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must not be null");
 		$this->assertEquals(1, $object['statut']);
 
@@ -204,7 +204,7 @@ 
 	{
 		// attempt to create without mandatory fields :
 		$url = $this->api_url.'/users?api_key='.$this->api_key;
-		$addheaders=array('Content-Type: application/json');
+		$addheaders = array('Content-Type: application/json');
 
 		$bodyobj = array(
 			"lastname"=>"testRestUser",
@@ -214,11 +214,11 @@ 
 		$body = json_encode($bodyobj);
 
 		print __METHOD__." Request POST url=".$url."\n";
-		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		$result = getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
 		//print __METHOD__." Result for creating incomplete user".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object=json_decode($result['content'], true);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must no be null");
 		$this->assertEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 
@@ -232,11 +232,11 @@ 
 		);
 		$body = json_encode($bodyobj);
 		print __METHOD__." Request POST url=".$url."\n";
-		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		$result = getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
 		print __METHOD__." result code for creating non existing user = ".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object = json_decode($result['content'], true);	// If success content is just an id, if not an array
+		$object = json_decode($result['content'], true); // If success content is just an id, if not an array
 
 		$this->assertNotNull($object, "Parsing of json result must no be null");
 		$this->assertNotEquals(500, ((is_scalar($object) || empty($object['error']) || empty($object['error']['code'])) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
@@ -244,11 +244,11 @@ 
 
 		// attempt to create duplicated user
 		print __METHOD__." Request POST url=".$url."\n";
-		$result=getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
+		$result = getURLContent($url, 'POST', $body, 1, $addheaders, array('http', 'https'), 2);
 		//print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
 		print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
 		$this->assertEquals($result['curl_error_no'], '');
-		$object=json_decode($result['content'], true);
+		$object = json_decode($result['content'], true);
 		$this->assertNotNull($object, "Parsing of json result must no be null");
 		$this->assertEquals(500, (empty($object['error']['code']) ? 0 : $object['error']['code']), 'Error'.(empty($object['error']['message']) ? '' : ' '.$object['error']['message']));
 	}

test/phpunit/CodingPhpTest.php

Spacing +117 added lines, -117 removed lines

@@ -24,42 +24,42 @@ 
  *      \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/security.lib.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '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 (empty($user->id)) {
@@ -67,7 +67,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -96,11 +96,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -114,7 +114,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
@@ -127,7 +127,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -140,11 +140,11 @@ 
 	 */
 	protected function setUp(): void
 	{
-		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;
 
 		print __METHOD__."\n";
 	}
@@ -166,11 +166,11 @@ 
 	 */
 	public function testPHP()
 	{
-		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;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, '\.php', null, 'fullname', SORT_ASC, 0, 1, '', 1);
@@ -196,7 +196,7 @@ 
 			}
 
 			//print 'Check php file '.$file['relativename']."\n";
-			$filecontent=file_get_contents($file['fullname']);
+			$filecontent = file_get_contents($file['fullname']);
 
 			if (preg_match('/\.class\.php/', $file['relativename'])
 				|| preg_match('/boxes\/box_/', $file['relativename'])
@@ -204,7 +204,7 @@ 
 				|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
 				|| in_array($file['name'], array('modules_boxes.php', 'TraceableDB.php'))) {
 				// Check into Class files
-				if (! in_array($file['name'], array(
+				if (!in_array($file['name'], array(
 					'api.class.php',
 					'commonobject.class.php',
 					'conf.class.php',
@@ -216,12 +216,12 @@ 
 					'infobox.class.php'
 				))) {
 					// Must not find $db->
-					$ok=true;
-					$matches=array();
+					$ok = true;
+					$matches = array();
 					// Check string $db-> inside a class.php file (it should be $this->db-> into such classes)
 					preg_match_all('/'.preg_quote('$db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 					foreach ($matches as $key => $val) {
-						$ok=false;
+						$ok = false;
 						break;
 					}
 					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -230,7 +230,7 @@ 
 				}
 			} else {
 				// Check into Include files
-				if (! in_array($file['name'], array(
+				if (!in_array($file['name'], array(
 					'objectline_view.tpl.php',
 					'extrafieldsinexport.inc.php',
 					'extrafieldsinimport.inc.php',
@@ -238,12 +238,12 @@ 
 					'DoliStorage.php'
 				))) {
 					// Must not found $this->db->
-					$ok=true;
-					$matches=array();
+					$ok = true;
+					$matches = array();
 					// Check string $this->db-> into a non class.php file (it should be $db-> into such classes)
 					preg_match_all('/'.preg_quote('$this->db->', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 					foreach ($matches as $key => $val) {
-						$ok=false;
+						$ok = false;
 						break;
 					}
 					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -255,11 +255,11 @@ 
 			// Check we don't miss top_httphead() into any ajax pages
 			if (preg_match('/ajax\//', $file['relativename'])) {
 				print "Analyze ajax page ".$file['relativename']."\n";
-				$ok=true;
-				$matches=array();
+				$ok = true;
+				$matches = array();
 				preg_match_all('/top_httphead/', $filecontent, $matches, PREG_SET_ORDER);
 				if (count($matches) == 0) {
-					$ok=false;
+					$ok = false;
 				}
 				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
 				$this->assertTrue($ok, 'Did not find top_httphead into the ajax page '.$file['relativename']);
@@ -268,14 +268,14 @@ 
 
 			// Check if a var_dump has been forgotten
 			if (!preg_match('/test\/phpunit/', $file['fullname'])) {
-				if (! in_array($file['name'], array('class.nusoap_base.php'))) {
-					$ok=true;
-					$matches=array();
+				if (!in_array($file['name'], array('class.nusoap_base.php'))) {
+					$ok = true;
+					$matches = array();
 					preg_match_all('/(.)\s*var_dump\(/', $filecontent, $matches, PREG_SET_ORDER);
 					//var_dump($matches);
 					foreach ($matches as $key => $val) {
 						if ($val[1] != '/' && $val[1] != '*') {
-							$ok=false;
+							$ok = false;
 							break;
 						}
 						break;
@@ -287,11 +287,11 @@ 
 			}
 
 			// Check get_class followed by __METHOD__
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -299,12 +299,12 @@ 
 			//exit;
 
 			// Check string $this->db->idate without quotes
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(..)\s*\.\s*\$this->db->idate\(/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] != '\'"' && $val[1] != '\'\'') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -316,8 +316,8 @@ 
 
 			// Check sql string DELETE|OR|AND|WHERE|INSERT ... yyy = ".$xxx
 			//  with xxx that is not 'thi' (for $this->db->sanitize) and 'db-' (for $db->sanitize). It means we forget a ' if string, or an (int) if int, when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(DELETE|OR|AND|WHERE|INSERT)\s.*([^\s][^\s][^\s])\s*=\s*(\'|")\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[2] == 'ity' && $val[4] == 'con') {		// exclude entity = ".$conf->entity
@@ -330,7 +330,7 @@ 
 					continue;
 				}
 				var_dump($matches);
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -338,13 +338,13 @@ 
 			//exit;
 
 			// Check that forged sql string is using ' instead of " as string PHP quotes
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/\$sql \.= \'\s*VALUES.*\$/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//if ($val[1] != '\'"' && $val[1] != '\'\'') {
 				var_dump($matches);
-				$ok=false;
+				$ok = false;
 				break;
 				//}
 				//if ($reg[0] != 'db') $ok=false;
@@ -354,20 +354,20 @@ 
 			//exit;
 
 			// Check that forged sql string is using ' instead of " as string PHP quotes
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/\$sql \.?= \'SELECT.*\$/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				var_dump($matches);
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
 
 			// Check sql string VALUES ... , ".$xxx
 			//  with xxx that is not 'db-' (for $db->escape). It means we forget a ' if string, or an (int) if int, when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(VALUES).*,\s*"\s*\.\s*\$(...)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] == 'VALUES' && $val[2] == 'db-') {		// exclude $db->escape(
@@ -377,7 +377,7 @@ 
 					continue;
 				}
 				var_dump($matches);
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
@@ -387,12 +387,12 @@ 
 			// Check '".$xxx non escaped
 
 			// Check string   ='".$this->xxx   with xxx that is not 'escape'. It means we forget a db->escape when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/=\s*\'"\s*\.\s*\$this->(....)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] != 'db->' && $val[1] != 'esca') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -400,12 +400,12 @@ 
 			$this->assertTrue($ok, 'Found non escaped string in building of a sql request (case 1) in '.$file['relativename'].' - Bad.');
 
 			// Check string sql|set|WHERE|...'".$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(sql|SET|WHERE|INSERT|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
-					$ok=false;	// This will generate error
+				if (!in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
+					$ok = false; // This will generate error
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -415,12 +415,12 @@ 
 			//exit;
 
 			// Check string sql|set...'.$yyy->xxx   with xxx that is not 'escape', 'idate', .... It means we forget a db->escape when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(\$sql|SET\s|WHERE\s|INSERT\s|VALUES\s|VALUES\().+\s*\'\s*\.\s*\$(.........)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				if (! in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'dbs->pref', 'dbs->sani', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) {
-					$ok=false;
+				if (!in_array($val[2], array('this->db-', 'db->prefi', 'db->sanit', 'dbs->pref', 'dbs->sani', 'conf->ent', 'key : \'\')', 'key])."\')', 'excludefi', 'regexstri', ''))) {
+					$ok = false;
 					var_dump($matches);
 					break;
 				}
@@ -433,13 +433,13 @@ 
 			// Checks with IN
 
 			// Check string ' IN (".xxx' or ' IN (\'.xxx'  with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/\s+IN\s*\([\'"]\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//var_dump($val);
 				if (!in_array($val[1], array('$db->sani', '$this->db', 'getEntity', 'WON\',\'L', 'self::STA', 'Commande:', 'CommandeF', 'Entrepot:', 'Facture::', 'FactureFo', 'ExpenseRe', 'Societe::', 'Ticket::S'))) {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -449,13 +449,13 @@ 
 			//exit;
 
 			// Check string ' IN (\'".xxx'   with xxx that is not '$this->db->sanitize' and not '$db->sanitize'. It means we forget a db->sanitize when forging sql request.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/\s+IN\s*\(\'"\s*\.\s*(.........)/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//var_dump($val);
 				if (!in_array($val[1], array('$db->sani', '$this->db', 'getEntity', 'WON\',\'L', 'self::STA', 'Commande:', 'CommandeF', 'Entrepot:', 'Facture::', 'FactureFo', 'ExpenseRe', 'Societe::', 'Ticket::S'))) {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -465,12 +465,12 @@ 
 			//exit;
 
 			// Test that output of $_SERVER\[\'QUERY_STRING\'\] is escaped.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/(..............)\$_SERVER\[\'QUERY_STRING\'\]/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($val[1] != 'scape_htmltag(' && $val[1] != 'ing_nohtmltag(' && $val[1] != 'dol_escape_js(') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -478,8 +478,8 @@ 
 
 
 			// Check GETPOST(... 'none');
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/GETPOST\s*\(([^\)]+),\s*["\']none["\']/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				//var_dump($val);
@@ -488,7 +488,7 @@ 
 						'"mysqldump"', '"postgresqldump"',
 						"'db_pass_root'", "'db_pass'", '"pass"', '"pass1"', '"pass2"', '"password"', "'password'",
 						'"MAIN_MAIL_SMTPS_PW"', '"MAIN_MAIL_SMTPS_PW_EMAILING"', '"MAIN_MAIL_SMTPS_PW_TICKET"'))) {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 				//if ($reg[0] != 'db') $ok=false;
@@ -499,24 +499,24 @@ 
 
 
 			// Test that first param of print_liste_field_titre is a translation key and not the translated value
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			// Check string ='print_liste_field_titre\(\$langs'.
 			preg_match_all('/print_liste_field_titre\(\$langs/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a use of print_liste_field_titre with first parameter that is a translated value instead of just the translation key in file '.$file['relativename'].'. Bad.');
 
 
 			// Test we don't have <br />
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/<br\s+\/>/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($file['name'] != 'functions.lib.php') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -524,12 +524,12 @@ 
 
 
 			// Test we don't have name="token" value="'.$_SESSION['newtoken'], we must use name="token" value="'.newToken() instead.
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/name="token" value="\'\s*\.\s*\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if ($file['name'] != 'excludefile.php') {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -537,12 +537,12 @@ 
 
 
 			// Test we don't have preg_grep with a param without preg_quote
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/preg_grep\(.*\$/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
 				if (strpos($val[0], 'preg_quote') === false) {
-					$ok=false;
+					$ok = false;
 					break;
 				}
 			}
@@ -550,62 +550,62 @@ 
 
 
 			// Test we don't have "if ($resql >"
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/if \(\$resql >/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a if $resql with a > operator (when $resql is a boolean or resource) in file '.$file['relativename'].'. Please remove the > ... part.');
 
 			// Test we don't have empty($user->hasRight
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/empty\(\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found code empty($user->hasRight in file '.$file['relativename'].'. empty() must not be used on a var not on a function.');
 
 			// Test we don't have empty(DolibarrApiAccess::$user->hasRight
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/empty\(DolibarrApiAccess::\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found code empty(DolibarrApiAccess::$user->hasRight in file '.$file['relativename'].'. empty() must not be used on a var not on a function.');
 
 			// Test we don't have empty($user->hasRight
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/empty\(getDolGlobal/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found code empty(getDolGlobal... in file '.$file['relativename'].'. empty() must be used on a var not on a function.');
 
 			// Test we don't have @var array(
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/@var\s+array\(/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a declaration @var array() instead of @var array in file '.$file['relativename'].'.');
 
 
 			// Test we don't have CURDATE()
-			$ok=true;
-			$matches=array();
+			$ok = true;
+			$matches = array();
 			preg_match_all('/CURDATE\(\)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				$ok=false;
+				$ok = false;
 				break;
 			}
 			$this->assertTrue($ok, 'Found a CURDATE\(\) into code. Do not use this SQL method in file '.$file['relativename'].'. You must use the PHP function dol_now() instead.');

test/phpunit/RepositoryTest.php

Spacing +33 added lines, -33 removed lines

@@ -24,41 +24,41 @@ 
  *      \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/files.lib.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '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 (empty($user->id)) {
@@ -66,7 +66,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -95,11 +95,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -113,7 +113,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
@@ -126,7 +126,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -139,11 +139,11 @@ 
 	 */
 	protected function setUp(): void
 	{
-		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;
 
 		print __METHOD__."\n";
 	}
@@ -168,15 +168,15 @@ 
 	 */
 	public function testJqueryOnce()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		// Scan dir to guarantee we don't have library jquery twice
-		$foundfiles=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
+		$foundfiles = dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.js', array('ckeditor'));
 		print __METHOD__." count(founddirs)=".count($foundfiles)."\n";
 		$this->assertEquals(1, count($foundfiles), 'We found jquery lib (jquery.js) twice');
 
 		// Scan dir to guarantee we don't have library jquery twice
-		$foundfiles=dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.min\.js', array('ckeditor'));
+		$foundfiles = dol_dir_list(DOL_DOCUMENT_ROOT.'/includes/', 'files', 1, '^jquery\.min\.js', array('ckeditor'));
 		print __METHOD__." count(founddirs)=".count($foundfiles)."\n";
 		$this->assertEquals(1, count($foundfiles), 'We found jquery lib (jquery.min.js) twice '.(empty($foundfiles[0]) ? '' : $foundfiles[0]['fullname']).' '.(empty($foundfiles[1]) ? '' : $foundfiles[1]['fullname']));
 	}
@@ -189,11 +189,11 @@ 
 	 */
 	public function testRepository()
 	{
-		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;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$filesarray = dol_dir_list(DOL_DOCUMENT_ROOT, 'directories', 1, '', array('\/custom\/'), 'fullname', SORT_ASC, 0, 1, '', 1);

test/phpunit/ExportTest.php

Spacing +79 added lines, -79 removed lines

@@ -24,42 +24,42 @@ 
  *		\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/exports/class/export.class.php';
 require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 
-if (! defined('NOREQUIREUSER')) {
+if (!defined('NOREQUIREUSER')) {
 	define('NOREQUIREUSER', '1');
 }
-if (! defined('NOREQUIREDB')) {
+if (!defined('NOREQUIREDB')) {
 	define('NOREQUIREDB', '1');
 }
-if (! defined('NOREQUIRESOC')) {
+if (!defined('NOREQUIRESOC')) {
 	define('NOREQUIRESOC', '1');
 }
-if (! defined('NOREQUIRETRAN')) {
+if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '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)
 }
 
 
@@ -89,11 +89,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -107,7 +107,7 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		//$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
@@ -120,7 +120,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		//$db->rollback();
 
 		print __METHOD__."\n";
@@ -133,11 +133,11 @@ 
 	 */
 	protected function setUp(): void
 	{
-		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;
 
 		print __METHOD__."\n";
 	}
@@ -158,15 +158,15 @@ 
 	 */
 	public function testExportCsvUtf()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$model='csvutf8';
+		$model = 'csvutf8';
 
 		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
-		print 'EXPORT_CSV_SEPARATOR_TO_USE = ' . getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
+		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
 
 		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 		$file = "export_".$model.".modules.php";
 		$classname = "Export".$model;
 		require_once $dir.$file;
@@ -175,31 +175,31 @@ 
 		// First test without option USE_STRICT_CSV_RULES
 		unset($conf->global->USE_STRICT_CSV_RULES);
 
-		$valtotest='A simple string';
+		$valtotest = 'A simple string';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'A simple string');
 
-		$valtotest='A string with , and ; inside';
+		$valtotest = 'A string with , and ; inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with , and ; inside"', 'Error in csvClean for '.$file);
 
-		$valtotest='A string with " inside';
+		$valtotest = 'A string with " inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside"');
 
-		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		$valtotest = 'A string with " inside and '."\r\n".' carriage returns';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside and \n carriage returns"');
 
-		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		$valtotest = 'A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
@@ -208,31 +208,31 @@ 
 		// Same tests with strict mode
 		$conf->global->USE_STRICT_CSV_RULES = 1;
 
-		$valtotest='A simple string';
+		$valtotest = 'A simple string';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'A simple string');
 
-		$valtotest='A string with , and ; inside';
+		$valtotest = 'A string with , and ; inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with , and ; inside"');
 
-		$valtotest='A string with " inside';
+		$valtotest = 'A string with " inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside"');
 
-		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		$valtotest = 'A string with " inside and '."\r\n".' carriage returns';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\"");
 
-		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		$valtotest = 'A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
@@ -247,15 +247,15 @@ 
 	 */
 	public function testExportOther()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$model='csviso';
+		$model = 'csviso';
 
 		$conf->global->EXPORT_CSV_SEPARATOR_TO_USE = ',';
-		print 'EXPORT_CSV_SEPARATOR_TO_USE = ' . getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
+		print 'EXPORT_CSV_SEPARATOR_TO_USE = '.getDolGlobalString('EXPORT_CSV_SEPARATOR_TO_USE');
 
 		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 		$file = "export_".$model.".modules.php";
 		$classname = "Export".$model;
 		require_once $dir.$file;
@@ -264,31 +264,31 @@ 
 		// First test without option USE_STRICT_CSV_RULES
 		unset($conf->global->USE_STRICT_CSV_RULES);
 
-		$valtotest='A simple string';
+		$valtotest = 'A simple string';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'A simple string');
 
-		$valtotest='A string with , and ; inside';
+		$valtotest = 'A string with , and ; inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with , and ; inside"', 'Error in csvClean for '.$file);
 
-		$valtotest='A string with " inside';
+		$valtotest = 'A string with " inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside"');
 
-		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		$valtotest = 'A string with " inside and '."\r\n".' carriage returns';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside and \n carriage returns"');
 
-		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		$valtotest = 'A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
@@ -297,31 +297,31 @@ 
 		// Same tests with strict mode
 		$conf->global->USE_STRICT_CSV_RULES = 1;
 
-		$valtotest='A simple string';
+		$valtotest = 'A simple string';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'A simple string');
 
-		$valtotest='A string with , and ; inside';
+		$valtotest = 'A string with , and ; inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with , and ; inside"');
 
-		$valtotest='A string with " inside';
+		$valtotest = 'A string with " inside';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"A string with "" inside"');
 
-		$valtotest='A string with " inside and '."\r\n".' carriage returns';
+		$valtotest = 'A string with " inside and '."\r\n".' carriage returns';
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, "\"A string with \"\" inside and \r\n carriage returns\"");
 
-		$valtotest='A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
+		$valtotest = 'A string with <a href="aaa"><strong>html<br>content</strong></a> inside<br>'."\n";
 		print __METHOD__." valtotest=".$valtotest."\n";
 		$result = $objmodel->csvClean($valtotest, $langs->charset_output);
 		print __METHOD__." result=".$result."\n";
@@ -336,54 +336,54 @@ 
 	 */
 	public function testExportPersonalizedExport()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
 		$sql = "SELECT f.ref as f_ref, f.total_ht as f_total, f.total_tva as f_tva FROM ".MAIN_DB_PREFIX."facture f";
 
-		$objexport=new Export($db);
+		$objexport = new Export($db);
 		//$objexport->load_arrays($user,$datatoexport);
 
 		// Define properties
-		$datatoexport='test';
+		$datatoexport = 'test';
 		$array_selected = array("f.ref"=>1, "f.total"=>2, "f.tva"=>3);
 		$array_export_fields = array("f.ref"=>"FacNumber", "f.total"=>"FacTotal", "f.tva"=>"FacVat");
 		$array_alias = array("f_ref"=>"ref", "f_total"=>"total", "f_tva"=>"tva");
-		$objexport->array_export_fields[0]=$array_export_fields;
-		$objexport->array_export_alias[0]=$array_alias;
+		$objexport->array_export_fields[0] = $array_export_fields;
+		$objexport->array_export_alias[0] = $array_alias;
 
 		dol_mkdir($conf->export->dir_temp);
 
-		$model='csviso';
+		$model = 'csviso';
 
 		// Build export file
 		print "Process build_file for model = ".$model."\n";
-		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult = 1;
 		$this->assertEquals($expectedresult, $result, 'Error in CSV export');
 
-		$model='csvutf8';
+		$model = 'csvutf8';
 
 		// Build export file
 		print "Process build_file for model = ".$model."\n";
-		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 		$expectedresult = 1;
 		$this->assertEquals($expectedresult, $result, 'Error in CSV export');
 
-		$model='tsv';
+		$model = 'tsv';
 
 		// Build export file
 		print "Process build_file for model = ".$model."\n";
-		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
-		$expectedresult=1;
+		$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$expectedresult = 1;
 		$this->assertEquals($expectedresult, $result, 'Error in TSV export');
 
-		$model='excel2007';
+		$model = 'excel2007';
 
 		// Build export file
 		/* ko on php 7.4 on travis (zip not available) */
 		print "Process build_file for model = ".$model."\n";
-		$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
-		$expectedresult=1;
+		$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+		$expectedresult = 1;
 		$this->assertEquals($expectedresult, $result, 'Error in Excel2007 export');
 
 		return true;
@@ -397,7 +397,7 @@ 
 	 */
 	public function testExportPersonalizedWithFilter()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		/*
 		$sql = "SELECT f.ref as f_ref, f.total_ht as f_total_ht, f.total_tva as f_total_tva FROM ".MAIN_DB_PREFIX."facture f";
 
@@ -449,38 +449,38 @@ 
 	 */
 	public function testExportModulesDatasets()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$model='csviso';
+		$model = 'csviso';
 
-		$filterdatatoexport='';
+		$filterdatatoexport = '';
 		//$filterdatatoexport='';
 		//$array_selected = array("s.rowid"=>1, "s.nom"=>2);	// Must be fields found into declaration of dataset
 
 		// Load properties of arrays to make export
-		$objexport=new Export($db);
-		$result=$objexport->load_arrays($user, $filterdatatoexport);	// This load ->array_export_xxx properties for datatoexport
+		$objexport = new Export($db);
+		$result = $objexport->load_arrays($user, $filterdatatoexport); // This load ->array_export_xxx properties for datatoexport
 
 		// Loop on each dataset
 		foreach ($objexport->array_export_code as $key => $datatoexport) {
-			$exportfile=$conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
+			$exportfile = $conf->export->dir_temp.'/'.$user->id.'/export_'.$datatoexport.'.csv';
 			print "Process export for dataset ".$datatoexport." into ".$exportfile."\n";
 			dol_delete_file($exportfile);
 
 			// Generate $array_selected
-			$i=0;
-			$array_selected=array();
+			$i = 0;
+			$array_selected = array();
 			foreach ($objexport->array_export_fields[$key] as $key => $val) {
-				$array_selected[$key]=$i++;
+				$array_selected[$key] = $i++;
 			}
 			//var_dump($array_selected);
 
 			// Build export file
 			$sql = "";
-			$result=$objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
+			$result = $objexport->build_file($user, $model, $datatoexport, $array_selected, array(), $sql);
 			$expectedresult = 1;
 			$this->assertEquals($expectedresult, $result, "Call build_file() to export ".$exportfile.' failed: '.$objexport->error);
-			$result=dol_is_file($exportfile);
+			$result = dol_is_file($exportfile);
 			$this->assertTrue($result, 'File '.$exportfile.' not found');
 		}
 

test/phpunit/NumberingModulesTest.php

Spacing +325 added lines, -325 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';
@@ -34,7 +34,7 @@ 
 	$user->fetch(1);
 	$user->getrights();
 }
-$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
 
 
 /**
@@ -63,11 +63,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -81,9 +81,9 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 
-		$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";
 	}
@@ -95,7 +95,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		print __METHOD__."\n";
@@ -108,11 +108,11 @@ 
 	 */
 	protected function setUp(): void
 	{
-		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;
 
 		print __METHOD__."\n";
 	}
@@ -134,527 +134,527 @@ 
 	 */
 	public function testFactureMercure()
 	{
-		global $conf,$user,$langs,$db,$mysoc;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db, $mysoc;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';
 
 		// First we try with a simple mask, with no reset
 		// and we test counter is still increase second year.
-		$conf->global->FACTURE_ADDON='mercure';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000}';
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
-		$conf->global->FACTURE_MERCURE_MASK_DEPOSIT='{yyyy}-{0000}';
-		$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT='{yyyy}-{0000}';
-		$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED=0;
-
-		$localobject=new Facture($db);
+		$conf->global->FACTURE_ADDON = 'mercure';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_DEPOSIT = '{yyyy}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_REPLACEMENT = '{yyyy}-{0000}';
+		$conf->global->INVOICE_CAN_ALWAYS_BE_REMOVED = 0;
+
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1915);	// we use year 1915 to be sure to not have existing invoice for this year (useful only if numbering is {0000@1}
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1915); // we use year 1915 to be sure to not have existing invoice for this year (useful only if numbering is {0000@1}
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice');				// counter must start to 1
-		$result2=$localobject->create($user, 1);
+		$this->assertEquals('1915-0001', $result, 'Test for {yyyy}-{0000}, 1st invoice'); // counter must start to 1
+		$result2 = $localobject->create($user, 1);
 		print __METHOD__." result2=".$result."\n";
-		$result3=$localobject->validate($user, $result);		// create invoice by forcing ref
+		$result3 = $localobject->validate($user, $result); // create invoice by forcing ref
 		print __METHOD__." result3=".$result."\n";
-		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
-		$result=$localobject->is_erasable();
+		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok'); // counter must start to 1
+		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result, 'Test for is_erasable, 1st invoice');						    // Can be deleted
+		$this->assertGreaterThanOrEqual(1, $result, 'Test for is_erasable, 1st invoice'); // Can be deleted
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen();
 		$localobject2->fetch_thirdparty();
 
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1916);	// we use following year for second invoice (there is no reset into mask)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2, 'last');
+		$localobject2->date = dol_mktime(12, 0, 0, 1, 1, 1916); // we use following year for second invoice (there is no reset into mask)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject2, 'last');
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1915-0001', $result, "Test to get last value with param 'last'");
-		$result=$numbering->getNextValue($mysoc, $localobject2);
+		$result = $numbering->getNextValue($mysoc, $localobject2);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reset)
-		$result2=$localobject2->create($user, 1);
+		$this->assertEquals('1916-0002', $result); // counter must be now 2 (not reset)
+		$result2 = $localobject2->create($user, 1);
 		print __METHOD__." result2=".$result."\n";
-		$result3=$localobject2->validate($user, $result);		// create invoice by forcing ref
+		$result3 = $localobject2->validate($user, $result); // create invoice by forcing ref
 		print __METHOD__." result3=".$result."\n";
-		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok');	// counter must start to 1
-		$result=$localobject2->is_erasable();
+		$this->assertEquals(1, $result3, 'Test validation of invoice with forced ref is ok'); // counter must start to 1
+		$result = $localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$result=$localobject->is_erasable();
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
+		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertLessThanOrEqual(0, $result, 'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice');						// 1 can no more be deleted (2 is more recent)
+		$this->assertLessThanOrEqual(0, $result, 'Test for {yyyy}-{0000} that is_erasable is 0 for 1st invoice'); // 1 can no more be deleted (2 is more recent)
 
 		// Now we try with a reset
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}-{0000@1}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1910);	// we use year 1910 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1910); // we use year 1910 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1910-0001', $result, 'Test for {yyyy}-{0000@1} 1st invoice');				// counter must start to 1
+		$this->assertEquals('1910-0001', $result, 'Test for {yyyy}-{0000@1} 1st invoice'); // counter must start to 1
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen();
 		$localobject2->fetch_thirdparty();
 
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1910);	// we use same year for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
+		$localobject2->date = dol_mktime(12, 0, 0, 1, 1, 1910); // we use same year for second invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject2);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1910-0002', $result, 'Test for {yyyy}-{0000@1} 2nd invoice, same day');	// counter must be now 2
+		$this->assertEquals('1910-0002', $result, 'Test for {yyyy}-{0000@1} 2nd invoice, same day'); // counter must be now 2
 
-		$localobject3=new Facture($db);
+		$localobject3 = new Facture($db);
 		$localobject3->initAsSpecimen();
 		$localobject3->fetch_thirdparty();
 
-		$localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1911);	// we use next year for third invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject3);
+		$localobject3->date = dol_mktime(12, 0, 0, 1, 1, 1911); // we use next year for third invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject3);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3rd invoice, same day');	// counter must be now 1
+		$this->assertEquals('1911-0001', $result, 'Test for {yyyy}-{0000@1} 3rd invoice, same day'); // counter must be now 1
 
 		// Same but we add month after year
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@1}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1920);	// we use year 1920 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1920); // we use year 1920 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('192001-0001', $result, 'Test for {yyyy}{mm}-{0000@1} 1st invoice');			// counter must start to 1
-		$result=$localobject->is_erasable();
+		$this->assertEquals('192001-0001', $result, 'Test for {yyyy}{mm}-{0000@1} 1st invoice'); // counter must start to 1
+		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen();
 		$localobject2->fetch_thirdparty();
 
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1921);	// we use following year for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
-		$result2=$localobject2->create($user, 1);
-		$result3=$localobject2->validate($user, $result);
+		$localobject2->date = dol_mktime(12, 0, 0, 1, 1, 1921); // we use following year for second invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject2);
+		$result2 = $localobject2->create($user, 1);
+		$result3 = $localobject2->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('192101-0001', $result);			// counter must be reset to 1
-		$result=$localobject2->is_erasable();
+		$this->assertEquals('192101-0001', $result); // counter must be reset to 1
+		$result = $localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$result=$localobject->is_erasable();
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
+		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Case 1 can be deleted (because there was a reset for case 2)
+		$this->assertGreaterThanOrEqual(1, $result); // Case 1 can be deleted (because there was a reset for case 2)
 
 		// Same but we add month before year and use a year on 2 digits
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='[mm}{yy}-{0000@1}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{mm}{yy}-{0000@1}';
-		$localobject=new Facture($db);
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '[mm}{yy}-{0000@1}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{mm}{yy}-{0000@1}';
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1925);	// we use year 1925 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0125-0001', $result, 'Test for {mm}{yy}-{0000@1} 1st invoice');				// counter must start to 1
-		$result=$localobject->is_erasable();					// This call get getNextNumRef with param 'last'
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1925); // we use year 1925 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('0125-0001', $result, 'Test for {mm}{yy}-{0000@1} 1st invoice'); // counter must start to 1
+		$result = $localobject->is_erasable(); // This call get getNextNumRef with param 'last'
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
 
-		$localobject2=new Facture($db);
+		$localobject2 = new Facture($db);
 		$localobject2->initAsSpecimen();
 		$localobject2->fetch_thirdparty();
-		$localobject2->date=dol_mktime(12, 0, 0, 1, 1, 1925);	// we use same year 1925 for second invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject2);
-		$result2=$localobject2->create($user, 1);
-		$result3=$localobject2->validate($user, $result);
-		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2nd invoice');			// counter must be now 2
-		$result=$localobject2->is_erasable();
+		$localobject2->date = dol_mktime(12, 0, 0, 1, 1, 1925); // we use same year 1925 for second invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject2);
+		$result2 = $localobject2->create($user, 1);
+		$result3 = $localobject2->validate($user, $result);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('0125-0002', $result, 'Test for {mm}{yy}-{0000@1} 2nd invoice'); // counter must be now 2
+		$result = $localobject2->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(1, $result);						// Can be deleted
-		$result=$localobject->is_erasable();
+		$this->assertGreaterThanOrEqual(1, $result); // Can be deleted
+		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertLessThanOrEqual(0, $result);						// Case 1 can not be deleted (because there is an invoice 2)
+		$this->assertLessThanOrEqual(0, $result); // Case 1 can not be deleted (because there is an invoice 2)
 
-		$localobject3=new Facture($db);
+		$localobject3 = new Facture($db);
 		$localobject3->initAsSpecimen();
 		$localobject3->fetch_thirdparty();
-		$localobject3->date=dol_mktime(12, 0, 0, 1, 1, 1926);	// we use following year for third invoice (and there is a reset required)
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject3);
+		$localobject3->date = dol_mktime(12, 0, 0, 1, 1, 1926); // we use following year for third invoice (and there is a reset required)
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject3);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('0126-0001', $result, 'Test for {mm}{yy}-{0000@1} 3rd invoice');			// counter must be now 1
+		$this->assertEquals('0126-0001', $result, 'Test for {mm}{yy}-{0000@1} 3rd invoice'); // counter must be now 1
 
 		// Try an offset when an invoice already exists
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000+9990}';
-		$result=$numbering->getNextValue($mysoc, $localobject2);
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000+9990}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000+9990}';
+		$result = $numbering->getNextValue($mysoc, $localobject2);
 
 		// Now we try with a different fiscal month (forced by mask)
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@6}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@6}';
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@6}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@6}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1930);	// we use year 1930 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1930); // we use year 1930 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject, 'last');
 		print __METHOD__." result for last=".$result."\n";
-		$this->assertEquals('', $result);						// no existing ref into reset range
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$this->assertEquals('', $result); // no existing ref into reset range
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('193001-0001', $result);			// counter must start to 1
-		$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+		$this->assertEquals('193001-0001', $result); // counter must start to 1
+		$result = $numbering->getNextValue($mysoc, $localobject, 'last');
 		print __METHOD__." result for last=".$result."\n";
-		$this->assertEquals('193001-0001', $result);			// last ref into reset range should be same than last created
+		$this->assertEquals('193001-0001', $result); // last ref into reset range should be same than last created
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1930);	// we use same year but fiscal month after
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject, 'last');
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1930); // we use same year but fiscal month after
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject, 'last');
 		print __METHOD__." result for last=".$result."\n";
-		$this->assertEquals('', $result);						// last ref into reset range should be ''
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$this->assertEquals('', $result); // last ref into reset range should be ''
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('193012-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('193012-0001', $result); // counter must be reset to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1931);	// we use same fiscal year but different year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1931); // we use same fiscal year but different year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('193101-0002', $result);	// counter must be 2
+		$this->assertEquals('193101-0002', $result); // counter must be 2
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1931);	// we use different fiscal year but same year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1931); // we use different fiscal year but same year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('193112-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('193112-0001', $result); // counter must be reset to 1
 
 
 		// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START)
-		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@0}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@0}';
+		$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@0}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@0}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1940);	// we use year 1940 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1940); // we use year 1940 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('194001-0001', $result);	// counter must start to 1
+		$this->assertEquals('194001-0001', $result); // counter must start to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1940);	// we use same year but fiscal month after
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1940); // we use same year but fiscal month after
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('194012-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('194012-0001', $result); // counter must be reset to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1941);	// we use same fiscal year but different year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1941); // we use same fiscal year but different year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('194101-0002', $result);	// counter must be 2
+		$this->assertEquals('194101-0002', $result); // counter must be 2
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1941);	// we use different discal year but same year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1941); // we use different discal year but same year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('194112-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('194112-0001', $result); // counter must be reset to 1
 
 
 		// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want year of element
-		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@=}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@=}';
+		$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@=}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@=}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1950);	// we use year 1950 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1950); // we use year 1950 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('195001-0001', $result);	// counter must start to 1
+		$this->assertEquals('195001-0001', $result); // counter must start to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1950);	// we use same year but fiscal month after
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1950); // we use same year but fiscal month after
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('195012-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('195012-0001', $result); // counter must be reset to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1951);	// we use same fiscal year but different year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1951); // we use same fiscal year but different year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('195101-0002', $result);	// counter must be 2
+		$this->assertEquals('195101-0002', $result); // counter must be 2
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1951);	// we use different discal year but same year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1951); // we use different discal year but same year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('195112-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('195112-0001', $result); // counter must be reset to 1
 
 
 		// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want start year
-		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@-}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@-}';
+		$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@-}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@-}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1960);	// we use year 1960 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1960); // we use year 1960 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('195901-0001', $result);	// counter must start to 1
+		$this->assertEquals('195901-0001', $result); // counter must start to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1960);	// we use same year but fiscal month after
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1960); // we use same year but fiscal month after
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('196012-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('196012-0001', $result); // counter must be reset to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1961);	// we use same fiscal year but different year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1961); // we use same fiscal year but different year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('196001-0002', $result);	// counter must be 2
+		$this->assertEquals('196001-0002', $result); // counter must be 2
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1961);	// we use different discal year but same year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1961); // we use different discal year but same year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('196112-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('196112-0001', $result); // counter must be reset to 1
 
 
 		// Now we try with a different fiscal month (defined by SOCIETE_FISCAL_MONTH_START) and we always want end year
-		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@+}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@+}';
+		$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@+}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@+}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1970);	// we use year 1970 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1970); // we use year 1970 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('197001-0001', $result);	// counter must start to 1
+		$this->assertEquals('197001-0001', $result); // counter must start to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1970);	// we use same year but fiscal month after
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1970); // we use same year but fiscal month after
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('197112-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('197112-0001', $result); // counter must be reset to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1971);	// we use same fiscal year but different year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1971); // we use same fiscal year but different year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('197101-0002', $result);	// counter must be 2
+		$this->assertEquals('197101-0002', $result); // counter must be 2
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 12, 1, 1971);	// we use different fiscal year but same year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1971); // we use different fiscal year but same year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('197212-0001', $result);	// counter must be reset to 1
+		$this->assertEquals('197212-0001', $result); // counter must be reset to 1
 
 		// Now we try with a reset every month (@99)
-		$conf->global->SOCIETE_FISCAL_MONTH_START=6;
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000@99}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}{mm}-{0000@99}';
+		$conf->global->SOCIETE_FISCAL_MONTH_START = 6;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{yyyy}{mm}-{0000@99}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{yyyy}{mm}-{0000@99}';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1980); // we use year 1980 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('198001-0001', $result);	// counter must start to 1
+		$this->assertEquals('198001-0001', $result); // counter must start to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1980); // we use year 1980 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('198001-0002', $result);	// counter must start to 2
+		$this->assertEquals('198001-0002', $result); // counter must start to 2
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 2, 1, 1980);	// we use year 1980 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 2, 1, 1980); // we use year 1980 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('198002-0001', $result);	// counter must start to 1
+		$this->assertEquals('198002-0001', $result); // counter must start to 1
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1981);	// we use year 1981 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($mysoc, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1981); // we use year 1981 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($mysoc, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('198101-0001', $result);	// counter must start to 1
+		$this->assertEquals('198101-0001', $result); // counter must start to 1
 
 		// Test with {t} tag
-		$conf->global->SOCIETE_FISCAL_MONTH_START=1;
-		$conf->global->FACTURE_MERCURE_MASK_CREDIT='{t}{yyyy}{mm}-{0000}';
-		$conf->global->FACTURE_MERCURE_MASK_INVOICE='{t}{yyyy}{mm}-{0000}';
+		$conf->global->SOCIETE_FISCAL_MONTH_START = 1;
+		$conf->global->FACTURE_MERCURE_MASK_CREDIT = '{t}{yyyy}{mm}-{0000}';
+		$conf->global->FACTURE_MERCURE_MASK_INVOICE = '{t}{yyyy}{mm}-{0000}';
 
-		$tmpthirdparty=new Societe($db);
+		$tmpthirdparty = new Societe($db);
 		$tmpthirdparty->initAsSpecimen();
 		$tmpthirdparty->typent_code = 'TE_ABC';
 
-		$localobject=new Facture($db);
+		$localobject = new Facture($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date=dol_mktime(12, 0, 0, 1, 1, 1982);	// we use year 1982 to be sure to not have existing invoice for this year
-		$numbering=new mod_facture_mercure();
-		$result=$numbering->getNextValue($tmpthirdparty, $localobject);
-		$result2=$localobject->create($user, 1);
-		$result3=$localobject->validate($user, $result);
+		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1982); // we use year 1982 to be sure to not have existing invoice for this year
+		$numbering = new mod_facture_mercure();
+		$result = $numbering->getNextValue($tmpthirdparty, $localobject);
+		$result2 = $localobject->create($user, 1);
+		$result3 = $localobject->validate($user, $result);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('A198201-0001', $result);	// counter must start to 1
+		$this->assertEquals('A198201-0001', $result); // counter must start to 1
 
 
 		return $result;
@@ -668,24 +668,24 @@ 
 	 */
 	public function testShipmentSafor()
 	{
-		global $conf,$user,$langs,$db,$mysoc;
-		$conf=$this->savconf;
-		$user=$this->savuser;
-		$langs=$this->savlangs;
-		$db=$this->savdb;
+		global $conf, $user, $langs, $db, $mysoc;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
 
 		require_once dirname(__FILE__).'/../../htdocs/expedition/class/expedition.class.php';
 		require_once dirname(__FILE__).'/../../htdocs/core/modules/expedition/mod_expedition_safor.php';
 
-		$localobject=new Expedition($db);
+		$localobject = new Expedition($db);
 		$localobject->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date_creation = dol_mktime(12, 0, 0, 1, 1, 1980);	// we use year 1915 to be sure to not have existing invoice for this year (useful only if numbering is {0000@1}
-		$numbering=new mod_expedition_safor();
-		$result=$numbering->getNextValue($mysoc, $localobject);
+		$localobject->date_creation = dol_mktime(12, 0, 0, 1, 1, 1980); // we use year 1915 to be sure to not have existing invoice for this year (useful only if numbering is {0000@1}
+		$numbering = new mod_expedition_safor();
+		$result = $numbering->getNextValue($mysoc, $localobject);
 
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('SH8001-0003', $result);	// counter must start to 1
+		$this->assertEquals('SH8001-0003', $result); // counter must start to 1
 	}
 }

test/phpunit/SecurityTest.php

Spacing +293 added lines, -293 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;
 
 
 /**
@@ -92,11 +92,11 @@ 
 		parent::__construct($name);
 
 		//$this->sharedFixture
-		global $conf,$user,$langs,$db;
-		$this->savconf=$conf;
-		$this->savuser=$user;
-		$this->savlangs=$langs;
-		$this->savdb=$db;
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
 
 		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
@@ -110,8 +110,8 @@ 
 	 */
 	public static function setUpBeforeClass(): void
 	{
-		global $conf,$user,$langs,$db;
-		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+		global $conf, $user, $langs, $db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
 		print __METHOD__."\n";
 	}
@@ -123,7 +123,7 @@ 
 	 */
 	public static function tearDownAfterClass(): void
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$db->rollback();
 
 		// Restore value to a neutral value (it was set to a test value by some tests)
@@ -139,11 +139,11 @@ 
 	 */
 	protected function setUp(): void
 	{
-		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;
 
 		print __METHOD__."\n";
 	}
@@ -166,7 +166,7 @@ 
 	public function testSetLang()
 	{
 		global $conf;
-		$conf=$this->savconf;
+		$conf = $this->savconf;
 
 		$tmplangs = new Translate('', $conf);
 
@@ -188,7 +188,7 @@ 
 		// More on https://www.owasp.org/index.php/XSS_Filter_Evasion_Cheat_Sheet
 
 		// Should be OK
-		$expectedresult=0;
+		$expectedresult = 0;
 
 		/*
 		$test = '';
@@ -196,107 +196,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),
@@ -307,60 +307,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');
 	}
@@ -372,11 +372,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;
@@ -384,206 +384,206 @@ 
 		$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["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["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');
 
 
 		// 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');
 
@@ -594,22 +594,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
@@ -621,19 +621,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);
 		}
@@ -645,19 +645,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);
 		}
@@ -669,19 +669,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');
 
@@ -690,75 +690,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)');
 
@@ -772,15 +772,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');
 
@@ -799,7 +799,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;
@@ -863,21 +863,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);
 
@@ -891,16 +891,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);
 	}
 
@@ -918,42 +918,42 @@ 
 		$url = 'ftp://mydomain.com';
 		$tmp = getURLContent($url);
 		print __METHOD__." url=".$url."\n";
-		$this->assertGreaterThan(0, strpos($tmp['curl_error_msg'], 'not supported'));	// Test error if return does not contains 'not supported'
+		$this->assertGreaterThan(0, strpos($tmp['curl_error_msg'], 'not supported')); // 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, $tmp['http_code'], 'Should GET url 301 response and stop here');
 
-		$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, $tmp['http_code'], 'Should GET url 301 with a follow -> 200 but we get '.$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, $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, $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, $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, $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, $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, $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, $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, $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, $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, $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
@@ -962,9 +962,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'] = ".$tmp['http_code']."\n";
-		$this->assertEquals(400, $tmp['http_code'], 'Access should be refused and was not');	// Test we receive an error because ip is in blacklist
+		$this->assertEquals(400, $tmp['http_code'], 'Access should be refused and was not'); // Test we receive an error because ip is in blacklist
 
 		return 0;
 	}
@@ -976,22 +976,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');
 	}
 
@@ -1002,26 +1002,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');
 	}
 
@@ -1032,19 +1032,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);
 	}
 
@@ -1055,17 +1055,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);
 
@@ -1073,7 +1073,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);
 
@@ -1114,48 +1114,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);
@@ -1173,12 +1173,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
 
 
 
@@ -1191,7 +1191,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
@@ -1240,24 +1240,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
 	}
 }

dev/translation/sanity_check_en_langfiles.php

Spacing +138 added lines, -138 removed lines

@@ -20,13 +20,13 @@ 
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
-$web=0;
+$web = 0;
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
-	$web=1;
+	$web = 1;
 }
 
 
@@ -112,8 +112,8 @@ 
 	exit;
 }
 
-$dups=array();
-$exludefiles = array('.','..','README');
+$dups = array();
+$exludefiles = array('.', '..', 'README');
 $files = array_diff($files, $exludefiles);
 // To force a file: $files=array('myfile.lang');
 if (isset($argv[2])) {
@@ -124,18 +124,18 @@ 
 foreach ($files as $file) {
 	$path_file = pathinfo($file);
 	// we're only interested in .lang files
-	if ($path_file['extension']=='lang') {
+	if ($path_file['extension'] == 'lang') {
 		$content = file($workdir.$file);
 		foreach ($content as $line => $row) {
 			// don't want comment lines
 			if (substr($row, 0, 1) !== '#') {
 				// don't want lines without the separator (why should those even be here, anyway...)
-				if (strpos($row, '=')!==false) {
-					$row_array = explode('=', $row);		// $row_array[0] = key
-					$langstrings_3d[$path_file['basename']][$line+1]=$row_array[0];
-					$langstrings_3dtrans[$path_file['basename']][$line+1]=$row_array[1];
-					$langstrings_full[]=$row_array[0];
-					$langstrings_dist[$row_array[0]]=$row;
+				if (strpos($row, '=') !== false) {
+					$row_array = explode('=', $row); // $row_array[0] = key
+					$langstrings_3d[$path_file['basename']][$line + 1] = $row_array[0];
+					$langstrings_3dtrans[$path_file['basename']][$line + 1] = $row_array[1];
+					$langstrings_full[] = $row_array[0];
+					$langstrings_dist[$row_array[0]] = $row;
 				}
 			}
 		}
@@ -145,7 +145,7 @@ 
 foreach ($langstrings_3d as $filename => $file) {
 	foreach ($file as $linenum => $value) {
 		$keys = array_keys($langstrings_full, $value);
-		if (count($keys)>1) {
+		if (count($keys) > 1) {
 			foreach ($keys as $key) {
 				$dups[$value][$filename][$linenum] = trim($langstrings_3dtrans[$filename][$linenum]);
 			}
@@ -167,76 +167,76 @@ 
 	echo "<tbody>\n";
 }
 
-$sduplicateinsamefile='';
-$sinmainandother='';
-$sininstallandadmin='';
-$sother='';
+$sduplicateinsamefile = '';
+$sinmainandother = '';
+$sininstallandadmin = '';
+$sother = '';
 
 $count = 0;
 foreach ($dups as $string => $pages) {
 	$count++;
-	$s='';
+	$s = '';
 
 	// Keyword $string
 	if ($web) {
-		$s.="<tr>";
+		$s .= "<tr>";
 	}
 	if ($web) {
-		$s.="<td align=\"center\">";
+		$s .= "<td align=\"center\">";
 	}
 	if ($web) {
-		$s.=$count;
+		$s .= $count;
 	}
 	if ($web) {
-		$s.="</td>";
+		$s .= "</td>";
 	}
 	if ($web) {
-		$s.="<td>";
+		$s .= "<td>";
 	}
-	$s.=$string;
+	$s .= $string;
 	if ($web) {
-		$s.="</td>";
+		$s .= "</td>";
 	}
 	if ($web) {
-		$s.="<td>";
+		$s .= "<td>";
 	}
-	if (! $web) {
-		$s.= ' : ';
+	if (!$web) {
+		$s .= ' : ';
 	}
 
 	// Loop on each files keyword was found
-	$duplicateinsamefile=0;
-	$inmain=0;
-	$inadmin=0;
+	$duplicateinsamefile = 0;
+	$inmain = 0;
+	$inadmin = 0;
 	foreach ($pages as $file => $lines) {
 		if ($file == 'main.lang') {
-			$inmain=1;
-			$inadmin=0;
+			$inmain = 1;
+			$inadmin = 0;
 		}
-		if ($file == 'admin.lang' && ! $inmain) {
-			$inadmin=1;
+		if ($file == 'admin.lang' && !$inmain) {
+			$inadmin = 1;
 		}
 
-		$s.=$file." ";
+		$s .= $file." ";
 
 		// Loop on each line keyword was found into file.
-		$listoffilesforthisentry=array();
+		$listoffilesforthisentry = array();
 		foreach ($lines as $line => $translatedvalue) {
 			if (!empty($listoffilesforthisentry[$file])) {
-				$duplicateinsamefile=1;
+				$duplicateinsamefile = 1;
 			}
-			$listoffilesforthisentry[$file]=1;
+			$listoffilesforthisentry[$file] = 1;
 
-			$s.= "(".$line." - ".htmlentities($translatedvalue).") ";
+			$s .= "(".$line." - ".htmlentities($translatedvalue).") ";
 		}
 		if ($web) {
-			$s.="<br>";
+			$s .= "<br>";
 		}
 	}
 	if ($web) {
-		$s.="</td></tr>";
+		$s .= "</td></tr>";
 	}
-	$s.="\n";
+	$s .= "\n";
 
 	if ($duplicateinsamefile) {
 		$sduplicateinsamefile .= $s;
@@ -249,47 +249,47 @@ 
 	}
 }
 
-if (! $web) {
+if (!$web) {
 	print "\n***** Entries duplicated in same file\n";
 }
 print $sduplicateinsamefile;
-if (! $web && empty($sduplicateinsamefile)) {
+if (!$web && empty($sduplicateinsamefile)) {
 	print "None\n";
 }
-if (! $web) {
+if (!$web) {
 	print "\n";
 }
 
-if (! $web) {
+if (!$web) {
 	print "***** Entries in main and another (keep only entry in main)\n";
 }
 print $sinmainandother;
-if (! $web && empty($sinmainandother)) {
+if (!$web && empty($sinmainandother)) {
 	print "None\n";
 }
-if (! $web) {
+if (!$web) {
 	print "\n";
 }
 
-if (! $web) {
+if (!$web) {
 	print "***** Entries in admin and another\n";
 }
 print $sininstallandadmin;
-if (! $web && empty($sininstallandadmin)) {
+if (!$web && empty($sininstallandadmin)) {
 	print "None\n";
 }
-if (! $web) {
+if (!$web) {
 	print "\n";
 }
 
-if (! $web) {
+if (!$web) {
 	print "***** Other\n";
 }
 print $sother;
-if (! $web && empty($sother)) {
+if (!$web && empty($sother)) {
 	print "None\n";
 }
-if (! $web) {
+if (!$web) {
 	print "\n";
 }
 
@@ -301,265 +301,265 @@ 
 
 // STEP 2 - Search key not used
 
-if ((!empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1]=='unused=true')) {
+if ((!empty($_REQUEST['unused']) && $_REQUEST['unused'] == 'true') || (isset($argv[1]) && $argv[1] == 'unused=true')) {
 	print "***** Strings in en_US that are never used:\n";
 
-	$unused=array();
+	$unused = array();
 	foreach ($langstrings_dist as $value => $line) {
-		$qualifiedforclean=1;
+		$qualifiedforclean = 1;
 		// Check if we must keep this key to be into file for removal
 		if (preg_match('/^Module\d+/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Permission\d+/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^PermissionAdvanced\d+/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ProfId\d+/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Delays_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^BarcodeDesc/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Extrafield/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^LocalTax/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Country/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Civility/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Currency/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DemandReasonTypeSRC/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^PaperFormat/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Duration/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^AmountLT/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TotalLT/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Month/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^MonthShort/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Day\d/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Short/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ExportDataset_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ImportDataset_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ActionAC_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TypeLocaltax/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^StatusProspect/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^PL_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TE_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^JuridicalStatus/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^CalcMode/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^newLT/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^LT[0-9]/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TypeContact_contrat_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ErrorPriceExpression/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^Language_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DescADHERENT_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^SubmitTranslation/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^ModuleCompanyCode/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/InDolibarr$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// admin.lang
 		if (preg_match('/^DAV_ALLOW_PUBLIC_DIR/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DAV_ALLOW_ECM_DIR/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// boxes.lang
 		if (preg_match('/^BoxTitleLast/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^BoxTitleLatest/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// install.lang
 		if (preg_match('/^KeepDefaultValues/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// mail.lang
 		if (preg_match('/MailingModuleDesc/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// main.lang
 		if (preg_match('/^Duration/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^FormatDate/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DateFormat/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^.b$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^.*Bytes$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^NoteSomeFeaturesAreDisabled/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^(DoTest|Under|Limits|Cards|CurrentValue|DateLimit|DateAndHour|NbOfLines|NbOfObjects|NbOfReferes|TotalTTCShort|VATs)/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// modulebuilder
 		if (preg_match('/^ModuleBuilderDesc/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// orders
 		if (preg_match('/^OrderSource/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^TypeContact_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// other.lang
 		if (preg_match('/^Notify_/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^PredefinedMail/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^DemoCompany/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^WeightUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^LengthUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^SurfaceUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^VolumeUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^SizeUnit/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/^EMailText/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/ById$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/ByLogin$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// printing
 		if (preg_match('/PrintingDriverDesc$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/PrintTestDesc$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		// products
 		if (preg_match('/GlobalVariableUpdaterType$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/GlobalVariableUpdaterHelp$/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/OppStatus/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/AvailabilityType/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/CardProduct/', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 
 		if (preg_match('/sms/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/TF_/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/WithBankUsing/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 		if (preg_match('/descWORKFLOW_/i', $value)) {
-			$qualifiedforclean=0;
+			$qualifiedforclean = 0;
 		}
 
-		if (! $qualifiedforclean) {
+		if (!$qualifiedforclean) {
 			continue;
 		}
 
 		//$search = '\'trans("'.$value.'")\'';
 		$search = '-e "\''.$value.'\'" -e \'"'.$value.'"\' -e "('.$value.')" -e "('.$value.',"';
-		$string =  'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*';
+		$string = 'grep -R -m 1 -F --exclude=includes/* --include=*.php '.$search.' '.$htdocs.'* '.$scripts.'*';
 		//print $string."<br>\n";
 		exec($string, $output);
 		if (empty($output)) {
 			$unused[$value] = $line;
-			echo $line;        // $trad contains the \n
+			echo $line; // $trad contains the \n
 		} else {
 			unset($output);
 			//print 'X'.$output.'Y';
@@ -569,7 +569,7 @@ 
 	if (empty($unused)) {
 		print "No string not used found.\n";
 	} else {
-		$filetosave='/tmp/'.($argv[2] ? $argv[2] : "").'notused.lang';
+		$filetosave = '/tmp/'.($argv[2] ? $argv[2] : "").'notused.lang';
 		print "Strings in en_US that are never used are saved into file ".$filetosave.":\n";
 		file_put_contents($filetosave, implode("", $unused));
 		print "To remove from original file, run command :\n";