Dolibarr / dolibarr

test/phpunit/DateLibTest.php

Spacing +48 added lines, -48 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';
@@ -60,7 +60,7 @@ 
 	 */
 	public function testNumBetweenDay()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -118,7 +118,7 @@ 
 	 */
 	public function testNumPublicHoliday()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -131,16 +131,16 @@ 
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for FR result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 closed days (country france)
+		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 closed days (country france)
 
 		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." for Tuesday 1 - Wednesday 2 jan 2013 for XX result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 closed days (country unknown)
+		$this->assertEquals(1, $result, 'NumPublicHoliday for Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 closed days (country unknown)
 
 		print '----'."\n";
 		$result = num_public_holiday($date2, $date3, 'FR', 1);
 		print __METHOD__." for Wednesday 2 - Thursday 3 jan 2013 for FR result=".$result."\n";
-		$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR');   // no closed days
+		$this->assertEquals(0, $result, 'NumPublicHoliday for Wednesday 2 - Thursday 3 jan 2013 for FR'); // no closed days
 
 		// Check with easter monday
 		$date1 = dol_mktime(0, 0, 0, 4, 21, 2019, 'gmt');
@@ -148,11 +148,11 @@ 
 
 		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX');   // 2 opened day, 1 closed days (sunday)
+		$this->assertEquals(1, $result, 'NumPublicHoliday including eastermonday for XX'); // 2 opened day, 1 closed days (sunday)
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR');   // 1 opened day, 2 closed days (sunday + easter monday)
+		$this->assertEquals(2, $result, 'NumPublicHoliday including eastermonday for FR'); // 1 opened day, 2 closed days (sunday + easter monday)
 
 		// Check for sunday/saturday - Friday 4 - Sunday 6 jan 2013
 		$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');
@@ -160,23 +160,23 @@ 
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+		$this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1, 1, 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for FR');   // 1 opened day, 2 closed days
+		$this->assertEquals(2, $result, 'NumPublicHoliday for FR'); // 1 opened day, 2 closed days
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1, 1, 0);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumPublicHoliday for FR');   // 2 opened day, 1 closed days
+		$this->assertEquals(1, $result, 'NumPublicHoliday for FR'); // 2 opened day, 1 closed days
 
 		$result = num_public_holiday($date1, $date2, 'FR', 1, 0, 0);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(0, $result, 'NumPublicHoliday for FR');   // 3 opened day, 0 closed days
+		$this->assertEquals(0, $result, 'NumPublicHoliday for FR'); // 3 opened day, 0 closed days
 
 		$result = num_public_holiday($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumPublicHoliday for XX');   // 1 opened day, 2 closed days (even if country unknown)
+		$this->assertEquals(2, $result, 'NumPublicHoliday for XX'); // 1 opened day, 2 closed days (even if country unknown)
 	}
 
 	/**
@@ -186,57 +186,57 @@ 
 	 */
 	public function testNumOpenDay()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
 		// With same hours - Tuesday/Wednesday jan 2013
-		$date1 = dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt');	// tuesday
-		$date2 = dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt');	// wednesday
-		$date3 = dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt');	// thursday
+		$date1 = dol_mktime(0, 0, 0, 1, 1, 2013, 'gmt'); // tuesday
+		$date2 = dol_mktime(0, 0, 0, 1, 2, 2013, 'gmt'); // wednesday
+		$date3 = dol_mktime(0, 0, 0, 1, 3, 2013, 'gmt'); // thursday
 
 		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR');   // 1 opened days (country france)
+		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for FR'); // 1 opened days (country france)
 
 		$result = num_open_day($date1, $date2, 0, 1, 0, 'XX');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX');   // 1 opened days (country unknown)
+		$this->assertEquals(1, $result, 'NumOpenDay Tuesday 1 - Wednesday 2 jan 2013 for XX'); // 1 opened days (country unknown)
 
 		$result = num_open_day($date2, $date3, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR');   // 2 opened days
+		$this->assertEquals(2, $result, 'NumOpenDay Wednesday 2 - Thursday 3 jan 2013 for FR'); // 2 opened days
 
 		// With same hours - Friday/Sunday jan 2013
-		$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');	// friday
-		$date2 = dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt');	// sunday
+		$date1 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt'); // friday
+		$date2 = dol_mktime(0, 0, 0, 1, 6, 2013, 'gmt'); // sunday
 
 		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay for FR');   // 1 opened day, 2 closed
+		$this->assertEquals(1, $result, 'NumOpenDay for FR'); // 1 opened day, 2 closed
 
 		$result = num_open_day($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(1, $result, 'NumOpenDay for XX');   // 1 opened day, 2 closes (even if country unknown)
+		$this->assertEquals(1, $result, 'NumOpenDay for XX'); // 1 opened day, 2 closes (even if country unknown)
 
 		// Test option MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY and MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY
 		$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 0;
 		$result = num_open_day($date1, $date2, 0, 1, 0, 'FR');
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(2, $result, 'NumOpenDay for FR when saturday is a working day');   //2 opened day, 1 closed
+		$this->assertEquals(2, $result, 'NumOpenDay for FR when saturday is a working day'); //2 opened day, 1 closed
 
 		$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 0;
 		$result = num_open_day($date1, $date2, 'XX', 1);
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals(3, $result, 'NumOpenDay for XX when saturday + sunday are working days');   // 3 opened day, 0 closes (even if country unknown)
+		$this->assertEquals(3, $result, 'NumOpenDay for XX when saturday + sunday are working days'); // 3 opened day, 0 closes (even if country unknown)
 
 		// Define specific dates for these tests
-		$date_friday_4 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt');   // Friday
+		$date_friday_4 = dol_mktime(0, 0, 0, 1, 4, 2013, 'gmt'); // Friday
 		$date_saturday_5 = dol_mktime(0, 0, 0, 1, 5, 2013, 'gmt'); // Saturday
-		$date_monday_7 = dol_mktime(0, 0, 0, 1, 7, 2013, 'gmt');   // Monday
-		$date_friday_11 = dol_mktime(0, 0, 0, 1, 11, 2013, 'gmt');  // Following Friday
+		$date_monday_7 = dol_mktime(0, 0, 0, 1, 7, 2013, 'gmt'); // Monday
+		$date_friday_11 = dol_mktime(0, 0, 0, 1, 11, 2013, 'gmt'); // Following Friday
 
 		// Case 1: Weekend Boundary (Friday morning -> Saturday morning)
 		// Expected: 1 day. No half-day deduction for end date on a non-working day.
@@ -276,7 +276,7 @@ 
 	 */
 	public function testConvertTime2Seconds()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -296,7 +296,7 @@ 
 	 */
 	public function testConvertSecondToTime()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -320,14 +320,14 @@ 
 	 */
 	public function testDolPrintDate()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result = dol_print_date('1970-01-01', '%Y-%m-%d %H:%M:%S', true);	// A case for compatibility check
+		$result = dol_print_date('1970-01-01', '%Y-%m-%d %H:%M:%S', true); // A case for compatibility check
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1970-01-01 00:00:00', $result);
 
@@ -343,22 +343,22 @@ 
 		$this->assertEquals('1970-01-01T00:00:00Z', $result);
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result = dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('2500-01-01 00:00:00', $result);
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result = dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-1830384000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('1912-01-01 00:00:00', $result);	// dol_print_date use TZ (good) but epoch converter does not use it.
+		$this->assertEquals('1912-01-01 00:00:00', $result); // dol_print_date use TZ (good) but epoch converter does not use it.
 
 		// Check %Y-%m-%d %H:%M:%S format
-		$result = dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-11676096000, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1600-01-01 00:00:00', $result);
 
 		// test with negative timezone
-		$result = dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
+		$result = dol_print_date(-1, '%Y-%m-%d %H:%M:%S', true); // http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1969-12-31 23:59:59', $result);
 
@@ -411,7 +411,7 @@ 
 	 */
 	public function testDolTimePlusDuree()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -436,7 +436,7 @@ 
 	 */
 	public function testDolStringToTime()
 	{
-		global $conf,$user,$langs,$db;
+		global $conf, $user, $langs, $db;
 		$conf = $this->savconf;
 		$user = $this->savuser;
 		$langs = $this->savlangs;
@@ -482,16 +482,16 @@ 
 		$day = 3;
 		$month = 2;
 		$year = 2015;
-		$conf->global->MAIN_START_WEEK = 1;	// start on monday
+		$conf->global->MAIN_START_WEEK = 1; // start on monday
 		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(2, (int) $prev['first_day']);		// monday for month 2, year 2014 is the 2
+		$this->assertEquals(2, (int) $prev['first_day']); // monday for month 2, year 2014 is the 2
 
 		$day = 3;
 		$month = 2;
 		$year = 2015;
-		$conf->global->MAIN_START_WEEK = 0;	// start on sunday
+		$conf->global->MAIN_START_WEEK = 0; // start on sunday
 		$prev = dol_get_first_day_week($day, $month, $year);
-		$this->assertEquals(1, (int) $prev['first_day']);		// sunday for month 2, year 2015 is the 1st
+		$this->assertEquals(1, (int) $prev['first_day']); // sunday for month 2, year 2015 is the 1st
 
 		return 1;
 	}
@@ -506,15 +506,15 @@ 
 	{
 		global $conf;
 
-		$now = 1800 + (24 * 3600 * 10);	// The 11th of january 1970 at 0:30 in UTC
+		$now = 1800 + (24 * 3600 * 10); // The 11th of january 1970 at 0:30 in UTC
 		$result = dol_get_first_hour($now, 'gmt');
 		print __METHOD__." now = ".$now.", dol_print_date(now, 'dayhourrfc', 'gmt') = ".dol_print_date($now, 'dayhourrfc', 'gmt').", result = ".$result.", dol_print_date(result, 'dayhourrfc', 'gmt') = ".dol_print_date($result, 'dayhourrfc', 'gmt')."\n";
-		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt'));		// monday for month 2, year 2014 is the 2
+		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt')); // monday for month 2, year 2014 is the 2
 
-		$now = 23.5 * 3600 + (24 * 3600 * 10);	// The 11th of january 1970 at 23:30 in UTC
+		$now = 23.5 * 3600 + (24 * 3600 * 10); // The 11th of january 1970 at 23:30 in UTC
 		$result = dol_get_first_hour($now, 'gmt');
 		print __METHOD__." now = ".$now.", dol_print_date(now, 'dayhourrfc', 'gmt') = ".dol_print_date($now, 'dayhourrfc', 'gmt').", result = ".$result.", dol_print_date(result, 'dayhourrfc', 'gmt') = ".dol_print_date($result, 'dayhourrfc', 'gmt')."\n";
-		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt'));		// monday for month 2, year 2014 is the 2
+		$this->assertEquals('1970-01-11T00:00:00Z', dol_print_date($result, 'dayhourrfc', 'gmt')); // monday for month 2, year 2014 is the 2
 
 		return 1;
 	}

htdocs/admin/tools/ui/class/documentation.class.php

Spacing +3 added lines, -3 removed lines

@@ -283,7 +283,7 @@ 
 
 		$arrayofcss[] = 'admin/tools/ui/css/documentation.css';
 
-		top_htmlhead('',  $title, 0, 0, $arrayofjs, $arrayofcss);
+		top_htmlhead('', $title, 0, 0, $arrayofjs, $arrayofcss);
 
 		print '<body class="dolibarr-doc'.($hidenavmenu ? "-bis" : "").'">';
 	}
@@ -490,7 +490,7 @@ 
 	 */
 	public function showCode($lines = array(), $option = 'html')
 	{
-		require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		print '<div class="documentation-code">';
 
 		if (isset($lines[0])) {
@@ -499,7 +499,7 @@ 
 			}
 		}
 
-		$content = implode("\n", $lines) . "\n";
+		$content = implode("\n", $lines)."\n";
 		$doleditor = new DolEditor(md5($content), $content, '', 0, 'Basic', 'In', true, false, 'ace', 0, '99%', 1);
 		print $doleditor->Create(1, '', false, '', $option);
 		print '</div>';

htdocs/bom/lib/bom.lib.php

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$nbExtrafields = (isset($extrafields->attributes['bom_bom']['label']) && is_countable($extrafields->attributes['bom_bom']['label'])) ? count($extrafields->attributes['bom_bom']['label']) : 0;
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'bom_extrafields';
 	$h++;
@@ -60,7 +60,7 @@ 
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
 	$nbExtrafields = (isset($extrafields->attributes['bom_bomline']['label']) && is_countable($extrafields->attributes['bom_bomline']['label'])) ? count($extrafields->attributes['bom_bomline']['label']) : 0;
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'bomline_extrafields';
 	$h++;
@@ -127,7 +127,7 @@ 
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = getMultidirOutput($object) . "/".dol_sanitizeFileName($object->ref);
+	$upload_dir = getMultidirOutput($object)."/".dol_sanitizeFileName($object->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
 	$head[$h][0] = DOL_URL_ROOT.'/bom/bom_document.php?id='.$object->id;

htdocs/bom/bom_net_needs.php

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 $hookmanager->initHooks(array('bomnetneeds')); // Note that conf->hooks_modules contains array
 
 // Massaction
-$diroutputmassaction = getMultidirOutput($object) . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = getMultidirOutput($object).'/temp/massgeneration/'.$user->id;
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -242,7 +242,7 @@ 
 	print "<thead>\n";
 	print '<tr class="liste_titre nodrag nodrop">';
 	print '<td class="linecoldescription">'.$langs->trans('Product');
-	if (getDolGlobalString('BOM_SUB_BOM')  && $action == 'treeview') {
+	if (getDolGlobalString('BOM_SUB_BOM') && $action == 'treeview') {
 		print ' &nbsp; <a id="show_all" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').$langs->trans("ExpandAll").'</a>&nbsp;&nbsp;';
 		print '<a id="hide_all" href="#">'.img_picto('', 'folder', 'class="paddingright"').$langs->trans("UndoExpandAll").'</a>&nbsp;';
 	}
@@ -251,7 +251,7 @@ 
 		print '<td class="left">'.$langs->trans('ProducedBy').'</td>';
 	}
 	print '<td class="linecolqty right">'.$langs->trans('Quantity').'</td>';
-	print '<td></td>';	// For unit
+	print '<td></td>'; // For unit
 	print '<td class="linecolstock right">'.$form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1).'</td>';
 	print '<td class="linecoltheoricalstock right">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>';
 	print  '</tr>';

htdocs/bom/class/bom.class.php

Spacing +7 added lines, -7 removed lines

@@ -452,7 +452,7 @@ 
 		$sql .= " FROM ".$this->db->prefix().$objectline->table_element." as l";
 		$sql .= " LEFT JOIN ".$this->db->prefix()."product as p ON p.rowid = l.fk_product";
 		$sql .= " WHERE l.fk_".$this->db->escape($this->element)." = ".((int) $this->id);
-		$sql .= " AND p.fk_product_type = ". ((int) $typeproduct);
+		$sql .= " AND p.fk_product_type = ".((int) $typeproduct);
 		if (isset($objectline->fields['position'])) {
 			$sql .= $this->db->order('position', 'ASC');
 		}
@@ -870,7 +870,7 @@ 
 		if (getDolGlobalString('BOM_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('BOM_ADDON') . ".php";
+			$file = getDolGlobalString('BOM_ADDON').".php";
 			$classname = getDolGlobalString('BOM_ADDON');
 
 			// Include file with class
@@ -987,15 +987,15 @@ 
 				// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
 				$oldref = dol_sanitizeFileName($this->ref);
 				$newref = dol_sanitizeFileName($num);
-				$dirsource = getMultidirOutput($this) . '/'.$oldref;
-				$dirdest = getMultidirOutput($this) . '/'.$newref;
+				$dirsource = getMultidirOutput($this).'/'.$oldref;
+				$dirdest = getMultidirOutput($this).'/'.$newref;
 				if (!$error && file_exists($dirsource)) {
 					dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
 
 					if (@rename($dirsource, $dirdest)) {
 						dol_syslog("Rename ok");
 						// Rename docs starting with $oldref with $newref
-						$listoffiles = dol_dir_list(getMultidirOutput($this) . '/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						$listoffiles = dol_dir_list(getMultidirOutput($this).'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
 						foreach ($listoffiles as $fileentry) {
 							$dirsource = $fileentry['name'];
 							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
@@ -1434,7 +1434,7 @@ 
 			foreach ($this->lines as &$line) {
 				$tmpproduct->cost_price = 0;
 				$tmpproduct->pmp = 0;
-				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1);	// We discard selling price and language loading
+				$result = $tmpproduct->fetch($line->fk_product, '', '', '', 0, 1, 1); // We discard selling price and language loading
 
 				if ($tmpproduct->type == $tmpproduct::TYPE_PRODUCT) {
 					if (empty($line->fk_bom_child)) {
@@ -1655,7 +1655,7 @@ 
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
-		global $db,$langs;
+		global $db, $langs;
 
 		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
 

htdocs/bom/bom_list.php

Spacing +6 added lines, -6 removed lines

@@ -52,9 +52,9 @@ 
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bomlist'; // To manage different context of search
 $backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-$mode        = GETPOST('mode', 'aZ');  // mode view (kanban or common)
+$mode        = GETPOST('mode', 'aZ'); // mode view (kanban or common)
 
-$id         = GETPOSTINT('id');
+$id = GETPOSTINT('id');
 
 // Load variable for pagination
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
@@ -74,7 +74,7 @@ 
 // Initialize a technical objects
 $object = new BOM($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = getMultidirOutput($object) . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = getMultidirOutput($object).'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('bomlist')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
@@ -84,7 +84,7 @@ 
 
 // Default sort order (if not yet defined by previous GETPOST)
 if (!$sortfield) {
-	reset($object->fields);					// Reset is required to avoid key() to return null.
+	reset($object->fields); // Reset is required to avoid key() to return null.
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
@@ -551,7 +551,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -646,7 +646,7 @@ 
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		if ($key == "fk_product") {
 			print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 'p.ref', '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";

htdocs/bom/bom_agenda.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 // Initialize a technical objects
 $object = new BOM($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = getMultidirOutput($object) . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = getMultidirOutput($object).'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('bomagenda', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels

htdocs/bom/bom_card.php

Spacing +14 added lines, -14 removed lines

@@ -64,7 +64,7 @@ 
 // Initialize a technical objects
 $object = new BOM($db);
 $extrafields = new ExtraFields($db);
-$diroutputmassaction = getMultidirOutput($object) . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = getMultidirOutput($object).'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('bomcard', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Fetch optionals attributes and labels
@@ -287,7 +287,7 @@ 
 			$bomline->fetch($lineid);
 
 			$fk_default_workstation = $bomline->fk_default_workstation;
-			if (isModEnabled('workstation') &&  GETPOSTISSET('idworkstations')) {
+			if (isModEnabled('workstation') && GETPOSTISSET('idworkstations')) {
 				$fk_default_workstation = GETPOSTINT('idworkstations');
 			}
 
@@ -607,17 +607,17 @@ 
 	if (!empty($object->table_element_line)) {
 		// Products
 
-		$res = $object->fetchLinesbytypeproduct(0);		// Load all lines products into ->lines
+		$res = $object->fetchLinesbytypeproduct(0); // Load all lines products into ->lines
 		$object->calculateCosts();
 
 		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMProductsList'), '', 'product');
 
-		print '	<form name="addproduct" id="listbomproducts" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">
-    	<input type="hidden" name="token" value="' . newToken() . '">
-    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+		print '	<form name="addproduct" id="listbomproducts" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">
+    	<input type="hidden" name="token" value="' . newToken().'">
+    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
 		<input type="hidden" name="page_y" value="">
-    	<input type="hidden" name="id" value="' . $object->id . '">
+    	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
 		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
@@ -661,21 +661,21 @@ 
 		// Services
 
 		$filtertype = 1;
-		$res = $object->fetchLinesbytypeproduct($filtertype);		// Load all lines services into ->lines
+		$res = $object->fetchLinesbytypeproduct($filtertype); // Load all lines services into ->lines
 		$object->calculateCosts();
 
 		print ($res == 0 && $object->status >= $object::STATUS_VALIDATED) ? '' : load_fiche_titre($langs->trans('BOMServicesList'), '', 'service');
 
-		print '	<form name="addservice" id="listbomservices" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST">
-    	<input type="hidden" name="token" value="' . newToken() . '">
-    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+		print '	<form name="addservice" id="listbomservices" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">
+    	<input type="hidden" name="token" value="' . newToken().'">
+    	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
-		<input type="hidden" name="page_y" value="">    		<input type="hidden" name="id" value="' . $object->id . '">
+		<input type="hidden" name="page_y" value="">    		<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
 		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
 			$tagidfortablednd = 'tablelinesservice';
-			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
 		print '<div class="div-table-responsive-no-min">';
@@ -811,7 +811,7 @@ 
 		// Documents
 		$objref = dol_sanitizeFileName($object->ref);
 		$relativepath = $objref.'/'.$objref.'.pdf';
-		$filedir = getMultidirOutput($object) . '/'.$objref;
+		$filedir = getMultidirOutput($object).'/'.$objref;
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = $user->hasRight('bom', 'read'); // If you can read, you can build the PDF to read content
 		$delallowed = $user->hasRight('bom', 'write'); // If you can create/edit, you can remove a file on card

htdocs/bom/bom_note.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 $hookmanager->initHooks(array('bomnote', 'globalcard')); // Note that conf->hooks_modules contains array
 
 // Massactions
-$diroutputmassaction = getMultidirOutput($object) . '/temp/massgeneration/'.$user->id;
+$diroutputmassaction = getMultidirOutput($object).'/temp/massgeneration/'.$user->id;
 
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);