Dolibarr / dolibarr

htdocs/core/lib/invoice.lib.php

Spacing +4 added lines, -4 removed lines

@@ -200,7 +200,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/compta/facture/card-rec.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card-rec.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("RepeatableInvoice");
 	$head[$h][2] = 'card';
 	$h++;
@@ -229,7 +229,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT . '/fourn/facture/card-rec.php?id=' . $object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/fourn/facture/card-rec.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("RepeatableSupplierInvoice");
 	$head[$h][2] = 'card';
 	$h++;
@@ -546,7 +546,7 @@ 
 									,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30)
 									,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30));
 				*/
-				$dataseries[$i]=array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
+				$dataseries[$i] = array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
 				$i++;
 			}
 			if (!empty($dataseries[0])) {
@@ -593,7 +593,7 @@ 
 				$dolgraph->setShowPercent(1);
 				$dolgraph->SetType(array('bars', 'bars', 'bars', 'bars', 'bars', 'bars'));
 				//$dolgraph->SetType(array('pie'));
-				$dolgraph->setHeight('160');	/* 160 min is required to show the 6 lines of legend */
+				$dolgraph->setHeight('160'); /* 160 min is required to show the 6 lines of legend */
 				$dolgraph->setWidth('450');
 				$dolgraph->setHideXValues(true);
 				if ($mode == 'customers') {

htdocs/core/extrafieldsinimport.inc.php

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 			case 'sellist':
 				$tmp = '';
 				$tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null
-				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) &&  $tmpparam['options'] && is_array($tmpparam['options'])) {
+				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) && $tmpparam['options'] && is_array($tmpparam['options'])) {
 					$tmpkeys = array_keys($tmpparam['options']);
 					$tmp = array_shift($tmpkeys);
 				}

htdocs/core/modules/mailings/contacts1.modules.php

Spacing +5 added lines, -5 removed lines

@@ -131,7 +131,7 @@ 
 		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')";
 		$sql .= " GROUP BY sp.poste";
@@ -166,7 +166,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_socpeople = sp.rowid";
@@ -239,7 +239,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -276,7 +276,7 @@ 
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
 		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
-		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
+		$sql .= " AND sp.email <> ''"; // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
 		$sql .= " AND cs.fk_soc = sp.fk_soc";
@@ -415,7 +415,7 @@ 
 
 		// Filter on job position
 		$key = $filter_jobposition;
-		if (!empty($key) && $key != 'all'  && $key != '-1') {
+		if (!empty($key) && $key != 'all' && $key != '-1') {
 			$sql .= " AND sp.poste = '".$this->db->escape($key)."'";
 		}
 

htdocs/core/modules/contract/doc/pdf_strato.modules.php

Spacing +2 added lines, -2 removed lines

@@ -356,10 +356,10 @@
 						$desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines)
 						$txt = '';
 						if (empty($conf->global->CONTRACT_HIDE_QTY_ON_PDF)) {
-							$txt .= $outputlangs->transnoentities("Quantity") . ' : <strong>' . $objectligne->qty . '</strong>';
+							$txt .= $outputlangs->transnoentities("Quantity").' : <strong>'.$objectligne->qty.'</strong>';
 						}
 						if (empty($conf->global->CONTRACT_HIDE_PRICE_ON_PDF)) {
-							$txt .= ' - ' . $outputlangs->transnoentities("UnitPrice") . ' : <strong>' . price($objectligne->subprice) . '</strong>';
+							$txt .= ' - '.$outputlangs->transnoentities("UnitPrice").' : <strong>'.price($objectligne->subprice).'</strong>';
 						}
 						if (empty($conf->global->CONTRACT_HIDE_PLANNED_DATE_ON_PDF)) {
 							$txt .= '<br>';

htdocs/core/modules/modAccounting.class.php

Spacing +1 added lines, -1 removed lines

@@ -353,7 +353,7 @@
 			'b.montant'=>'rule-computeAmount',
 			'b.sens'=>'rule-computeDirection'
 		); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
-		$this->import_convertvalue_array[$r]=array(
+		$this->import_convertvalue_array[$r] = array(
 			'b.piece_num' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanValue', 'element' => 'Accountancy'),
 			'b.numero_compte'=>array('rule'=>'accountingaccount'),
 			'b.subledger_account'=>array('rule'=>'accountingaccount'),

htdocs/hrm/lib/hrm_evaluation.lib.php

Spacing +6 added lines, -6 removed lines

@@ -101,27 +101,27 @@
 {
 	global $langs;
 	$legendSkills = '<div style="font-style:italic;">
-		' . $langs->trans('legend') . '
+		' . $langs->trans('legend').'
 		<table class="border" width="100%">
 			<tr>
 				<td><span style="vertical-align:middle" class="toohappy diffnote little"></span>
-				' . $langs->trans('CompetenceAcquiredByOneOrMore') . '</td>
+				' . $langs->trans('CompetenceAcquiredByOneOrMore').'</td>
 			</tr>
 			<tr>
 				<td><span style="vertical-align:middle" class="veryhappy diffnote little"></span>
-					' . $langs->trans('MaxlevelGreaterThan') . '</td>
+					' . $langs->trans('MaxlevelGreaterThan').'</td>
 			</tr>
 			<tr>
 				<td><span style="vertical-align:middle" class="happy diffnote little"></span>
-					' . $langs->trans('MaxLevelEqualTo') . '</td>
+					' . $langs->trans('MaxLevelEqualTo').'</td>
 			</tr>
 			<tr>
 				<td><span style="vertical-align:middle" class="sad diffnote little"></span>
-					' . $langs->trans('MaxLevelLowerThan') . '</td>
+					' . $langs->trans('MaxLevelLowerThan').'</td>
 			</tr>
 			<tr>
 				<td><span style="vertical-align:middle" class="toosad diffnote little"></span>
-					' . $langs->trans('SkillNotAcquired') . '</td>
+					' . $langs->trans('SkillNotAcquired').'</td>
 			</tr>
 		</table>
 </div>';

htdocs/variants/list.php

Spacing +21 added lines, -21 removed lines

@@ -262,7 +262,7 @@ 
 				$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
 			}
 			if (preg_match('/_dtend$/', $key)) {
-				$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				$sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'";
 			}
 		}
 	} elseif (array_key_exists($key, $object->fields)) {
@@ -295,7 +295,7 @@ 
 $hasgroupby = true;
 $sql .= " GROUP BY ";
 foreach ($object->fields as $key => $val) {
-	$sql .= "t." . $key . ", ";
+	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
 //if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -305,7 +305,7 @@ 
 //}
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace("/,\s*$/", "", $sql);
 
@@ -370,7 +370,7 @@ 
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
-	header("Location: " . dol_buildpath('/variants/card.php', 2) . '?id=' . $id);
+	header("Location: ".dol_buildpath('/variants/card.php', 2).'?id='.$id);
 	exit;
 }
 
@@ -611,28 +611,28 @@ 
 	$object->setVarsFromFetchObj($obj);
 
 	// Show here line of result
-	print '<tr id="row-' . $obj->rowid . '" class="oddeven drag drop">';
+	print '<tr id="row-'.$obj->rowid.'" class="oddeven drag drop">';
 	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'center';
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		}
 
 		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
 		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && empty($val['arrayofkeyval'])) {
-			$cssforfield .= ($cssforfield ? ' ' : '') . 'right';
+			$cssforfield .= ($cssforfield ? ' ' : '').'right';
 		}
 		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
-		if (!empty($arrayfields['t.' . $key]['checked'])) {
-			print '<td' . ($cssforfield ? ' class="' . $cssforfield . '"' : '') . '>';
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
 			} elseif ($key == 'rowid') {
@@ -646,15 +646,15 @@ 
 			}
 			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
 				if (!$i) {
-					$totalarray['pos'][$totalarray['nbfield']] = 't.' . $key;
+					$totalarray['pos'][$totalarray['nbfield']] = 't.'.$key;
 				}
 				if (!isset($totalarray['val'])) {
 					$totalarray['val'] = array();
 				}
-				if (!isset($totalarray['val']['t.' . $key])) {
-					$totalarray['val']['t.' . $key] = 0;
+				if (!isset($totalarray['val']['t.'.$key])) {
+					$totalarray['val']['t.'.$key] = 0;
 				}
-				$totalarray['val']['t.' . $key] += $object->$key;
+				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
 	}
@@ -685,7 +685,7 @@ 
 	// Action column
 	print '<td class="linecoledit center width25">';
 	if ($permissiontoadd) {
-		print '<a class="editfielda reposition" href="' . DOL_URL_ROOT . '/variants/card.php?id=' . $obj->rowid . '&action=edit&save_lastsearch_values=1&backtopage=' . urlencode($_SERVER['PHP_SELF']) . '">' . img_edit() . '</a>';
+		print '<a class="editfielda reposition" href="'.DOL_URL_ROOT.'/variants/card.php?id='.$obj->rowid.'&action=edit&save_lastsearch_values=1&backtopage='.urlencode($_SERVER['PHP_SELF']).'">'.img_edit().'</a>';
 	}
 	print '</td>';
 	if (!$i) {
@@ -697,7 +697,7 @@ 
 		if (in_array($object->id, $arrayofselected)) {
 			$selected = 1;
 		}
-		print '<input id="cb' . $object->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $object->id . '"' . ($selected ? ' checked="checked"' : '') . '>';
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) {
@@ -705,17 +705,17 @@ 
 	}
 	print '<td class="center linecolmove tdlineupdown">';
 	if ($i > 0) {
-		print '<a class="lineupdown" href="' . $_SERVER['PHP_SELF'] . '?action=up&amp;rowid=' . $obj->rowid . '">' . img_up('default', 0, 'imgupforline') . '</a>';
+		print '<a class="lineupdown" href="'.$_SERVER['PHP_SELF'].'?action=up&amp;rowid='.$obj->rowid.'">'.img_up('default', 0, 'imgupforline').'</a>';
 	}
 	if ($i < $num - 1) {
-		print '<a class="lineupdown" href="' . $_SERVER['PHP_SELF'] . '?action=down&amp;rowid=' . $obj->rowid . '">' . img_down('default', 0, 'imgdownforline') . '</a>';
+		print '<a class="lineupdown" href="'.$_SERVER['PHP_SELF'].'?action=down&amp;rowid='.$obj->rowid.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 	}
 	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
 
-	print '</tr>' . "\n";
+	print '</tr>'."\n";
 
 	$i++;
 }

htdocs/variants/tpl/productattributevalueline_create.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 	$coldisplay++;
 	?>
 	<td class="nobottom linecolref">
-		<?php $coldisplay++; if ($nolinesbefore) { echo $langs->trans('Ref') . ': '; } ?>
+		<?php $coldisplay++; if ($nolinesbefore) { echo $langs->trans('Ref').': '; } ?>
 		<input type="text" name="line_ref" id="line_ref" class="flat" value="<?php echo (GETPOSTISSET("line_ref") ? GETPOST("line_ref", 'alpha', 2) : ''); ?>" autofocus>
 		<?php
 		if (is_object($hookmanager)) {

htdocs/variants/combinations.php

Spacing +7 added lines, -7 removed lines

@@ -110,8 +110,8 @@ 
 	$action = 'add';
 	$attribute_id = GETPOST('attribute', 'int');
 	$attribute_value_id = GETPOST('value', 'int');
-	if ($attribute_id> 0 && $attribute_value_id > 0) {
-		$feature = $attribute_id . '-' . $attribute_value_id;
+	if ($attribute_id > 0 && $attribute_value_id > 0) {
+		$feature = $attribute_id.'-'.$attribute_value_id;
 		$selectedvariant[$feature] = $feature;
 		$_SESSION['addvariant_'.$object->id] = $selectedvariant;
 	}
@@ -474,10 +474,10 @@ 
 					if ($prodattr->fetch($explode[0]) <= 0 || $prodattr_val->fetch($explode[1]) <= 0) {
 						continue;
 					}
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #ddd;">' . $prodattr->label.' : '.$prodattr_val->value .
-						' <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=create&subaction=delete&feature='.urlencode($feature).'">' . img_delete() . '</a></li>';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #ddd;">'.$prodattr->label.' : '.$prodattr_val->value.
+						' <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=create&subaction=delete&feature='.urlencode($feature).'">'.img_delete().'</a></li>';
 				}
-				$listofvariantselected .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+				$listofvariantselected .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 			}
 			$listofvariantselected .= '</div>';
 			//print dol_get_fiche_end();
@@ -577,7 +577,7 @@ 
 
 		print load_fiche_titre($title);
 
-		print '<form method="post" id="combinationform" action="'.$_SERVER["PHP_SELF"] .'?id='.$object->id.'">'."\n";
+		print '<form method="post" id="combinationform" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'."\n";
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="'.(($valueid > 0) ? "update" : "create").'">'."\n";
 		if ($valueid > 0) {
@@ -824,7 +824,7 @@ 
 
 
 		// List of variants
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"] .'?id='.$object->id.'">';
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="massaction">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';