Dolibarr / dolibarr

htdocs/core/modules/facture/doc/pdf_octopus.modules.php

Spacing +47 added lines, -47 removed lines

@@ -77,7 +77,7 @@ 
 	 * Dolibarr version of the loaded document
 	 * @var string Version, possible values are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'''|'development'|'dolibarr'|'experimental'
 	 */
-	public $version = 'disabled';	// Disabled by default. Enabled in constructor if option INVOICE_USE_SITUATION is 2.
+	public $version = 'disabled'; // Disabled by default. Enabled in constructor if option INVOICE_USE_SITUATION is 2.
 
 	/**
 	 * @var int height for info total
@@ -291,7 +291,7 @@ 
 			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
 		}
 
-		if (empty($object) || ($object->type != Facture::TYPE_SITUATION && ($object->type != Facture::TYPE_CREDIT_NOTE &&  !empty($object->situation_cycle_ref)))) {
+		if (empty($object) || ($object->type != Facture::TYPE_SITUATION && ($object->type != Facture::TYPE_CREDIT_NOTE && !empty($object->situation_cycle_ref)))) {
 			setEventMessage($langs->trans('WarningsObjectIsNotASituation'), 'warnings');
 			return 1;
 		}
@@ -410,15 +410,15 @@ 
 				$pdf->SetAutoPageBreak(1, 0);
 
 				// compute height for situation invoices
-				$this->heightforinfotot = 45;	// Height reserved to output the info and total part and payment part
+				$this->heightforinfotot = 45; // Height reserved to output the info and total part and payment part
 				if (!getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS') && $nbpayments > 0) {
 					$this->heightforinfotot += 4 * ($nbpayments + 3);
 				}
 				if ($nbprevsituation > 0) {
 					$this->heightforinfotot += 4 * ($nbprevsituation + 3);
 				}
-				$this->heightforfreetext = (getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5));	// Height reserved to output the free text on last page
-				$this->heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22);	// Height reserved to output the footer (value include bottom margin)
+				$this->heightforfreetext = (getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5)); // Height reserved to output the free text on last page
+				$this->heightforfooter = $this->marge_basse + (!getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
@@ -432,7 +432,7 @@ 
 					if (!empty($conf->mycompany->multidir_output[$object->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity];
 					}
-					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$this->tplidx = $pdf->importPage(1);
 				}
 
@@ -524,7 +524,7 @@ 
 				// $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
 				// $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-				$this->tab_top = 90 + $top_shift + $shipp_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
+				$this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
 				$this->tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
 				// You can add more thing under header here, if you increase $extra_under_address_shift too.
@@ -1034,7 +1034,7 @@ 
 					if (!isset($this->tva[$vatrate])) {
 						$this->tva[$vatrate] = 0;
 					}
-					$this->tva[$vatrate] += $tvaligne;	// ->tva is abandoned, we use now ->tva_array that is more complete
+					$this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete
 					$vatcode = $object->lines[$i]->vat_src_code;
 					if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'])) {
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] = 0;
@@ -1334,8 +1334,8 @@ 
 			$posy = $pdf->GetY() + 4;
 		}
 
-		$posxval = 52;	// Position of values of properties shown on left side
-		$posxend = 110;	// End of x for text on left side
+		$posxval = 52; // Position of values of properties shown on left side
+		$posxend = 110; // End of x for text on left side
 		if ($this->page_largeur < 210) { // To work with US executive format
 			$posxend -= 10;
 		}
@@ -1365,7 +1365,7 @@ 
 
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
-			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+			$categoryOfOperationLabel = $outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
 			$pdf->MultiCell($posxend - $posxval, 4, $categoryOfOperationLabel, 0, 'L');
 
 			$posy = $pdf->GetY() + 3; // for 2 lines
@@ -1699,7 +1699,7 @@ 
 					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 						$vatrate .= '*';
 					}
-					if (! isset($tvas[$vatrate])) {
+					if (!isset($tvas[$vatrate])) {
 						$tvas[$vatrate] = 0;
 					}
 					$tvas[$vatrate] += $tvaligne;
@@ -1967,7 +1967,7 @@ 
 		if (empty($hidetop)) {
 			// Show category of operations
 			if (getDolGlobalInt('INVOICE_CATEGORY_OF_OPERATION') == 1 && $this->categoryOfOperation >= 0) {
-				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations") . ' : ' . $outputlangs->transnoentities("MentionCategoryOfOperations" . $this->categoryOfOperation);
+				$categoryOfOperations = $outputlangs->transnoentities("MentionCategoryOfOperations").' : '.$outputlangs->transnoentities("MentionCategoryOfOperations".$this->categoryOfOperation);
 				$pdf->SetXY($this->marge_gauche, $tab_top - 4);
 				$pdf->MultiCell(($pdf->GetStringWidth($categoryOfOperations)) + 4, 2, $categoryOfOperations);
 			}
@@ -1987,7 +1987,7 @@ 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Output Rect
-		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
 
 		// situation invoice
 		$pdf->SetFont('', '', $default_font_size - 2);
@@ -2027,7 +2027,7 @@ 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		if (empty($hidetop)) {
-			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line prend une position y en 2eme param et 4eme param
 		}
 	}
 
@@ -2597,7 +2597,7 @@ 
 			'overtitle' => array(
 				'textkey' => 'Chantier', // use lang key is useful in somme case with module
 				'align' => 'C',
-				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 				'width' => 18
 			),
 		);
@@ -2622,13 +2622,13 @@ 
 			),
 			'border-left' => true, // add left line separator
 			'overtitle' => array(
-				'textkey' => 'S'.$derniere_situation->situation_counter . ' - ' . dol_print_date($derniere_situation->date, "%d/%m/%Y"),
+				'textkey' => 'S'.$derniere_situation->situation_counter.' - '.dol_print_date($derniere_situation->date, "%d/%m/%Y"),
 				'align' => 'C',
-				'padding' => array(0.5,0.2,0.5,0.2), // Like css 0 => top, 1 => right, 2 => bottom, 3 => left
+				'padding' => array(0.5, 0.2, 0.5, 0.2), // Like css 0 => top, 1 => right, 2 => bottom, 3 => left
 				'width' => 10 + 15 //current width + amount cell width
 			),
 		);
-		if ($this->situationinvoice && ! empty($this->TDataSituation['date_derniere_situation'])) {
+		if ($this->situationinvoice && !empty($this->TDataSituation['date_derniere_situation'])) {
 			$this->cols['prev_progress']['status'] = true;
 		}
 
@@ -2643,7 +2643,7 @@ 
 			),
 			'border-left' => true, // add left line separator
 		);
-		if ($this->situationinvoice && ! empty($this->TDataSituation['date_derniere_situation'])) {
+		if ($this->situationinvoice && !empty($this->TDataSituation['date_derniere_situation'])) {
 			$this->cols['prev_progress_amount']['status'] = true;
 		}
 
@@ -2658,9 +2658,9 @@ 
 			),
 			'border-left' => true, // add left line separator
 			'overtitle' => array(
-				'textkey' => 'S'.$object->situation_counter . ' - ' . dol_print_date($object->date, "%d/%m/%Y"),
+				'textkey' => 'S'.$object->situation_counter.' - '.dol_print_date($object->date, "%d/%m/%Y"),
 				'align' => 'C',
-				'padding' => array(0.5,0.2,0.5,0.2), // Like css 0 => top, 1 => right, 2 => bottom, 3 => left
+				'padding' => array(0.5, 0.2, 0.5, 0.2), // Like css 0 => top, 1 => right, 2 => bottom, 3 => left
 				'width' => 10 + 15
 			),
 		);
@@ -2783,7 +2783,7 @@ 
 
 		// Output Rect
 		// KEEPTHIS => Affiche les bords extérieurs
-		$this->printRectBtp($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRectBtp($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
 
 		$pdf->line($this->posx_cumul_anterieur - 1, $tab_top, $this->posx_cumul_anterieur - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
@@ -2840,7 +2840,7 @@ 
 			$pdf->SetXY($this->marge_gauche + 10, $tab_top + 24 + $i);
 			$pdf->MultiCell(80, 2, $outputlangs->transnoentities("TotalHT").' '.$TVatInfo['label'], '', 'L');
 
-			if (! empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
+			if (!empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
 				$pdf->SetXY($this->marge_gauche + 10, $tab_top + 28 + $i);
 				$pdf->MultiCell(80, 2, $outputlangs->transnoentities("VAT").' '.$TVatInfo['label'], '', 'L');
 			} else {
@@ -2904,7 +2904,7 @@ 
 				$pdf->MultiCell(32, 2, price($this->TDataSituation[$col][$tva_tx_formated]['HT'], 0, '', 1, -1, 2), '', 'R');
 
 				// Total TVA
-				if (! empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
+				if (!empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
 					$pdf->SetXY($x, $tab_top + 28 + $i);
 					$pdf->MultiCell(32, 2, price($this->TDataSituation[$col][$tva_tx_formated]['TVA'], 0, '', 1, -1, 2), '', 'R');
 				} else {
@@ -2984,7 +2984,7 @@ 
 
 		$TDataSituation = array();
 
-		if (! empty($facDerniereSituation)) {
+		if (!empty($facDerniereSituation)) {
 			$TDataSituation['derniere_situation'] = $facDerniereSituation;
 			$TDataSituation['date_derniere_situation'] = $facDerniereSituation->date;
 		}
@@ -2993,9 +2993,9 @@ 
 		$retenue_garantie_anterieure = 0;
 		// Init tous les champs à 0
 		$TDataSituation['cumul_anterieur'] = array(
-			'HT' => 0,	//montant HT normal
-			'TVA' => 0,   //montant de la TVA sur le HTnet
-			'TTC' => 0,   //montant TTC (HTnet + TVA)
+			'HT' => 0, //montant HT normal
+			'TVA' => 0, //montant de la TVA sur le HTnet
+			'TTC' => 0, //montant TTC (HTnet + TVA)
 			'retenue_garantie' => 0,
 			'travaux_sup' => 0,
 			'HTnet' => 0, //montant HT
@@ -3025,7 +3025,7 @@ 
 					$isFirstSituation = false;
 					if (!empty($l->fk_prev_id)) {
 						$prevSituationPercent = $l->get_prev_progress($previousInvoice->id, true);
-					} elseif (! array_key_exists($i + 1, $TPreviousInvoices)) {
+					} elseif (!array_key_exists($i + 1, $TPreviousInvoices)) {
 						$isFirstSituation = true;
 					}
 
@@ -3035,7 +3035,7 @@ 
 
 					//1ere ligne
 					$amounttva = $calc_ht * ($ltvatx / 100);
-					if (! isset($TDataSituation['cumul_anterieur'][$ltvatx])) {
+					if (!isset($TDataSituation['cumul_anterieur'][$ltvatx])) {
 						$TDataSituation['cumul_anterieur'][$ltvatx]['HT'] = $calc_ht;
 						$TDataSituation['cumul_anterieur'][$ltvatx]['TVA'] = $amounttva;
 					} else {
@@ -3047,14 +3047,14 @@ 
 					//le grand total de TVA
 					// $TDataSituation['cumul_anterieur']['TVA'] += $amounttva;
 
-					if (empty($l->fk_prev_id) && ! $isFirstSituation) {
+					if (empty($l->fk_prev_id) && !$isFirstSituation) {
 						// TODO: à clarifier, mais pour moi, un facture de situation précédente qui a des progressions à 0% c'est pas logique
 						$TDataSituation['cumul_anterieur']['travaux_sup'] += $calc_ht;
 					}
 				}
 			}
 
-			if (! empty($previousInvoice->retained_warranty) && !getDolGlobalString('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL')) {
+			if (!empty($previousInvoice->retained_warranty) && !getDolGlobalString('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL')) {
 				$retenue_garantie_anterieure += $previousInvoice->getRetainedWarrantyAmount();
 			}
 
@@ -3068,7 +3068,7 @@ 
 		// print json_encode($facDerniereSituation->lines);exit;
 		$TDataSituation['current'] = $this->btpGetInvoiceAmounts($object->id);
 
-		if (! empty($facDerniereSituation->lines)) {
+		if (!empty($facDerniereSituation->lines)) {
 			$TFacLinesKey = array_keys($facDerniereSituation->lines);
 			$TObjectLinesKey = array_keys($object->lines);
 			$TDiffKey = array_diff($TObjectLinesKey, $TFacLinesKey);
@@ -3234,7 +3234,7 @@ 
 	 */
 	public function btpGetInvoiceAmounts($id, $forceReadFromDB = false)
 	{
-		global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblignes;
 
 		$object = new Facture($db);
 		$object->fetch($id);
@@ -3252,16 +3252,16 @@ 
 		$facDerniereSituation = $TPreviousInvoices[0];
 
 		$ret = array(
-			'HT' => 0,	//montant HT normal
+			'HT' => 0, //montant HT normal
 			'HTnet' => 0, //montant HT
-			'TVA' => 0,   //montant de la TVA sur le HTnet
-			'TTC' => 0,   //montant TTC (HTnet + TVA)
+			'TVA' => 0, //montant de la TVA sur le HTnet
+			'TTC' => 0, //montant TTC (HTnet + TVA)
 			'retenue_garantie' => 0,
 			'travaux_sup' => 0,
 			'total_a_payer' => 0 //montant "a payer" sur la facture
 		);
 
-		if (! empty($facDerniereSituation)) {
+		if (!empty($facDerniereSituation)) {
 			$ret['derniere_situation'] = $facDerniereSituation;
 			$ret['date_derniere_situation'] = $facDerniereSituation->date;
 		}
@@ -3393,14 +3393,14 @@ 
 			$label = $outputlangs->transnoentities("SituationInvoiceTotalProposal");
 			$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $label, 0, 'L', 0, 1, $posx, $posy + 1);
 
-			$amount = price($sign * ($total_ht + (! empty($propal->remise) ? $propal->remise : 0)));
+			$amount = price($sign * ($total_ht + (!empty($propal->remise) ? $propal->remise : 0)));
 			$pdf->MultiCell($width2, 3, $amount, 0, 'R', 0, 1, $posx + $width, $posy + 1);
 
 			$pdf->SetFont('', '', $default_font_size - 1);
 
 			// Output Rect
 			$pdf->SetDrawColor(128, 128, 128);
-			$this->printRect($pdf, $posx, $posy, $this->page_largeur - $this->marge_gauche - $this->marge_droite, 6);	// Rect prend une longueur en 3eme param et 4eme param
+			$this->printRect($pdf, $posx, $posy, $this->page_largeur - $this->marge_gauche - $this->marge_droite, 6); // Rect prend une longueur en 3eme param et 4eme param
 
 			$posy += 4;
 		} elseif (count($orders)) {
@@ -3435,7 +3435,7 @@ 
 
 		$force_to_zero = false;
 
-		$idinv = 0;//count($previousinvoices);
+		$idinv = 0; //count($previousinvoices);
 		while ($idinv < count($previousinvoices)) {
 			$invoice = $previousinvoices[$idinv];
 
@@ -3457,7 +3457,7 @@ 
 				$force_to_zero = true;
 			}
 
-			$ref .= ' - '. $invoice->ref;
+			$ref .= ' - '.$invoice->ref;
 			$ref .= ' ('.dol_print_date($invoice->date, "%d/%m/%Y", false, $outputlangs).')';
 			$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $ref, 0, 'L', 0);
 
@@ -3488,7 +3488,7 @@ 
 				if (($invoice->lines[$i]->info_bits & 0x01) == 0x01) {
 					$vatrate .= '*';
 				}
-				if (! isset($tvas[$vatrate])) {
+				if (!isset($tvas[$vatrate])) {
 					$tvas[$vatrate] = 0;
 				}
 				$tvas[$vatrate] += $tvaligne;
@@ -3666,7 +3666,7 @@ 
 						$pdf->SetXY($posx + $width4, $posy + $height * $index + $y);
 						$pdf->MultiCell($width4, $height - 1, price($sign * $payment['amount'], 0, $outputlangs), 0, 'L', 0);
 						$pdf->SetXY($posx + $width4 * 2, $posy + $height * $index + $y);
-						$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort" . $payment['type']);
+						$oper = $outputlangs->transnoentitiesnoconv("PaymentTypeShort".$payment['type']);
 
 						$pdf->MultiCell($width4, $height - 1, $oper, 0, 'L', 0);
 						$pdf->SetXY($posx + $width4 * 3, $posy + $height * $index + $y);
@@ -3696,7 +3696,7 @@ 
 					$this->_pagehead($pdf, $object, 0, $outputlangs);
 				}
 				$pdf->setPage($pageposafter + 1);
-				$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+				$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 				$posy = $this->tab_top_newpage + 1;
 			} else {
@@ -3728,7 +3728,7 @@ 
 
 		$posy += 10;
 
-		$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+		$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', '', $default_font_size - 1);

htdocs/core/modules/printing/printgcp.modules.php

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
 				'type' => 'info',
 			);
 		} else {
-			$keyforprovider = '';	// @FIXME
+			$keyforprovider = ''; // @FIXME
 
 			$this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID');
 			$this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET');
@@ -248,7 +248,7 @@ 
 		global $conf;
 		$ret = array();
 
-		$keyforprovider = '';	// @FIXME
+		$keyforprovider = ''; // @FIXME
 
 		// Token storage
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);
@@ -390,7 +390,7 @@ 
 			'contentType' => $contenttype,
 		);
 
-		$keyforprovider = '';	// @FIXME
+		$keyforprovider = ''; // @FIXME
 
 		// Dolibarr Token storage
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);
@@ -442,7 +442,7 @@ 
 		$error = 0;
 		$html = '';
 
-		$keyforprovider = '';	// @FIXME
+		$keyforprovider = ''; // @FIXME
 
 		// Token storage
 		$storage = new DoliStorage($this->db, $conf, $keyforprovider);

htdocs/core/modules/oauth/generic_oauthcallback.php

Spacing +4 added lines, -4 removed lines

@@ -141,7 +141,7 @@ 
 // access type needed to have oauth provider refreshing token
 // also note that a refresh token is sent only after a prompt
 if (method_exists($apiService, 'setAccessType')) {
-	$apiService->setAccessType('offline');		// Most generic OAUTH provider does not provide AccessType online/offline. They are mostly offline.
+	$apiService->setAccessType('offline'); // Most generic OAUTH provider does not provide AccessType online/offline. They are mostly offline.
 }
 
 if (!getDolGlobalString($keyforparamid)) {
@@ -184,7 +184,7 @@ 
 
 	// Set approval_prompt. Note: A refresh token will be provided only if prompt is done.
 	if ($forlogin) {
-		$approval_prompt = getDolGlobalString('OAUTH_'.$genericstring.'_FORCE_PROMPT_ON_LOGIN', 'auto');	// Can be 'force'
+		$approval_prompt = getDolGlobalString('OAUTH_'.$genericstring.'_FORCE_PROMPT_ON_LOGIN', 'auto'); // Can be 'force'
 		if (method_exists($apiService, 'setApprouvalPrompt')) {
 			$apiService->setApprouvalPrompt($approval_prompt);
 		}
@@ -328,10 +328,10 @@ 
 					$entitytosearchuser = (isset($tmparray['entity']) ? $tmparray['entity'] : -1);
 
 					// Delete the old token
-					$storage->clearToken($genericstring);	// Delete the token called ("Generic-".$storage->keyforprovider)
+					$storage->clearToken($genericstring); // Delete the token called ("Generic-".$storage->keyforprovider)
 
 					$tmpuser = new User($db);
-					$res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1);	// Load user. Can load with email_oauth2.
+					$res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2.
 
 					if ($res > 0) {
 						$username = $tmpuser->login;

htdocs/core/modules/hrm/mod_evaluation_advanced.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
  * \brief      File containing class for advanced numbering model of Evaluation
  */
 
-require_once DOL_DOCUMENT_ROOT . '/core/modules/hrm/modules_evaluation.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/hrm/modules_evaluation.php';
 
 
 /**

htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php

Spacing +3 added lines, -3 removed lines

@@ -285,7 +285,7 @@ 
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 				// Set path to the background PDF File
 				if (!getDolGlobalString('MAIN_DISABLE_FPDI') && getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
-					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -838,7 +838,7 @@ 
 	protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf, $mysoc;
-		'@phan-var-force Commande|Propal|Facture $object';  // availability_code,... does not exist on Facture.
+		'@phan-var-force Commande|Propal|Facture $object'; // availability_code,... does not exist on Facture.
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1433,7 +1433,7 @@ 
 			// Show recipient
 			$widthrecbox = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 92 : 100;
 			if ($this->page_largeur < 210) {
-				$widthrecbox = 84;	// To work with US executive format
+				$widthrecbox = 84; // To work with US executive format
 			}
 			$posy = getDolGlobalString('MAIN_PDF_USE_ISO_LOCATION') ? 40 : 42;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;

htdocs/core/lib/pdf.lib.php

Spacing +22 added lines, -24 removed lines

@@ -182,7 +182,7 @@ 
 
 	$pdfa = false; // PDF-1.3
 	if (getDolGlobalString('PDF_USE_A')) {
-		$pdfa = getDolGlobalString('PDF_USE_A'); 	// PDF/A-1 ou PDF/A-3
+		$pdfa = getDolGlobalString('PDF_USE_A'); // PDF/A-1 ou PDF/A-3
 	}
 
 	if (!getDolGlobalString('MAIN_DISABLE_TCPDI') && class_exists('TCPDI')) {
@@ -537,7 +537,7 @@ 
 				$stringaddress .= ($stringaddress ? "\n" : '').$tmp.': '.$outputlangs->convToOutputCharset($sourcecompany->idprof6);
 			}
 			if (getDolGlobalString('PDF_ADD_MORE_AFTER_SOURCE_ADDRESS')) {
-				$stringaddress .= ($stringaddress ? "\n" : '') . getDolGlobalString('PDF_ADD_MORE_AFTER_SOURCE_ADDRESS');
+				$stringaddress .= ($stringaddress ? "\n" : '').getDolGlobalString('PDF_ADD_MORE_AFTER_SOURCE_ADDRESS');
 			}
 		}
 
@@ -649,7 +649,7 @@ 
 				if ($usecontact && is_object($targetcontact) && getDolGlobalInt('MAIN_USE_COMPANY_NAME_OF_CONTACT')) {
 					$targetcontact->fetch_thirdparty();
 					if (!empty($targetcontact->thirdparty->id) && $targetcontact->thirdparty->tva_intra) {
-						$stringaddress .= ($stringaddress ? "\n" : '') . $outputlangs->transnoentities("VATIntraShort") . ': ' . $outputlangs->convToOutputCharset($targetcontact->thirdparty->tva_intra);
+						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcontact->thirdparty->tva_intra);
 					}
 				} elseif (!empty($targetcompany->tva_intra)) {
 					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("VATIntraShort").': '.$outputlangs->convToOutputCharset($targetcompany->tva_intra);
@@ -736,7 +736,7 @@ 
 
 	// Add a background image on document only if good setup of const
 	if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF') && (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF') != '-1')) {		// Warning, this option make TCPDF generation being crazy and some content disappeared behind the image
-		$filepath = $conf->mycompany->dir_output.'/logos/' . getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF');
+		$filepath = $conf->mycompany->dir_output.'/logos/'.getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF');
 		if (file_exists($filepath)) {
 			$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak before adding image
 			if (getDolGlobalString('MAIN_USE_BACKGROUND_ON_PDF_ALPHA')) {
@@ -1025,7 +1025,7 @@ 
 	$outputlangs->load("dict");
 	$line = '';
 	$reg = array();
-	$marginwithfooter = 0;  // Return value
+	$marginwithfooter = 0; // Return value
 
 	$dims = $pdf->getPageDimensions();
 
@@ -1156,7 +1156,7 @@ 
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof5);
 	}
 	// Prof Id 6
-	if (!empty($fromcompany->idprof6) &&  $fromcompany->idprof6) {
+	if (!empty($fromcompany->idprof6) && $fromcompany->idprof6) {
 		$field = $outputlangs->transcountrynoentities("ProfId6", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1164,7 +1164,7 @@ 
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof6);
 	}
 	// Prof Id 7
-	if (!empty($fromcompany->idprof7) &&  $fromcompany->idprof7) {
+	if (!empty($fromcompany->idprof7) && $fromcompany->idprof7) {
 		$field = $outputlangs->transcountrynoentities("ProfId7", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1172,7 +1172,7 @@ 
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof7);
 	}
 	// Prof Id 8
-	if (!empty($fromcompany->idprof8) &&  $fromcompany->idprof8) {
+	if (!empty($fromcompany->idprof8) && $fromcompany->idprof8) {
 		$field = $outputlangs->transcountrynoentities("ProfId8", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1180,7 +1180,7 @@ 
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof8);
 	}
 	// Prof Id 9
-	if (!empty($fromcompany->idprof9) &&  $fromcompany->idprof9) {
+	if (!empty($fromcompany->idprof9) && $fromcompany->idprof9) {
 		$field = $outputlangs->transcountrynoentities("ProfId9", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1188,7 +1188,7 @@ 
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof9);
 	}
 	// Prof Id 10
-	if (!empty($fromcompany->idprof10) &&  $fromcompany->idprof10) {
+	if (!empty($fromcompany->idprof10) && $fromcompany->idprof10) {
 		$field = $outputlangs->transcountrynoentities("ProfId10", $fromcompany->country_code);
 		if (preg_match('/\((.*)\)/i', $field, $reg)) {
 			$field = $reg[1];
@@ -1196,7 +1196,7 @@ 
 		$line4 .= ($line4 ? " - " : "").$field.": ".$outputlangs->convToOutputCharset($fromcompany->idprof10);
 	}
 	// IntraCommunautary VAT
-	if (!empty($fromcompany->tva_intra)  && $fromcompany->tva_intra != '') {
+	if (!empty($fromcompany->tva_intra) && $fromcompany->tva_intra != '') {
 		$line4 .= ($line4 ? " - " : "").$outputlangs->transnoentities("VATIntraShort").": ".$outputlangs->convToOutputCharset($fromcompany->tva_intra);
 	}
 
@@ -1365,7 +1365,7 @@ 
 
 	$pagination = $pdf->PageNo().' / '.$pdf->getAliasNbPages();
 	$fontRenderCorrection = 0;
-	if (in_array(pdf_getPDFFont($outputlangs), array('freemono',  'DejaVuSans'))) {
+	if (in_array(pdf_getPDFFont($outputlangs), array('freemono', 'DejaVuSans'))) {
 		$fontRenderCorrection = 10;
 	}
 	$pdf->MultiCell(18 + $fontRenderCorrection, 2, $pagination, 0, 'R', 0);
@@ -1462,7 +1462,7 @@ 
 
 		if (getDolGlobalString('MARGIN_TOP_ZERO_UL')) {
 			$pdf->setListIndentWidth(5);
-			$TMarginList = ['ul' => [['h' => 0.1, ],['h' => 0.1, ]], 'li' => [['h' => 0.1, ],],];
+			$TMarginList = ['ul' => [['h' => 0.1, ], ['h' => 0.1, ]], 'li' => [['h' => 0.1, ], ], ];
 			$pdf->setHtmlVSpace($TMarginList);
 		}
 
@@ -1504,7 +1504,7 @@ 
 		$prodser = new Product($db);
 
 		if (getDolGlobalString('PRODUIT_CUSTOMER_PRICES')) {
-			include_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+			include_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';
 		}
 	}
 
@@ -1551,7 +1551,7 @@ 
 		$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 	}
 
-	$libelleproduitservice = '';  // Default value
+	$libelleproduitservice = ''; // Default value
 	if (!getDolGlobalString('PDF_HIDE_PRODUCT_LABEL_IN_SUPPLIER_LINES')) {
 		// Description short of product line
 		$libelleproduitservice = $label;
@@ -1585,8 +1585,7 @@ 
 					$libelleproduitservice = dol_concatdesc(
 						dol_concatdesc($libelleproduitservice, " * ".$subprodval[3]),
 						(!empty($qtyText) ?
-							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1] * $qtyText :
-							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])
+							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1] * $qtyText : $outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])
 					);
 				}
 			} else {
@@ -1594,8 +1593,7 @@ 
 					$libelleproduitservice = dol_concatdesc(
 						dol_concatdesc($libelleproduitservice, " * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3]),
 						(!empty($qtyText) ?
-							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1] * $qtyText :
-							$outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])
+							$outputlangs->trans('Qty').':'.$qtyText.' x '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1].'= '.$outputlangs->trans('QtyTot').':'.$subprodval[1] * $qtyText : $outputlangs->trans('Qty').' '.$outputlangs->trans('AssociatedProducts').':'.$subprodval[1])
 					);
 				}
 			}
@@ -1698,11 +1696,11 @@ 
 								break;
 
 							case 2:
-								$ref_prodserv = $productCustomerPrice->ref_customer . ' (' . $outputlangs->transnoentitiesnoconv('InternalRef') . ' ' . $ref_prodserv . ')';
+								$ref_prodserv = $productCustomerPrice->ref_customer.' ('.$outputlangs->transnoentitiesnoconv('InternalRef').' '.$ref_prodserv.')';
 								break;
 
 							default:
-								$ref_prodserv = $ref_prodserv . ' (' . $outputlangs->transnoentitiesnoconv('RefCustomer') . ' ' . $productCustomerPrice->ref_customer . ')';
+								$ref_prodserv = $ref_prodserv.' ('.$outputlangs->transnoentitiesnoconv('RefCustomer').' '.$productCustomerPrice->ref_customer.')';
 						}
 					}
 				}
@@ -2549,7 +2547,7 @@ 
 						}
 					}
 
-					if (! is_object($order)) {
+					if (!is_object($order)) {
 						$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref));
 					} else {
 						$object->note_public = dol_concatdesc($object->note_public, $outputlangs->convToOutputCharset($order->ref).($order->ref_client ? ' ('.$order->ref_client.')' : ''));
@@ -2572,7 +2570,7 @@ 
 					}
 				}
 
-				if (! is_object($order)) {
+				if (!is_object($order)) {
 					$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefSending");
 					if (empty($linkedobjects[$objecttype]['ref_value'])) {
 						$linkedobjects[$objecttype]['ref_value'] = '';
@@ -2674,7 +2672,7 @@ 
 				if (isset($hookmanager->resArray['linetotalremise'])) {
 					return $hookmanager->resArray['linetotalremise'];
 				} else {
-					return (float) $hookmanager->resPrint;	// For backward compatibility
+					return (float) $hookmanager->resPrint; // For backward compatibility
 				}
 			}
 		}

htdocs/core/lib/modulebuilder.lib.php

Spacing +28 added lines, -28 removed lines

@@ -274,22 +274,22 @@ 
 	// Edit .sql file
 	if ($moduletype == 'internal') {
 		$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+		if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 			$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 				$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 					$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'.sql';
 				}
 			}
 		}
 	} else {
 		$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+		if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 			$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 				$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 					$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'.sql';
 				}
 			}
@@ -727,7 +727,7 @@ 
 {
 
 	// stock all properties in array
-	$attributesUnique = array('type','label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default' , 'foreignkey', 'arrayofkeyval', 'alwayseditable','validate', 'searchall','comment', 'isameasure', 'css', 'cssview','csslist', 'help', 'showoncombobox','picto' );
+	$attributesUnique = array('type', 'label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default', 'foreignkey', 'arrayofkeyval', 'alwayseditable', 'validate', 'searchall', 'comment', 'isameasure', 'css', 'cssview', 'csslist', 'help', 'showoncombobox', 'picto');
 
 	$start = "public \$fields = array(";
 	$end = ");";
@@ -797,8 +797,8 @@ 
 				$valuesModif[$attUnique] = $values[$attUnique];
 			}
 		}
-		$table .= "|*" . $field[0] . "*|";
-		$table .= implode("|", $valuesModif) . "\n";
+		$table .= "|*".$field[0]."*|";
+		$table .= implode("|", $valuesModif)."\n";
 	}
 
 	// end table
@@ -829,13 +829,13 @@ 
 
 		$str = file_get_contents($file);
 
-		$search = '/' . preg_quote($start, '/') . '(.*?)' . preg_quote($end, '/') . '/s';
+		$search = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
 		$new_contents = preg_replace($search, '', $str);
 		file_put_contents($file, $new_contents);
 
 		//perms If Exist
 		$perms = "|*".strtolower($objectname)."*|";
-		$search_pattern_perms = '/' . preg_quote($perms, '/') . '.*?\n/';
+		$search_pattern_perms = '/'.preg_quote($perms, '/').'.*?\n/';
 		$new_contents = preg_replace($search_pattern_perms, '', $new_contents);
 		file_put_contents($file, $new_contents);
 	}
@@ -907,7 +907,7 @@ 
 	$string = "[options='header',grid=rows,width=60%,caption=Organisation]\n";
 	$string .= "|===\n";
 	// header for table
-	$header = array($langs->trans('Objects'),$langs->trans('Permission'));
+	$header = array($langs->trans('Objects'), $langs->trans('Permission'));
 	foreach ($header as $h) {
 		$string .= "|".$h;
 	}
@@ -989,7 +989,7 @@ 
 	}
 
 	$now = dol_now();
-	$content = file($file);	// $content is an array
+	$content = file($file); // $content is an array
 
 	$includeClass = "dol_include_once\(\'\/\w+\/class\/\w+\.class\.php\'\);";
 	$props = 'public\s+\$\w+;';
@@ -1001,23 +1001,23 @@ 
 		if (preg_match('/'.$varcommented.'/', $lineContent)) {
 			$lineContent = '';
 			foreach ($objects as $objectname) {
-				$lineContent .= "\t * @var ".$objectname." \$".strtolower($objectname)." {@type ".$objectname."}". PHP_EOL;
+				$lineContent .= "\t * @var ".$objectname." \$".strtolower($objectname)." {@type ".$objectname."}".PHP_EOL;
 			}
 			//var_dump($lineContent);exit;
 		} elseif (preg_match('/'.$props.'/', $lineContent)) {
 			$lineContent = '';
 			foreach ($objects as $objectname) {
-				$lineContent .= "\t/*".PHP_EOL."\t * @var mixed TODO: set type".PHP_EOL."\t */".PHP_EOL."\tpublic \$".strtolower($objectname).";". PHP_EOL;
+				$lineContent .= "\t/*".PHP_EOL."\t * @var mixed TODO: set type".PHP_EOL."\t */".PHP_EOL."\tpublic \$".strtolower($objectname).";".PHP_EOL;
 			}
 		} elseif (preg_match('/'.$constructObj.'/', $lineContent)) {
 			$lineContent = '';
 			foreach ($objects as $objectname) {
-				$lineContent .= "\t\t\$this->".strtolower($objectname)." = new ".$objectname."(\$this->db);". PHP_EOL;
+				$lineContent .= "\t\t\$this->".strtolower($objectname)." = new ".$objectname."(\$this->db);".PHP_EOL;
 			}
 		} elseif (preg_match('/'.$includeClass.'/', $lineContent)) {
 			$lineContent = '';
 			foreach ($objects as $objectname) {
-				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($objectname).".class.php');". PHP_EOL;
+				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($objectname).".class.php');".PHP_EOL;
 			}
 		}
 	}
@@ -1071,7 +1071,7 @@ 
 		return -1;
 	}
 
-	$content = file($file);	// $content is an array
+	$content = file($file); // $content is an array
 
 	$includeClass = "dol_include_once\(\'\/\w+\/class\/".strtolower($objectname)."\.class\.php\'\);";
 	$props = 'public\s+\$'.strtolower($objectname);
@@ -1240,33 +1240,33 @@ 
 				 * @param	bool|string|int	$val
 				 * @return	string|int
 				 */
-				static function ($val) use ($module) {
+				static function($val) use ($module) {
 					return is_bool($val) ? "isModEnabled('$module')" : $val;
 				},
 				$value
 			);
-			$dicData .= "array(" . implode(", ", $conditions) . ")";
+			$dicData .= "array(".implode(", ", $conditions).")";
 		} elseif ($key === 'tabhelp') {
 			$helpItems = array();
 			foreach ($value as $helpValue) {
 				$helpItems[] = "array('code' => \$langs->trans('".$helpValue['code']."'), 'field2' => 'field2tooltip')";
 			}
-			$dicData .= "array(" . implode(",", $helpItems) . ")";
+			$dicData .= "array(".implode(",", $helpItems).")";
 		} else {
 			if (is_array($value)) {
-				$dicData .= "array(" . implode(
+				$dicData .= "array(".implode(
 					",",
 					array_map(
 						/**
 						 * @param	string	$val
 						 * @return	string
 						 */
-						static function ($val) {
+						static function($val) {
 							return "'$val'";
 						},
 						$value
 					)
-				) . ")";
+				).")";
 			} else {
 				$dicData .= "'$value'";
 			}
@@ -1355,7 +1355,7 @@ 
 	$dictionnaires['tabfieldvalue'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');
 	$dictionnaires['tabfieldinsert'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');
 	$dictionnaires['tabrowid'][] = $primaryKey;
-	$dictionnaires['tabcond'][] = isModEnabled('$modulename');  // @phan-suppress-current-line UnknownModuleName
+	$dictionnaires['tabcond'][] = isModEnabled('$modulename'); // @phan-suppress-current-line UnknownModuleName
 	$dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code' => $langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : '');
 
 	// Build the dictionary string
@@ -1409,7 +1409,7 @@ 
 
 	// build format asciidoc for urls in table
 	if (!$error) {
-		$asciiDocTable = "[options=\"header\"]\n|===\n|Object | URLs\n";  // phpcs:ignore
+		$asciiDocTable = "[options=\"header\"]\n|===\n|Object | URLs\n"; // phpcs:ignore
 		foreach ($groupedUrls as $objectName => $urls) {
 			$urlsList = implode(" +\n*", $urls);
 			$asciiDocTable .= "|$objectName | \n*$urlsList +\n";
@@ -1442,9 +1442,9 @@ 
 
 	foreach ($allFilesAndDirs as $item) {
 		if ($item != '.' && $item != '..') {
-			if ($type == 1 && is_file($path . DIRECTORY_SEPARATOR . $item) && strpos($item, '.back') === false) {
+			if ($type == 1 && is_file($path.DIRECTORY_SEPARATOR.$item) && strpos($item, '.back') === false) {
 				$count++;
-			} elseif ($type == 2 && is_dir($path . DIRECTORY_SEPARATOR . $item)) {
+			} elseif ($type == 2 && is_dir($path.DIRECTORY_SEPARATOR.$item)) {
 				$count++;
 			}
 		}

htdocs/core/boxes/box_last_knowledgerecord.php

Spacing +1 added lines, -1 removed lines

@@ -144,7 +144,7 @@
 					$labellang = ($objp->lang ? $langs->trans('Language_'.$objp->lang) : '');
 					$this->info_box_contents[$i][$r] = array(
 						'td' => 'class="tdoverflowmax100"',
-						'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"') . $labellang,
+						'text' => picto_from_langcode($objp->lang, 'class="paddingrightonly saturatemedium opacitylow"').$labellang,
 						'asis' => 1,
 					);
 					$r++;

htdocs/core/boxes/box_graph_nb_tickets_type.php

Spacing +3 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
 		$colorseriesstat = array();
 		if ($user->hasRight('ticket', 'read')) {
 			$sql = "SELECT ctt.rowid, ctt.label, ctt.code";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_type as ctt";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as ctt";
 			$sql .= " WHERE ctt.active = 1";
 			$sql .= $this->db->order('ctt.rowid', 'ASC');
 			$resql = $this->db->query($sql);
@@ -112,7 +112,7 @@ 
 			$dataseries = array();
 			$data = array();
 			$sql = "SELECT t.type_code, COUNT(t.type_code) as nb";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
+			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 			$sql .= " WHERE t.fk_statut <> 8";
 			$sql .= " GROUP BY t.type_code";
 			$resql = $this->db->query($sql);
@@ -126,7 +126,7 @@ 
 				}
 				foreach ($listofoppcode as $rowid => $code) {
 					$dataseries[] = array(
-						'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_type', 'code', 'label', $code),
+						'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort'.$code, 'c_ticket_type', 'code', 'label', $code),
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
 					);
 				}