Dolibarr / dolibarr

test/phpunit/BlockedLogAndLNETest.php

Spacing +2 added lines, -2 removed lines

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

test/phpunit/SecurityGETPOSTTest.php

Spacing +34 added lines, -34 removed lines

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

htdocs/admin/mails_templates.php

Spacing +3 added lines, -3 removed lines

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

htdocs/core/customreports.php

Spacing +17 added lines, -17 removed lines

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

htdocs/core/class/commoninvoice.class.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -723,7 +723,7 @@
 
 		// If not a draft invoice and not temporary invoice
 		if ($tmppart !== 'PROV') {
-			if ($this instanceOf Facture) {
+			if ($this instanceof Facture) {
 				/* @var Facture $this */
 				// If sent by email, we refuse
 				if ((int) $this->email_sent_counter > 0) {

htdocs/core/modules/modEventOrganization.class.php

Spacing +46 added lines, -46 removed lines

@@ -232,82 +232,82 @@ 
 		/* END MODULEBUILDER TOPMENU */
 		/* BEGIN MODULEBUILDER LEFTMENU CONFERENCEORBOOTH*/
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'EventOrganizationMenuLeft',
 			'prefix' => img_picto('', 'eventorganization', 'class="paddingright pictofixedwidth"'),
 			'mainmenu' => 'project',
 			'leftmenu' => 'eventorganization',
 			'url' => '',
-			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "read")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'New',
 			'url' => '/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0',
-			'langs' => 'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "write")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganization', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'List',
 			'url' => '/projet/list.php?search_usage_event_organization=1&search_status=99&mainmenu=project&contextpage=organizedevents',
-			'langs' => 'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization@eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "write")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'ConferenceOrBooth',
 			'prefix' => img_picto('', 'conferenceorbooth', 'class="paddingright pictofixedwidth"'),
 			'mainmenu' => 'project',
 			'leftmenu' => 'eventorganizationconforbooth',
 			'url' => '',
-			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "read")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'New',
 			'url' => '/eventorganization/conferenceorbooth_card.php?leftmenu=projects&action=create',
-			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "write")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "write")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		$this->menu[$r++] = array(
-			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type' => 'left',			                // This is a Left menu entry
+			'fk_menu' => 'fk_mainmenu=project,fk_leftmenu=eventorganizationconforbooth', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type' => 'left', // This is a Left menu entry
 			'titre' => 'List',
 			'url' => '/eventorganization/conferenceorbooth_list.php?mainmenu=project',
-			'langs' => 'eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs' => 'eventorganization', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position' => 1000 + $r,
-			'enabled' => 'isModEnabled("eventorganization")',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms' => '$user->hasRight("project", "read")',			                // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
+			'enabled' => 'isModEnabled("eventorganization")', // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms' => '$user->hasRight("project", "read")', // Use 'perms'=>'$user->rights->eventorganization->level1->level2' if you want your menu with a permission rules
 			'target' => '',
-			'user' => 2,				                // 0=Menu for internal users, 1=external users, 2=both
+			'user' => 2, // 0=Menu for internal users, 1=external users, 2=both
 		);
 		/* END MODULEBUILDER LEFTMENU CONFERENCEORBOOTH */
 
@@ -317,7 +317,7 @@ 
 		/* BEGIN MODULEBUILDER EXPORT CONFERENCEORBOOTHATTENDEES */
 		$langs->load("eventorganization");
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
-		$this->export_label[$r] = 'ListOfAttendeesOfEvent';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_label[$r] = 'ListOfAttendeesOfEvent'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r] = $this->picto;
 		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
 		$keyforclass = 'ConferenceOrBoothAttendee';
@@ -325,8 +325,8 @@ 
 		$keyforelement = 'conferenceorboothattendee';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
 		$this->export_entities_array[$r]['t.fk_invoice'] = 'invoice';
-		unset($this->export_fields_array[$r]['t.fk_project']);	// Remove field so we can add it at end just after
-		unset($this->export_fields_array[$r]['t.fk_soc']);	// Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
 		$this->export_fields_array[$r]['t.fk_invoice'] = 'InvoiceId';
 		$this->export_fields_array[$r]['t.fk_project'] = 'ProjectId';
 		$this->export_fields_array[$r]['p.ref'] = 'ProjectRef';
@@ -340,9 +340,9 @@ 
 		$this->export_TypeFields_array[$r]['t.fk_soc'] = 'Numeric';
 		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
 		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
-		$keyforselect = 'eventorganization_conferenceorboothattendee';		// The value in column elementtype of llx_extrafields table
+		$keyforselect = 'eventorganization_conferenceorboothattendee'; // The value in column elementtype of llx_extrafields table
 		$keyforaliasextra = 'extra';
-		$keyforelement = 'conferenceorboothattendee';						// The value of key for icon and class
+		$keyforelement = 'conferenceorboothattendee'; // The value of key for icon and class
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 		//$this->export_dependencies_array[$r] = array('aaaline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
 		//$this->export_special_array[$r] = array('t.field'=>'...');
@@ -358,16 +358,16 @@ 
 		/* BEGIN MODULEBUILDER EXPORT CONFERENCEORBOOTH */
 		$langs->load("eventorganization");
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
-		$this->export_label[$r] = 'ListOfConfOrBoothOfEvent';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_label[$r] = 'ListOfConfOrBoothOfEvent'; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_icon[$r] = 'conferenceorbooth';
 		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
 		$keyforclass = 'ConferenceOrBooth';
 		$keyforclassfile = '/eventorganization/class/conferenceorbooth.class.php';
 		$keyforelement = 'conferenceorbooth';
 		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		unset($this->export_fields_array[$r]['t.fk_action']);	// Remove field so we can add it at end just after
-		unset($this->export_fields_array[$r]['t.fk_project']);	// Remove field so we can add it at end just after
-		unset($this->export_fields_array[$r]['t.fk_soc']);	// Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_action']); // Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_project']); // Remove field so we can add it at end just after
+		unset($this->export_fields_array[$r]['t.fk_soc']); // Remove field so we can add it at end just after
 		$this->export_fields_array[$r]['t.fk_action'] = 'ConferenceOrBoothFormatID';
 		$this->export_fields_array[$r]['ca.code'] = 'ConferenceOrBoothFormatCode';
 		$this->export_fields_array[$r]['ca.libelle'] = 'ConferenceOrBoothFormatLabel';
@@ -389,7 +389,7 @@ 
 		$this->export_TypeFields_array[$r]['s.nom'] = 'Text';
 		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
 		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
-		$keyforselect = 'actioncomm';		// The value in column elementtype of llx_extrafields table
+		$keyforselect = 'actioncomm'; // The value in column elementtype of llx_extrafields table
 		$keyforaliasextra = 'extra';
 		$keyforelement = 'conferenceorbooth';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';

htdocs/projet/class/task.class.php

Spacing +21 added lines, -21 removed lines

@@ -589,7 +589,7 @@ 
 				$this->date_end = $this->db->jdate($obj->date_end);
 				$this->fk_user_creat		= $obj->fk_user_creat;
 				$this->fk_user_valid		= $obj->fk_user_valid;
-				$this->status			    = $obj->status;
+				$this->status = $obj->status;
 				$this->progress				= $obj->progress;
 				$this->budget_amount		= $obj->budget_amount;
 				$this->priority				= $obj->priority;
@@ -725,7 +725,7 @@ 
 						 * @param Task $task
 						 * @return bool
 						 */
-						static function ($allTasksCompleted, $task) {
+						static function($allTasksCompleted, $task) {
 							return $allTasksCompleted && $task->progress >= 100;
 						},
 						1
@@ -1359,14 +1359,14 @@ 
 						$tasks[$i]->billed = $obj->billed;
 					}
 
-					$tasks[$i]->progress		= $obj->progress;
+					$tasks[$i]->progress = $obj->progress;
 					$tasks[$i]->fk_statut		= $obj->status;
-					$tasks[$i]->status 		    = $obj->status;
+					$tasks[$i]->status = $obj->status;
 					$tasks[$i]->public = $obj->public;
 					$tasks[$i]->date_start = $this->db->jdate($obj->date_start);
 					$tasks[$i]->date_end		= $this->db->jdate($obj->date_end);
 					$tasks[$i]->rang	   		= $obj->rang;
-					$tasks[$i]->priority   		= $obj->priority;
+					$tasks[$i]->priority = $obj->priority;
 
 					$tasks[$i]->socid           = $obj->thirdparty_id; // For backward compatibility
 					$tasks[$i]->thirdparty_id = $obj->thirdparty_id;
@@ -1710,7 +1710,7 @@ 
 			}
 
 			// Update hourly rate of this time spent entry
-			$resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int) $timespent->fk_user));
+			$resql_thm_user = $this->db->query("SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $timespent->fk_user));
 			if (!empty($resql_thm_user)) {
 				$obj_thm_user = $this->db->fetch_object($resql_thm_user);
 				$timespent->thm = $obj_thm_user->thm;
@@ -1792,8 +1792,8 @@ 
 				$newobj->fk_project			= $obj->project_id;
 				$newobj->project_ref		= $obj->project_ref;
 				$newobj->project_label = $obj->project_label;
-				$newobj->project_public		= $obj->project_public;
-				$newobj->public				= $obj->project_public;		// deprecated
+				$newobj->project_public = $obj->project_public;
+				$newobj->public				= $obj->project_public; // deprecated
 
 				$newobj->fk_task			= $obj->task_id;
 				$newobj->task_ref = $obj->task_ref;
@@ -1807,7 +1807,7 @@ 
 				$newobj->timespent_line_duration = $obj->task_duration;
 				$newobj->timespent_line_fk_user = $obj->fk_user;
 				$newobj->timespent_line_fk_product = $obj->fk_product;
-				$newobj->timespent_line_thm = $obj->thm;	// hourly rate
+				$newobj->timespent_line_thm = $obj->thm; // hourly rate
 				$newobj->timespent_line_note = $obj->note;
 
 				$arrayres[] = $newobj;
@@ -2046,7 +2046,7 @@ 
 				$newobj->timespent_withhour = $obj->task_date_withhour;
 				$newobj->timespent_duration = $obj->task_duration;
 				$newobj->timespent_fk_user = $obj->fk_user;
-				$newobj->timespent_thm = $obj->thm;	// hourly rate
+				$newobj->timespent_thm = $obj->thm; // hourly rate
 				$newobj->timespent_note = $obj->note;
 
 				$arrayres[] = $newobj;
@@ -2110,7 +2110,7 @@ 
 		$timespent->element_date = $this->timespent_date;
 		$timespent->element_datehour = $this->timespent_datehour;
 
-		$timespent->element_date_withhour = $this->timespent_withhour;		// 0 or 1
+		$timespent->element_date_withhour = $this->timespent_withhour; // 0 or 1
 		$timespent->element_duration = $this->timespent_duration;
 		if ($this->timespent_fk_user > 0) {
 			$timespent->fk_user = $this->timespent_fk_user;
@@ -2146,14 +2146,14 @@ 
 		if ($ret == 1 && (($this->timespent_old_duration != $this->timespent_duration) || getDolGlobalString('TIMESPENT_ALWAYS_UPDATE_THM'))) {
 			if ($this->timespent_old_duration != $this->timespent_duration) {
 				// Recalculate amount of time spent for task and update denormalized field
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "projet_task";
-				$sql .= " SET duration_effective = (SELECT SUM(element_duration) FROM " . MAIN_DB_PREFIX . "element_time as ptt where ptt.elementtype = 'task' AND ptt.fk_element = " . ((int) $this->id) . ")";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task";
+				$sql .= " SET duration_effective = (SELECT SUM(element_duration) FROM ".MAIN_DB_PREFIX."element_time as ptt where ptt.elementtype = 'task' AND ptt.fk_element = ".((int) $this->id).")";
 				if (isset($this->progress)) {
-					$sql .= ", progress = " . ((float) $this->progress); // Do not overwrite value if not provided
+					$sql .= ", progress = ".((float) $this->progress); // Do not overwrite value if not provided
 				}
-				$sql .= " WHERE rowid = " . ((int) $this->id);
+				$sql .= " WHERE rowid = ".((int) $this->id);
 
-				dol_syslog(get_class($this) . "::updateTimeSpent", LOG_DEBUG);
+				dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
 				if (!$this->db->query($sql)) {
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
@@ -2164,7 +2164,7 @@ 
 			// Update hourly rate of this time spent entry, but only if it was not set initially
 			$res_update = 1;
 			if (empty($timespent->thm) || getDolGlobalString('TIMESPENT_ALWAYS_UPDATE_THM')) {
-				$resql_thm_user = $this->db->query("SELECT thm FROM " . MAIN_DB_PREFIX . "user WHERE rowid = " . ((int) $timespent->fk_user));
+				$resql_thm_user = $this->db->query("SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $timespent->fk_user));
 				if (!empty($resql_thm_user)) {
 					$obj_thm_user = $this->db->fetch_object($resql_thm_user);
 					$timespent->thm = $obj_thm_user->thm;
@@ -2301,8 +2301,8 @@ 
 
 		$defaultref = '';
 		$obj = !getDolGlobalString('PROJECT_TASK_ADDON') ? 'mod_task_simple' : $conf->global->PROJECT_TASK_ADDON;
-		if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
-			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/" . getDolGlobalString('PROJECT_TASK_ADDON').'.php';
+		if (getDolGlobalString('PROJECT_TASK_ADDON') && is_readable(DOL_DOCUMENT_ROOT."/core/modules/project/task/".getDolGlobalString('PROJECT_TASK_ADDON').".php")) {
+			require_once DOL_DOCUMENT_ROOT."/core/modules/project/task/".getDolGlobalString('PROJECT_TASK_ADDON').'.php';
 			$modTask = new $obj();
 			'@phan-var-force ModeleNumRefTask $modTask';
 			$defaultref = $modTask->getNextValue(null, $clone_task);
@@ -2352,7 +2352,7 @@ 
 		}
 		// End
 		if ($error) {
-			$clone_task_id = 0;  // For static tool check
+			$clone_task_id = 0; // For static tool check
 		} else {
 			$clone_task_id = $clone_task->id;
 			$clone_task_ref = $clone_task->ref;
@@ -2792,7 +2792,7 @@ 
 		global $langs, $hookmanager, $user, $action;
 
 		$error = 0;
-		$task_origin = new Task($this->db);		// The thirdparty that we will delete
+		$task_origin = new Task($this->db); // The thirdparty that we will delete
 
 		dol_syslog("mergeTask merge task id=".$task_origin_id." (will be deleted) into the task id=".$this->id);
 

test/phpunit/NumberingModulesTest.php

Spacing +93 added lines, -93 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';
@@ -55,7 +55,7 @@ 
 	 */
 	public function testFactureMercure()
 	{
-		global $conf,$user,$langs,$db,$mysoc;
+		global $conf, $user, $langs, $db, $mysoc;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -77,50 +77,50 @@ 
 		$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}
+		$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
+		$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
+		$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
 
 		// We emulate print on invoice 3 times
 		$localobject->pos_print_counter = 3;
 		$result = $localobject->is_erasable();
 		print __METHOD__." is_erasable=".$result."\n";
-		$this->assertGreaterThanOrEqual(-6, $result, 'Test for is_erasable, 1st invoice already printed');						    // Can be deleted
+		$this->assertGreaterThanOrEqual(-6, $result, 'Test for is_erasable, 1st invoice already printed'); // Can be deleted
 
 
 		$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)
+		$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);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1916-0002', $result);				// counter must be now 2 (not reset)
+		$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
+		$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
+		$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}';
@@ -130,33 +130,33 @@ 
 		$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
+		$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->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)
+		$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->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)
+		$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}';
@@ -166,34 +166,34 @@ 
 		$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
+		$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
+		$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->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)
+		$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
+		$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
+		$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}';
@@ -201,42 +201,42 @@ 
 		$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
+		$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'
+		$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->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)
+		$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
+		$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
+		$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->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)
+		$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}';
@@ -251,56 +251,56 @@ 
 		$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
+		$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
+		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1930);	// we use same year but fiscal month after
+		$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 ''
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1931);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1931);	// we use different fiscal year but same year
+		$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)
@@ -312,47 +312,47 @@ 
 		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1940);	// we use same year but fiscal month after
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1941);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1941);	// we use different discal year but same year
+		$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
@@ -364,47 +364,47 @@ 
 		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1950);	// we use same year but fiscal month after
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1951);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1951);	// we use different discal year but same year
+		$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
@@ -416,47 +416,47 @@ 
 		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1960);	// we use same year but fiscal month after
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1961);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1961);	// we use different discal year but same year
+		$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
@@ -468,47 +468,47 @@ 
 		$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
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1970);	// we use same year but fiscal month after
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 1, 1, 1971);	// we use same fiscal year but different year
+		$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->initAsSpecimen();
 		$localobject->fetch_thirdparty();
 
-		$localobject->date = dol_mktime(12, 0, 0, 12, 1, 1971);	// we use different fiscal year but same year
+		$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;
@@ -519,49 +519,49 @@ 
 		$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
+		$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->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
+		$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->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
+		$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->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
+		$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;
@@ -576,13 +576,13 @@ 
 		$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
+		$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;
@@ -596,7 +596,7 @@ 
 	 */
 	public function testShipmentSafor()
 	{
-		global $conf,$user,$langs,$db,$mysoc;
+		global $conf, $user, $langs, $db, $mysoc;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -609,11 +609,11 @@ 
 		$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}
+		$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
 	}
 }

htdocs/comm/action/card.php

Spacing +35 added lines, -35 removed lines

@@ -80,7 +80,7 @@ 
 $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
 $remindertype = GETPOST('selectremindertype', 'aZ09');
 $modelmail = GETPOSTINT('actioncommsendmodel_mail');
-$complete = GETPOST('complete', 'alpha');	// 'na' must be allowed
+$complete = GETPOST('complete', 'alpha'); // 'na' must be allowed
 $private = GETPOST('private', 'alphanohtml');
 if ($complete == 'na' || $complete == -2) {
 	$complete = -1;
@@ -164,7 +164,7 @@ 
 		'label' => $langs->trans('BrowserPush'),
 		'disabled' => (getDolGlobalString('AGENDA_REMINDER_BROWSER') ? 0 : 1),
 		'type' => ActionCommReminder::TYPE_USER,
-		'data-html' => img_picto('', 'globe', 'class="pictofixedwidth"') . $langs->trans('BrowserPush'),
+		'data-html' => img_picto('', 'globe', 'class="pictofixedwidth"').$langs->trans('BrowserPush'),
 	];
 }
 if (getDolGlobalString('AGENDA_REMINDER_EMAIL')) {
@@ -172,7 +172,7 @@ 
 		'label' => $langs->trans('EMail'),
 		'disabled' => (getDolGlobalString('AGENDA_REMINDER_EMAIL') ? 0 : 1),
 		'type' => ActionCommReminder::TYPE_USER,
-		'data-html' => img_picto('', 'email', 'class="pictofixedwidth"') . $langs->trans('EMail'),
+		'data-html' => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans('EMail'),
 	];
 }
 if (getDolGlobalString('AGENDA_REMINDER_SMS')) {
@@ -181,7 +181,7 @@ 
 		'label' => $langs->trans('Sms'),
 		'disabled' => (getDolGlobalString('MAIN_SMS_SENDMODE') ? 0 : 1),
 		'type' => ActionCommReminder::TYPE_USER,
-		'data-html' => img_picto('', 'phoning_mobile', 'class="pictofixedwidth"') . $langs->trans('Sms'),
+		'data-html' => img_picto('', 'phoning_mobile', 'class="pictofixedwidth"').$langs->trans('Sms'),
 	];
 }
 $TDurationTypes = $form->getDurationTypes($langs);
@@ -593,7 +593,7 @@ 
 				if (is_array($listofresourceid) && count($listofresourceid)) {
 					foreach ($listofresourceid as $resource_id => $val) {
 						$resource_type = 'dolresource';
-						$busy = 1;//GETPOSTINT('busy');
+						$busy = 1; //GETPOSTINT('busy');
 
 						// Resources association
 						if (getDolGlobalString('RESOURCE_USED_IN_EVENT_CHECK')) {
@@ -609,24 +609,24 @@ 
 							}
 
 							$sql = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-							$sql .= " FROM " . MAIN_DB_PREFIX . "element_resources as er";
-							$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = '" . $db->escape($resource_type) . "'";
-							$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($object->element) . "'";
-							$sql .= " WHERE er.resource_id = " . ((int) $resource_id);
+							$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+							$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($resource_type)."'";
+							$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
+							$sql .= " WHERE er.resource_id = ".((int) $resource_id);
 							$sql .= " AND er.busy = 1";
 							$sql .= " AND (";
 
 							// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-							$sql .= " (ac.datep <= '" . $db->idate($eventDateStart) . "' AND (ac.datep2 IS NULL OR ac.datep2 >= '" . $db->idate($eventDateStart) . "'))";
+							$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
 							// event date end between ac.datep and ac.datep2
 							if (!empty($eventDateEnd)) {
-								$sql .= " OR (ac.datep <= '" . $db->idate($eventDateEnd) . "' AND (ac.datep2 >= '" . $db->idate($eventDateEnd) . "'))";
+								$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
 							}
 							// event date start before ac.datep and event date end after ac.datep2
 							$sql .= " OR (";
-							$sql .= "ac.datep >= '" . $db->idate($eventDateStart) . "'";
+							$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
 							if (!empty($eventDateEnd)) {
-								$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '" . $db->idate($eventDateEnd) . "')";
+								$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
 							}
 							$sql .= ")";
 
@@ -640,9 +640,9 @@ 
 								if ($db->num_rows($resql) > 0) {
 									// Resource already in use
 									$error++;
-									$object->error = $langs->trans('ErrorResourcesAlreadyInUse') . ' : ';
+									$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
 									while ($obj = $db->fetch_object($resql)) {
-										$object->error .= '<br> - ' . $langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label . ' [' . $obj->ac_id . ']');
+										$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
 									}
 									$object->errors[] = $object->error;
 
@@ -746,21 +746,21 @@ 
 			if ($selectedrecurrulefreq == 'WEEKLY' && !empty($selectedrecurrulebyday)) {
 				$firstdatearray = dol_get_first_day_week(GETPOSTINT("apday"), GETPOSTINT("apmonth"), GETPOSTINT("apyear"));
 				$datep = dol_mktime($fulldayevent ? 0 : GETPOSTINT("aphour"), $fulldayevent ? 0 : GETPOSTINT("apmin"), $fulldayevent ? 0 : GETPOSTINT("apsec"), $firstdatearray['month'], $firstdatearray['first_day'], $firstdatearray['year'], $tzforfullday ? $tzforfullday : 'tzuserrel');
-				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd');//We begin the week after
+				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd'); //We begin the week after
 				$dayoffset = 7;
 				$monthoffset = 0;
 				$yearoffset = 0;
 			} elseif ($selectedrecurrulefreq == 'MONTHLY' && !empty($selectedrecurrulebymonthday)) {
 				$firstday = $selectedrecurrulebymonthday;
-				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth");//We begin the month after
+				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth"); //We begin the month after
 				$datep = dol_mktime($fulldayevent ? 0 : GETPOSTINT("aphour"), $fulldayevent ? 0 : GETPOSTINT("apmin"), $fulldayevent ? 0 : GETPOSTINT("apsec"), $firstmonth, $firstday, GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
-				$datep = dol_time_plus_duree($datep, 1, 'm');//We begin the month after
+				$datep = dol_time_plus_duree($datep, 1, 'm'); //We begin the month after
 				$dayoffset = 0;
 				$monthoffset = 1;
 				$yearoffset = 0;
 			} elseif ($selectedrecurrulefreq == 'YEARLY' && !empty($selectedrecurrulebyyearmonthday)) {
 				$datep = dol_mktime($fulldayevent ? 0 : GETPOSTINT("aphour"), $fulldayevent ? 0 : GETPOSTINT("apmin"), $fulldayevent ? 0 : GETPOSTINT("apsec"), GETPOSTINT("apmonth"), GETPOSTINT("apday"), GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
-				$datep = dol_time_plus_duree($datep, 1, 'y');//We begin the year after
+				$datep = dol_time_plus_duree($datep, 1, 'y'); //We begin the year after
 				$dayoffset = 0;
 				$monthoffset = 0;
 				$yearoffset = 1;
@@ -857,11 +857,11 @@ 
 
 				// increment date for recurrent events
 				$datep = dol_time_plus_duree($datep, $dayoffset, 'd');
-				$datep = dol_time_plus_duree($datep, $monthoffset, 'm');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
-				$datep = dol_time_plus_duree($datep, $yearoffset, 'y');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datep = dol_time_plus_duree($datep, $monthoffset, 'm'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datep = dol_time_plus_duree($datep, $yearoffset, 'y'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
 				$datef = dol_time_plus_duree($datef, $dayoffset, 'd');
-				$datef = dol_time_plus_duree($datef, $monthoffset, 'm');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
-				$datef = dol_time_plus_duree($datef, $yearoffset, 'y');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datef = dol_time_plus_duree($datef, $monthoffset, 'm'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datef = dol_time_plus_duree($datef, $yearoffset, 'y'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
 			}
 		}
 
@@ -910,7 +910,7 @@ 
 		$object->fetch($id);
 		$object->fetch_optionals();
 		$object->fetch_userassigned();
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		// Clean parameters
 		if ($fulldayevent) {
@@ -1210,7 +1210,7 @@ 
 	$object->fetch($id);
 	$object->fetch_optionals();
 	$object->fetch_userassigned();
-	$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+	$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 	if ($user->hasRight('agenda', 'myactions', 'delete')
 		|| $user->hasRight('agenda', 'allactions', 'delete')) {
@@ -1232,7 +1232,7 @@ 
 if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate' && $usercancreate) {
 	$error = 0;
 
-	$shour = (int) dol_print_date($object->datep, "%H", 'tzuserrel');		// We take the date visible by user $newdate is also date visible by user.
+	$shour = (int) dol_print_date($object->datep, "%H", 'tzuserrel'); // We take the date visible by user $newdate is also date visible by user.
 	$smin = (int) dol_print_date($object->datep, "%M", 'tzuserrel');
 
 	$newdate = GETPOST('newdate', 'alpha');
@@ -1407,7 +1407,7 @@ 
 								if (new_startdate > old_enddate) {
 									var timeDiff = old_enddate - old_startdate;
 									var new_enddate = new Date(new_startdate.getTime() + timeDiff);
-									$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput') . '"));
+									$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput').'"));
 									$("#p2day").val(new_enddate.getDate());
 									$("#p2month").val(new_enddate.getMonth() + 1);
 									$("#p2year").val(new_enddate.getFullYear());
@@ -1479,7 +1479,7 @@ 
 		$default = getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT', 'AC_RDV');
 		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
 		$selectedvalue = GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default);
-		print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1);	// TODO Replace 0 with -2 in onlyautoornot
+		print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot
 		print '</td></tr>';
 	}
 
@@ -1574,7 +1574,7 @@ 
 		*/
 
 		// limit date
-		$repeateventlimitdate = empty($repeateventlimitdate) ?  (dol_now() + ((24 * 3600 * 365) + 1)) : $repeateventlimitdate;
+		$repeateventlimitdate = empty($repeateventlimitdate) ? (dol_now() + ((24 * 3600 * 365) + 1)) : $repeateventlimitdate;
 
 		print '<div class="hidden marginrightonly inline-block repeateventlimitdate">';
 		print $langs->trans("Until")." ";
@@ -1858,7 +1858,7 @@ 
 		}
 		//var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject);
 
-		if (! in_array($origin, array('societe', 'project', 'project_task', 'user'))) {
+		if (!in_array($origin, array('societe', 'project', 'project_task', 'user'))) {
 			// We do not use link for object that already contains a hard coded field to make links with agenda events
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
 			print '<td colspan="3">';
@@ -1948,7 +1948,7 @@ 
 						$("#addreminder").prop("checked", true);
 
 						// Set period with default reminder period
-						$("[name=\"offsetvalue\"]").val(\'' . dol_escape_js((string) $reminderDefaultOffset) . '\');
+						$("[name=\"offsetvalue\"]").val(\'' . dol_escape_js((string) $reminderDefaultOffset).'\');
 						$("#select_offsetunittype_duration").select2("destroy");
 						$("#select_offsetunittype_duration").val(\''.dol_escape_js($reminderDefaultUnit).'\');
 						$("#select_offsetunittype_duration").select2();
@@ -2106,7 +2106,7 @@ 
 									if (new_startdate > old_enddate) {
 										var timeDiff = old_enddate - old_startdate;
 										var new_enddate = new Date(new_startdate.getTime() + timeDiff);
-										$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput') . '"));
+										$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput').'"));
 										$("#p2day").val(new_enddate.getDate());
 										$("#p2month").val(new_enddate.getMonth() + 1);
 										$("#p2year").val(new_enddate.getFullYear());
@@ -2131,7 +2131,7 @@ 
 		if ($backtopage) {
 			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : '').'">';
 		}
-		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && ! preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
+		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && !preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
 			print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
 		}
 
@@ -2580,7 +2580,7 @@ 
 					});
 			   })';
 			print '</script>'."\n";
-			print '</div>';		// End of div for reminderparameters
+			print '</div>'; // End of div for reminderparameters
 		}
 
 		print dol_get_fiche_end();
@@ -2861,7 +2861,7 @@ 
 
 		// Priority
 		if (getDolGlobalString('AGENDA_SUPPORT_PRIORITY_IN_EVENTS')) {
-			print '<tr><td class="nowrap" class="titlefield">' . $langs->trans("Priority") . '</td><td>';
+			print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td>';
 			print($object->priority ? $object->priority : '');
 			print '</td></tr>';
 		}