Dolibarr / dolibarr

htdocs/public/test/test_exec.php

Spacing +4 added lines, -4 removed lines

@@ -66,13 +66,13 @@
 
 print "*** TEST READ OF /tmp/test.txt FILE<br>\n";
 
-$out='';
-$ret=0;
+$out = '';
+$ret = 0;
 
 $file = '/tmp/test.txt';
-$f=fopen($file, 'r');
+$f = fopen($file, 'r');
 if ($f) {
-	$s=fread($f, 4096);
+	$s = fread($f, 4096);
 	print $s;
 	fclose($f);
 } else {

htdocs/admin/agenda_other.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');

htdocs/core/lib/tax.lib.php

Spacing +3 added lines, -3 removed lines

@@ -801,7 +801,7 @@ 
 			while ($assoc = $db->fetch_array($resql)) {
 				$rate_key = $assoc['rate'];
 				if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
-					$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
+					$rate_key .= ' ('.$assoc['vat_src_code'].')';
 				}
 
 				// Code to avoid warnings when array entry not defined
@@ -986,7 +986,7 @@ 
 			while ($assoc = $db->fetch_array($resql)) {
 				$rate_key = $assoc['rate'];
 				if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
-					$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
+					$rate_key .= ' ('.$assoc['vat_src_code'].')';
 				}
 
 				// Code to avoid warnings when array entry not defined
@@ -1113,7 +1113,7 @@ 
 				while ($assoc = $db->fetch_array($resql)) {
 					$rate_key = $assoc['rate'];
 					if ($f_rate == 'tva_tx' && !empty($assoc['vat_src_code']) && !preg_match('/\(/', $rate_key)) {
-						$rate_key .= ' (' . $assoc['vat_src_code'] . ')';
+						$rate_key .= ' ('.$assoc['vat_src_code'].')';
 					}
 
 					// Code to avoid warnings when array entry not defined

htdocs/compta/tva/quadri_detail.php

Spacing +25 added lines, -25 removed lines

@@ -406,13 +406,13 @@ 
 		if (is_array($x_both[$rate]['coll']['detail'])) {
 			// VAT Rate
 			print "<tr>";
-			print '<td class="tax_rate" colspan="' . ($span+1) . '">';
-			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
+			print '<td class="tax_rate" colspan="'.($span + 1).'">';
+			print $langs->trans('Rate').' : '.vatrate($rate).'%';
 			print ' - <a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?invoice_type=customer';
 			if ($invoice_type != 'customer' || !GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
 				print '&amp;vat_rate_show='.urlencode($rate);
 			}
-			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
+			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">'.img_picto('', 'chevron-down', 'class="paddingrightonly"').$langs->trans('VATReportShowByRateDetails').'</a>';
 			print '</td>';
 			print '</tr>'."\n";
 
@@ -430,22 +430,22 @@ 
 				}
 
 				// Payment
-				$ratiopaymentinvoice=1;
+				$ratiopaymentinvoice = 1;
 				if ($modetax != 1) {
 					if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
 						|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
 					} else {
 						if (isset($fields['payment_amount']) && price2num($fields['ftotal_ttc'])) {
-							$ratiopaymentinvoice=($fields['payment_amount']/$fields['ftotal_ttc']);
+							$ratiopaymentinvoice = ($fields['payment_amount'] / $fields['ftotal_ttc']);
 						}
 					}
 				}
 
 				// Total collected
-				$temp_ht=$fields['totalht']*$ratiopaymentinvoice;
+				$temp_ht = $fields['totalht'] * $ratiopaymentinvoice;
 
 				// VAT
-				$temp_vat=$fields['vat']*$ratiopaymentinvoice;
+				$temp_vat = $fields['vat'] * $ratiopaymentinvoice;
 
 				$subtot_coll_total_ht += $temp_ht;
 				$subtot_coll_vat      += $temp_vat;
@@ -485,13 +485,13 @@ 
 					print '<tr class="oddeven">';
 
 					// Ref
-					print '<td class="nowrap left">' . $fields['link'] . '</td>';
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
 					// Invoice date
-					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
 					// Payment date
-					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+					if ($conf->global->TAX_MODE_SELL_PRODUCT == 'payment' || $conf->global->TAX_MODE_SELL_SERVICE == 'payment') print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
 					else print '<td></td>';
 
 					// Company name
@@ -505,10 +505,10 @@ 
 					if ($fields['pid']) {
 						$product_static->id = $fields['pid'];
 						$product_static->ref = $fields['pref'];
-						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) {
-							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 						}
 					} else {
 						if ($type) {
@@ -525,7 +525,7 @@ 
 								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
 							}
 						}
-						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
 						// Show range
 						print_date_range($fields['ddate_start'], $fields['ddate_end']);
@@ -563,7 +563,7 @@ 
 							}
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
-								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 							}
 						}
 						print '</td>';
@@ -616,7 +616,7 @@ 
 	}
 
 	// Blank line
-	print '<tr><td colspan="'.($span+2).'">&nbsp;</td></tr>';
+	print '<tr><td colspan="'.($span + 2).'">&nbsp;</td></tr>';
 
 	// Print table headers for this quadri - expenses
 	print '<tr class="liste_titre liste_titre_topborder">';
@@ -640,13 +640,13 @@ 
 
 		if (is_array($x_both[$rate]['paye']['detail'])) {
 			print "<tr>";
-			print '<td class="tax_rate" colspan="' . ($span+1) . '">';
-			print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
+			print '<td class="tax_rate" colspan="'.($span + 1).'">';
+			print $langs->trans('Rate').' : '.vatrate($rate).'%';
 			print ' - <a href="'.DOL_URL_ROOT.'/compta/tva/quadri_detail.php?invoice_type=supplier';
 			if ($invoice_type != 'supplier' || !GETPOSTISSET('vat_rate_show') || GETPOST('vat_rate_show') != $rate) {
 				print '&amp;vat_rate_show='.urlencode($rate);
 			}
-			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . '</a>';
+			print '&amp;date_startyear='.urlencode($date_start_year).'&amp;date_startmonth='.urlencode($date_start_month).'&amp;date_startday='.urlencode($date_start_day).'&amp;date_endyear='.urlencode($date_end_year).'&amp;date_endmonth='.urlencode($date_end_month).'&amp;date_endday='.urlencode($date_end_day).'">'.img_picto('', 'chevron-down', 'class="paddingrightonly"').$langs->trans('VATReportShowByRateDetails').'</a>';
 			print '</td>';
 			print '</tr>'."\n";
 
@@ -717,14 +717,14 @@ 
 					print '<tr class="oddeven">';
 
 					// Ref
-					print '<td class="nowrap left">' . $fields['link'] . '</td>';
+					print '<td class="nowrap left">'.$fields['link'].'</td>';
 
 					// Invoice date
-					print '<td class="left">' . dol_print_date($fields['datef'], 'day') . '</td>';
+					print '<td class="left">'.dol_print_date($fields['datef'], 'day').'</td>';
 
 					// Payment date
 					if ($conf->global->TAX_MODE_BUY_PRODUCT == 'payment' || $conf->global->TAX_MODE_BUY_SERVICE == 'payment') {
-						print '<td class="left">' . dol_print_date($fields['datep'], 'day') . '</td>';
+						print '<td class="left">'.dol_print_date($fields['datep'], 'day').'</td>';
 					} else {
 						print '<td></td>';
 					}
@@ -740,10 +740,10 @@ 
 					if ($fields['pid']) {
 						$product_static->id = $fields['pid'];
 						$product_static->ref = $fields['pref'];
-						$product_static->type = $fields['dtype'];        // We force with the type of line to have type how line is registered
+						$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
 						print $product_static->getNomUrl(1);
 						if (dol_string_nohtmltag($fields['descr'])) {
-							print ' - ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+							print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 						}
 					} else {
 						if ($type) {
@@ -760,7 +760,7 @@ 
 								$fields['descr'] = $langs->transnoentitiesnoconv($reg[1]);
 							}
 						}
-						print $text . ' ' . dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
+						print $text.' '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
 
 						// Show range
 						print_date_range($fields['ddate_start'], $fields['ddate_end']);
@@ -798,7 +798,7 @@ 
 							}
 							print price(price2num($fields['payment_amount'], 'MT'));
 							if (isset($fields['payment_amount'])) {
-								print ' (' . round($ratiopaymentinvoice * 100, 2) . '%)';
+								print ' ('.round($ratiopaymentinvoice * 100, 2).'%)';
 							}
 						}
 						print '</td>';

htdocs/product/reassort.php

Spacing +5 added lines, -5 removed lines

@@ -159,10 +159,10 @@ 
 	}
 	$sql .= "(";
 	$sql .= " SELECT cp.fk_categorie, cp.fk_product";
-	$sql .= " FROM " . MAIN_DB_PREFIX . "categorie_product as cp";
+	$sql .= " FROM ".MAIN_DB_PREFIX."categorie_product as cp";
 	$sql .= " WHERE cp.fk_product = p.rowid"; // Join for the needed table to filter by categ
 	if ($search_categ > 0) {
-		$sql .= " AND cp.fk_categorie = " . ((int) $search_categ);
+		$sql .= " AND cp.fk_categorie = ".((int) $search_categ);
 	}
 	$sql .= ")";
 }
@@ -210,8 +210,8 @@ 
 }
 if ($search_stock_physique != '') {
 	//$natural_search_physique = natural_search('HAVING SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
-	$natural_search_physique = natural_search('SUM(' . $db->ifsql('s.reel IS NULL', '0', 's.reel') . ')', $search_stock_physique, 1, 1);
-	$natural_search_physique = " " . substr($natural_search_physique, 1, -1); // remove first "(" and last ")" characters
+	$natural_search_physique = natural_search('SUM('.$db->ifsql('s.reel IS NULL', '0', 's.reel').')', $search_stock_physique, 1, 1);
+	$natural_search_physique = " ".substr($natural_search_physique, 1, -1); // remove first "(" and last ")" characters
 	if (!empty($sql_having)) {
 		$sql_having .= " AND";
 	} else {
@@ -298,7 +298,7 @@ 
 		$param .= "&sbarcode=".urlencode($sbarcode);
 	}
 	if ($search_stock_physique) {
-		$param .= '&search_stock_physique=' . urlencode($search_stock_physique);
+		$param .= '&search_stock_physique='.urlencode($search_stock_physique);
 	}
 
 	llxHeader("", $texte, $helpurl);

htdocs/comm/mailing/cibles.php

Spacing +2 added lines, -2 removed lines

@@ -325,7 +325,7 @@ 
 		//print '<td class="liste_titre" align="center">&nbsp;</td>';
 		print '<div class="tagtd">&nbsp;</div>';
 		//print "</tr>\n";
-		print '</div>';	// End tr
+		print '</div>'; // End tr
 
 		clearstatcache();
 
@@ -447,7 +447,7 @@ 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
-		print '</div>';	// End table
+		print '</div>'; // End table
 		print '</div>';
 
 		print '<br><br>';

htdocs/product/stock/class/mouvementstock.class.php

Spacing +7 added lines, -7 removed lines

@@ -198,7 +198,7 @@ 
 				'skip_batch'       => &$skip_batch,
 				'id_product_batch' => &$id_product_batch
 			);
-			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('stockMovementCreate', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 			if ($reshook < 0) {
 				if (!empty($hookmanager->resPrint)) {
@@ -665,8 +665,8 @@ 
 				$this->price = $obj->price;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->label = $obj->label;
-				$this->fk_origin = $obj->origin_id;		// For backward compatibility
-				$this->origintype = $obj->origin_type;	// For backward compatibility
+				$this->fk_origin = $obj->origin_id; // For backward compatibility
+				$this->origintype = $obj->origin_type; // For backward compatibility
 				$this->origin_id = $obj->origin_id;
 				$this->origin_type = $obj->origin_type;
 				$this->inventorycode = $obj->inventorycode;
@@ -894,8 +894,8 @@ 
 			} else {					// product_batch record not found
 				$pdluo->fk_product_stock = $vfk_product_stock;
 				$pdluo->qty = $qty;
-				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby'];		// No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
-				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby'];		// No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->eatby = empty($dluo['eatby']) ? '' : $dluo['eatby']; // No more used. Now eatby date is store in table of lot, no more into prouct_batch table.
+				$pdluo->sellby = empty($dluo['sellby']) ? '' : $dluo['sellby']; // No more used. Now sellby date is store in table of lot, no more into prouct_batch table.
 				$pdluo->batch = $vbatchnumber;
 
 				$result = $pdluo->create($user, 1);
@@ -1205,8 +1205,8 @@ 
 		$sql = "SELECT sum(pb.qty) as cpt";
 		$sql .= " FROM ".$this->db->prefix()."product_batch as pb";
 		$sql .= " INNER JOIN ".$this->db->prefix()."product_stock as ps ON ps.rowid = pb.fk_product_stock";
-		$sql .= " WHERE ps.fk_product = " . ((int) $fk_product);
-		$sql .= " AND pb.batch = '" . $this->db->escape($batch) . "'";
+		$sql .= " WHERE ps.fk_product = ".((int) $fk_product);
+		$sql .= " AND pb.batch = '".$this->db->escape($batch)."'";
 
 		$result = $this->db->query($sql);
 		if ($result) {

htdocs/install/step5.php

Spacing +2 added lines, -2 removed lines

@@ -214,8 +214,8 @@
 			$newuser->admin = 1;
 			$newuser->entity = 0;
 
-			$conf->global->USER_MAIL_REQUIRED = 0; 			// Force global option to be sure to create a new user with no email
-			$conf->global->USER_PASSWORD_GENERATED = '';	// To not use any rule for password validation
+			$conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email
+			$conf->global->USER_PASSWORD_GENERATED = ''; // To not use any rule for password validation
 
 			$result = $newuser->create($createuser, 1);
 			if ($result > 0) {

htdocs/paypal/lib/paypal.lib.php

Spacing +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
 	// Turning on or off the ssl target certificate
 	if ($ssl_verifypeer < 0) {
 		global $dolibarr_main_prod;
-		$ssl_verifypeer =  ($dolibarr_main_prod ? true : false);
+		$ssl_verifypeer = ($dolibarr_main_prod ? true : false);
 	}
 	if (!empty($conf->global->MAIN_CURL_DISABLE_VERIFYPEER)) {
 		$ssl_verifypeer = 0;