Dolibarr / dolibarr

htdocs/admin/tools/ui/components/index.php

Spacing +4 added lines, -4 removed lines

@@ -17,12 +17,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/agpl-3.0.html>.
  */
 
-$res=0;
-if (! $res && file_exists("../../main.inc.php")) : $res=@include '../../main.inc.php';
+$res = 0;
+if (!$res && file_exists("../../main.inc.php")) : $res = @include '../../main.inc.php';
 endif;
-if (! $res && file_exists("../../../main.inc.php")) : $res=@include '../../../main.inc.php';
+if (!$res && file_exists("../../../main.inc.php")) : $res = @include '../../../main.inc.php';
 endif;
-if (! $res && file_exists("../../../../main.inc.php")) : $res=@include '../../../../main.inc.php';
+if (!$res && file_exists("../../../../main.inc.php")) : $res = @include '../../../../main.inc.php';
 endif;
 
 // Protection if external user

htdocs/admin/tools/ui/components/badges.php

Spacing +5 added lines, -5 removed lines

@@ -17,12 +17,12 @@ 
  * along with this program. If not, see <https://www.gnu.org/licenses/agpl-3.0.html>.
  */
 
-$res=0;
-if (! $res && file_exists("../../main.inc.php")) : $res=@include '../../main.inc.php';
+$res = 0;
+if (!$res && file_exists("../../main.inc.php")) : $res = @include '../../main.inc.php';
 endif;
-if (! $res && file_exists("../../../main.inc.php")) : $res=@include '../../../main.inc.php';
+if (!$res && file_exists("../../../main.inc.php")) : $res = @include '../../../main.inc.php';
 endif;
-if (! $res && file_exists("../../../../main.inc.php")) : $res=@include '../../../../main.inc.php';
+if (!$res && file_exists("../../../../main.inc.php")) : $res = @include '../../../../main.inc.php';
 endif;
 
 // Protection if external user
@@ -43,7 +43,7 @@ 
 
 // Set view for menu and breadcrumb
 // Menu must be set in constructor of documentation class
-$documentation->view = array('Components','Badges');
+$documentation->view = array('Components', 'Badges');
 
 // Output sidebar
 $documentation->showSidebar(); ?>

htdocs/user/card.php

Spacing +10 added lines, -10 removed lines

@@ -93,7 +93,7 @@ 
 $dateendvalidity = dol_mktime(0, 0, 0, GETPOSTINT('dateendvaliditymonth'), GETPOSTINT('dateendvalidityday'), GETPOSTINT('dateendvalidityyear'));
 $dateofbirth = dol_mktime(0, 0, 0, GETPOSTINT('dateofbirthmonth'), GETPOSTINT('dateofbirthday'), GETPOSTINT('dateofbirthyear'));
 
-$childids = $user->getAllChildIds(1);	// For later, test on salary visibility
+$childids = $user->getAllChildIds(1); // For later, test on salary visibility
 
 $object = new User($db);
 $extrafields = new ExtraFields($db);
@@ -558,7 +558,7 @@ 
 						}
 					}
 
-					$ret = $object->update($user);		// This may include call to setPassword if password has changed
+					$ret = $object->update($user); // This may include call to setPassword if password has changed
 					if ($ret < 0) {
 						$error++;
 						if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -689,7 +689,7 @@ 
 	) {
 		$object->fetch($id);
 
-		$newpassword = $object->setPassword($user, '');	// This will generate a new password
+		$newpassword = $object->setPassword($user, ''); // This will generate a new password
 		if (is_int($newpassword) && $newpassword < 0) {
 			// Echec
 			setEventMessages($langs->trans("ErrorFailedToSetNewPassword"), null, 'errors');
@@ -818,7 +818,7 @@ 
 						$action = "";
 
 						$mesg = $langs->trans("ErrorProductAlreadyExists", $clone->ref);
-						$mesg .= ' <a href="' . $_SERVER["PHP_SELF"] . '?ref=' . $clone->ref . '">' . $langs->trans("ShowCardHere") . '</a>.';
+						$mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$clone->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
 						setEventMessages($mesg, null, 'errors');
 					} else {
 						setEventMessages(empty($clone->error) ? '' : $langs->trans($clone->error), $clone->errors, 'errors');
@@ -832,7 +832,7 @@ 
 				} else {
 					$db->commit();
 					$db->close();
-					header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+					header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 					exit;
 				}
 			} else {
@@ -1536,7 +1536,7 @@ 
 			$ldap = new Ldap();
 			$result = $ldap->connectBind();
 			if ($result > 0) {
-				$userSearchFilter = '(' . getDolGlobalString('LDAP_FILTER_CONNECTION').'('.$ldap->getUserIdentifier().'='.$object->login.'))';
+				$userSearchFilter = '('.getDolGlobalString('LDAP_FILTER_CONNECTION').'('.$ldap->getUserIdentifier().'='.$object->login.'))';
 				$entries = $ldap->fetch($object->login, $userSearchFilter);
 				if (!$entries) {
 					setEventMessages($ldap->error, $ldap->errors, 'errors');
@@ -2054,7 +2054,7 @@ 
 				print '<td>';
 				if (!empty($object->api_key)) {
 					print '<span class="opacitymedium">';
-					print showValueWithClipboardCPButton($object->api_key, 1, $langs->trans("Hidden"));		// TODO Add an option to also reveal the hash, not only copy paste
+					print showValueWithClipboardCPButton($object->api_key, 1, $langs->trans("Hidden")); // TODO Add an option to also reveal the hash, not only copy paste
 					print '</span>';
 				}
 				print '</td></tr>';
@@ -2108,7 +2108,7 @@ 
 						$langs->load("mails");
 						$params['attr']['title'] = $langs->trans('NoEMail');
 					}
-					print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle', '', $canSendMail, $params);
+					print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle', '', $canSendMail, $params);
 				}
 
 				if ($permissiontoedit && (!isModEnabled('multicompany') || !$user->entity || ($object->entity == $conf->entity) || (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $object->entity == 1))) {
@@ -2170,13 +2170,13 @@ 
 				if ($user->id != $id && $permissiontodisable && $object->statut == 0 &&
 				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $object->entity == 1))) {
 					unset($params['attr']['title']);
-					print dolGetButtonAction($langs->trans('Reactivate'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=enable&token='.newToken(), '', true, $params);
+					print dolGetButtonAction($langs->trans('Reactivate'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken(), '', true, $params);
 				}
 				// Disable user
 				if ($user->id != $id && $permissiontodisable && $object->statut == 1 &&
 				((!isModEnabled('multicompany') && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || (getDolGlobalString('MULTICOMPANY_TRANSVERSE_MODE') && $object->entity == 1))) {
 					unset($params['attr']['title']);
-					print dolGetButtonAction($langs->trans('DisableUser'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=disable&token='.newToken(), '', true, $params);
+					print dolGetButtonAction($langs->trans('DisableUser'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable&token='.newToken(), '', true, $params);
 				} else {
 					if ($user->id == $id) {
 						$params['attr']['title'] = $langs->trans('CantDisableYourself');

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

Spacing +16 added lines, -16 removed lines

@@ -175,7 +175,7 @@ 
 		$this->situationinvoice = false;
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -337,7 +337,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'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -451,7 +451,7 @@ 
 				// $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
 				// $tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-				$tab_top = 90 + $top_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
+				$tab_top = 90 + $top_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
 				$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.
@@ -794,11 +794,11 @@ 
 					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 (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
-							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
+							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] = 0;
 						}
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
@@ -888,7 +888,7 @@ 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs, 0, $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs));
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				// Add terms to sale
@@ -901,7 +901,7 @@ 
 						$pagecount = $pdf->setSourceFile($termsofsale);
 						for ($i = 1; $i <= $pagecount; $i++) {
 							$tplIdx = $pdf->importPage($i);
-							if ($tplIdx!==false) {
+							if ($tplIdx !== false) {
 								$s = $pdf->getTemplatesize($tplIdx);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tplIdx);
@@ -1202,7 +1202,7 @@ 
 			foreach ($this->tva_array as $tvakey => $tvaval) {
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = round((float) $tvakey, 2) . "%";
+				$titre = round((float) $tvakey, 2)."%";
 				$pdf->MultiCell(25, 4, $titre, 0, 'L');
 
 				$pdf->SetFont('', '', $default_font_size - 2);
@@ -1241,7 +1241,7 @@ 
 		}
 
 		$posxval = 52;
-		$posxend = 110;	// End of x for text 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;
 		}
@@ -1259,7 +1259,7 @@ 
 			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
-			$posy = $pdf->GetY() + 3;	// We need spaces for 2 lines payment conditions
+			$posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions
 		}
 
 		// Show category of operations
@@ -1271,7 +1271,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
@@ -1422,7 +1422,7 @@ 
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": ".$outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
 					}
 				}
 			}
@@ -1868,7 +1868,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);
 			}
@@ -2038,7 +2038,7 @@ 
 		}
 		if ($this->situationinvoice) {
 			$langs->loadLangs(array("other"));
-			$title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -";
+			$title = $outputlangs->transnoentities("PDFInvoiceSituation")." ".$outputlangs->transnoentities("NumberingShort").$object->situation_counter." -";
 		}
 		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - ';
@@ -2271,7 +2271,7 @@ 
 
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-			$mode =  'target';
+			$mode = 'target';
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), ($usecontact ? 1 : 0), $mode, $object);
 
 			// Show recipient
@@ -2326,7 +2326,7 @@ 
 				if (!empty($carac_client_shipping)) {
 					$posy += $hautcadre;
 
-					$hautcadre -= 10;	// Height for the shipping address does not need to be as high as main box
+					$hautcadre -= 10; // Height for the shipping address does not need to be as high as main box
 
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);

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

Spacing +16 added lines, -16 removed lines

@@ -161,7 +161,7 @@ 
 		$this->watermark = '';
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -363,7 +363,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'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -460,7 +460,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.
@@ -713,7 +713,7 @@ 
 					}
 
 					$pdf->setTopMargin($this->tab_top_newpage);
-					$page_bottom_margin =  $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs);
+					$page_bottom_margin = $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs);
 					$pdf->setPageOrientation('', 1, $page_bottom_margin);
 					$pageposbefore = $pdf->getPage();
 
@@ -960,11 +960,11 @@ 
 					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 (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
-							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
+							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] = 0;
 						}
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
@@ -1051,7 +1051,7 @@ 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs, 0, $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs));
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 				// Add terms to sale
 				if (!empty($mysoc->termsofsale) && getDolGlobalInt('MAIN_PDF_ADD_TERMSOFSALE_INVOICE')) {
@@ -1063,7 +1063,7 @@ 
 						$pagecount = $pdf->setSourceFile($termsofsale);
 						for ($i = 1; $i <= $pagecount; $i++) {
 							$tplIdx = $pdf->importPage($i);
-							if ($tplIdx!==false) {
+							if ($tplIdx !== false) {
 								$s = $pdf->getTemplatesize($tplIdx);
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tplIdx);
@@ -1302,7 +1302,7 @@ 
 			foreach ($this->tva_array as $tvakey => $tvaval) {
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = round((float) $tvakey, 2) . "%";
+				$titre = round((float) $tvakey, 2)."%";
 				$pdf->MultiCell(25, 4, $titre, 0, 'L');
 
 				$pdf->SetFont('', '', $default_font_size - 2);
@@ -1340,8 +1340,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;
 		}
@@ -1371,7 +1371,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
@@ -1549,7 +1549,7 @@ 
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": ".$outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
 					}
 				}
 			}
@@ -2171,7 +2171,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);
 			}
@@ -2287,7 +2287,7 @@ 
 		}
 		if ($this->situationinvoice) {
 			$langs->loadLangs(array("other"));
-			$title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -";
+			$title = $outputlangs->transnoentities("PDFInvoiceSituation")." ".$outputlangs->transnoentities("NumberingShort").$object->situation_counter." -";
 		}
 		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
 			$title .= ' - ';
@@ -2575,7 +2575,7 @@ 
 				if (!empty($carac_client_shipping)) {
 					$posy += $hautcadre;
 
-					$hautcadre -= 10;	// Height for the shipping address does not need to be as high as main box
+					$hautcadre -= 10; // Height for the shipping address does not need to be as high as main box
 
 					// Show shipping frame
 					$pdf->SetXY($posx + 2, $posy - 5);

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

Spacing +51 added lines, -51 removed lines

@@ -78,7 +78,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
@@ -247,7 +247,7 @@ 
 		}
 
 		if ($mysoc === null) {
-			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'. getCallerInfoString(), LOG_ERR);
+			dol_syslog(get_class($this).'::__construct() Global $mysoc should not be null.'.getCallerInfoString(), LOG_ERR);
 			return;
 		}
 
@@ -297,7 +297,7 @@ 
 			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies", "compta"));
 		}
 
-		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;
 		}
@@ -416,15 +416,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);
@@ -438,7 +438,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);
 				}
 
@@ -530,7 +530,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.
@@ -1040,11 +1040,11 @@ 
 					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 (getDolGlobalInt('PDF_INVOICE_SHOW_VAT_ANALYSIS')) {
 						if (empty($this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'])) {
-							$this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['tot_ht'] = 0;
+							$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] = 0;
 						}
 						$this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')] = array('vatrate'=>$vatrate, 'vatcode'=>$vatcode, 'amount'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['amount'] + $tvaligne, 'tot_ht'=> $this->tva_array[$vatrate.($vatcode ? ' ('.$vatcode.')' : '')]['tot_ht'] + $object->lines[$i]->total_ht);
 					} else {
@@ -1136,7 +1136,7 @@ 
 				// Pagefoot
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) {
-					$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+					$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 				}
 
 				$this->resumeLastPage($pdf, $object, 0, $tab_top, $outputlangs, $outputlangsbis);
@@ -1369,7 +1369,7 @@ 
 			foreach ($this->tva_array as $tvakey => $tvaval) {
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
-				$titre = round((float) $tvakey, 2) . "%";
+				$titre = round((float) $tvakey, 2)."%";
 				$pdf->MultiCell(25, 4, $titre, 0, 'L');
 
 				$pdf->SetFont('', '', $default_font_size - 2);
@@ -1407,8 +1407,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;
 		}
@@ -1438,7 +1438,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
@@ -1605,7 +1605,7 @@ 
 						include_once DOL_DOCUMENT_ROOT.'/core/lib/functions_be.lib.php';
 						$invoicePaymentKey = dolBECalculateStructuredCommunication($object->ref, $object->type);
 
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": " . $outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": ".$outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', 0);
 					}
 				}
 			}
@@ -1791,7 +1791,7 @@ 
 						if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 							$vatrate .= '*';
 						}
-						if (! isset($tvas[$vatrate])) {
+						if (!isset($tvas[$vatrate])) {
 							$tvas[$vatrate] = 0;
 						}
 						$tvas[$vatrate] += $tvaligne;
@@ -2060,7 +2060,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);
 			}
@@ -2080,7 +2080,7 @@ 
 		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Output Rect
-		$this->printRoundedRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $this->corner_radius, $hidetop, $hidebottom, 'D');	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRoundedRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $this->corner_radius, $hidetop, $hidebottom, 'D'); // Rect prend une longueur en 3eme param et 4eme param
 
 		// situation invoice
 		$pdf->SetFont('', '', $default_font_size - 2);
@@ -2120,7 +2120,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
 		}
 	}
 
@@ -2697,7 +2697,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
 			),
 		);
@@ -2722,13 +2722,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;
 		}
 
@@ -2743,7 +2743,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;
 		}
 
@@ -2758,9 +2758,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
 			),
 		);
@@ -2885,7 +2885,7 @@ 
 
 		// Output Rect
 		// KEEPTHIS => Affiche les bords extérieurs
-		$this->printRoundedRectBtp($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $this->corner_radius, $hidetop, $hidebottom, 'D');	// Rect prend une longueur en 3eme param et 4eme param
+		$this->printRoundedRectBtp($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $this->corner_radius, $hidetop, $hidebottom, 'D'); // 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)) {
@@ -2942,7 +2942,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 {
@@ -3006,7 +3006,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 {
@@ -3086,7 +3086,7 @@ 
 
 		$TDataSituation = array();
 
-		if (! empty($facDerniereSituation)) {
+		if (!empty($facDerniereSituation)) {
 			$TDataSituation['derniere_situation'] = $facDerniereSituation;
 			$TDataSituation['date_derniere_situation'] = $facDerniereSituation->date;
 		}
@@ -3095,9 +3095,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
@@ -3127,7 +3127,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;
 					}
 
@@ -3137,7 +3137,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 {
@@ -3149,14 +3149,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();
 			}
 
@@ -3170,7 +3170,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);
@@ -3365,7 +3365,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);
@@ -3383,16 +3383,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;
 		}
@@ -3526,7 +3526,7 @@ 
 			$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);
@@ -3569,7 +3569,7 @@ 
 
 		$force_to_zero = false;
 
-		$idinv = 0;//count($previousinvoices);
+		$idinv = 0; //count($previousinvoices);
 		while ($idinv < count($previousinvoices)) {
 			$invoice = $previousinvoices[$idinv];
 
@@ -3591,7 +3591,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);
 
@@ -3622,7 +3622,7 @@ 
 				if (($invoice->lines[$i]->info_bits & 0x01) == 0x01) {
 					$vatrate .= '*';
 				}
-				if (! isset($tvas[$vatrate])) {
+				if (!isset($tvas[$vatrate])) {
 					$tvas[$vatrate] = 0;
 				}
 				$tvas[$vatrate] += $tvaligne;
@@ -3800,7 +3800,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);
@@ -3831,7 +3831,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 {
@@ -3863,7 +3863,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/comm/propal/card.php

Spacing +38 added lines, -38 removed lines

@@ -228,7 +228,7 @@ 
 							$object->delivery_date = $date_delivery;
 							foreach ($object->lines as $line) {
 								if (isset($line->date_start)) {
-									$line->date_start +=  $difference;
+									$line->date_start += $difference;
 								}
 								if (isset($line->date_end)) {
 									$line->date_end += $difference;
@@ -576,7 +576,7 @@ 
 
 						$classname = ucfirst($subelement);
 						$srcobject = new $classname($db);
-						'@phan-var-force Commande|Propal|Contrat|Fichinter|Expedition $srcobject';  // Can be other class, but CommonObject is too generic
+						'@phan-var-force Commande|Propal|Contrat|Fichinter|Expedition $srcobject'; // Can be other class, but CommonObject is too generic
 
 						dol_syslog("Try to find source object origin=".$object->origin." originid=".$object->origin_id." to add lines");
 						$result = $srcobject->fetch($object->origin_id);
@@ -766,7 +766,7 @@ 
 					$error++;
 				} else {
 					// Needed if object linked modified by trigger (because linked objects can't be fetched two times : linkedObjectsFullLoaded)
-					$locationTarget = DOL_URL_ROOT . '/comm/propal/card.php?id=' . $object->id;
+					$locationTarget = DOL_URL_ROOT.'/comm/propal/card.php?id='.$object->id;
 				}
 
 				$deposit = null;
@@ -777,7 +777,7 @@ 
 					!$error && GETPOSTINT('statut') == $object::STATUS_SIGNED && GETPOST('generate_deposit') == 'on'
 					&& !empty($deposit_percent_from_payment_terms) && isModEnabled('invoice') && $user->hasRight('facture', 'creer')
 				) {
-					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 					$date = dol_mktime(0, 0, 0, GETPOSTINT('datefmonth'), GETPOSTINT('datefday'), GETPOSTINT('datefyear'));
 					$forceFields = array();
@@ -790,7 +790,7 @@ 
 
 					if ($deposit) {
 						setEventMessage('DepositGenerated');
-						$locationTarget = DOL_URL_ROOT . '/compta/facture/card.php?id=' . $deposit->id;
+						$locationTarget = DOL_URL_ROOT.'/compta/facture/card.php?id='.$deposit->id;
 					} else {
 						$error++;
 						setEventMessages("Failed to create down payment - ".$object->error, $object->errors, 'errors');
@@ -818,7 +818,7 @@ 
 					}
 
 					if ($locationTarget) {
-						header('Location: ' . $locationTarget);
+						header('Location: '.$locationTarget);
 						exit;
 					}
 				} else {
@@ -1164,8 +1164,8 @@ 
 							$pricebycustomerexist = true;
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-							$price_min =  price($prodcustprice->lines[0]->price_min);
-							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
+							$price_min = price($prodcustprice->lines[0]->price_min);
+							$price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							/*$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
@@ -1221,8 +1221,8 @@ 
 						if (count($prodcustprice->lines) > 0) {
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
-							$price_min =  price($prodcustprice->lines[0]->price_min);
-							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
+							$price_min = price($prodcustprice->lines[0]->price_min);
+							$price_min_ttc = price($prodcustprice->lines[0]->price_min_ttc);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							/*$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
@@ -1730,8 +1730,8 @@ 
 	} elseif ($action == 'setconditions' && $usercancreate) {
 		// Terms of payment
 		$sql = "SELECT code ";
-		$sql .= "FROM " . $db->prefix() . "c_payment_term";
-		$sql .= " WHERE rowid = " . ((int) GETPOST('cond_reglement_id', 'int'));
+		$sql .= "FROM ".$db->prefix()."c_payment_term";
+		$sql .= " WHERE rowid = ".((int) GETPOST('cond_reglement_id', 'int'));
 		$result = $db->query($sql);
 		if ($result) {
 			$obj = $db->fetch_object($result);
@@ -1908,7 +1908,7 @@ 
 
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
-			'@phan-var-force Commande|Propal|Contrat|Expedition $objectsrc';  // Can be other class, but CommonObject is too generic
+			'@phan-var-force Commande|Propal|Contrat|Expedition $objectsrc'; // Can be other class, but CommonObject is too generic
 			$objectsrc->fetch($originid);
 			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines')) {
 				$objectsrc->fetch_lines();
@@ -1983,7 +1983,7 @@ 
 	print '<form name="addprop" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	print '<input type="hidden" name="changecompany" value="0">';	// will be set to 1 by javascript so we know post is done after a company change
+	print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	if ($origin != 'project' && $originid) {
 		print '<input type="hidden" name="origin" value="'.$origin.'">';
@@ -2145,7 +2145,7 @@ 
 			$sday = date("d", $tmpdte);
 			print $form->selectDate($syear."-".$smonth."-".$sday, 'date_livraison', 0, 0, 0, "addprop");
 		} else {
-			$tmp_date_delivery = GETPOST('date_delivery') ? : -1;
+			$tmp_date_delivery = GETPOST('date_delivery') ?: -1;
 			print $form->selectDate($tmp_date_delivery, 'date_livraison', 0, 0, 0, "addprop", 1, 1);
 		}
 		print '</td></tr>';
@@ -2377,7 +2377,7 @@ 
 		if (!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
 			$formquestion[] = array('type' => 'select', 'name' => 'statut', 'label' => '<span class="fieldrequired">'.$langs->trans("CloseAs").'</span>', 'values' => array($object::STATUS_SIGNED => $object->LibStatut($object::STATUS_SIGNED), $object::STATUS_NOTSIGNED => $object->LibStatut($object::STATUS_NOTSIGNED)));
 		}
-		$formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '');				// Field to complete private note (not replace)
+		$formquestion[] = array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => ''); // Field to complete private note (not replace)
 
 		if (getDolGlobalInt('PROPOSAL_SUGGEST_DOWN_PAYMENT_INVOICE_CREATION')) {
 			// This is a hidden option:
@@ -2387,7 +2387,7 @@ 
 			$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
 			if (!empty($deposit_percent_from_payment_terms) && isModEnabled('invoice') && $user->hasRight('facture', 'creer')) {
-				require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 				$object->fetchObjectLinked();
 
@@ -2471,7 +2471,7 @@ 
 						'type' => 'onecolumn',
 						'value' => '
 							<script>
-								let signedValue = ' . $object::STATUS_SIGNED . ';
+								let signedValue = ' . $object::STATUS_SIGNED.';
 
 								$(document).ready(function() {
 									$("[name=generate_deposit]").change(function () {
@@ -2521,7 +2521,7 @@ 
 		if (!getDolGlobalString('PROPAL_SKIP_ACCEPT_REFUSE')) {
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('SetAcceptedRefused'), '', 'confirm_closeas', $formquestion, '', 1, 250);
 		} else {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?statut=3&id=' . $object->id, $langs->trans('Close'), '', 'confirm_closeas', $formquestion, '', 1, 250);
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?statut=3&id='.$object->id, $langs->trans('Close'), '', 'confirm_closeas', $formquestion, '', 1, 250);
 		}
 	} elseif ($action == 'cancel') {
 		// Confirm cancel
@@ -2563,7 +2563,7 @@ 
 		$nbMandated = 0;
 		foreach ($object->lines as $line) {
 			$res = $line->fetch_product();
-			if ($res  > 0) {
+			if ($res > 0) {
 				if ($line->product->isService() && $line->product->isMandatoryPeriod() && (empty($line->date_start) || empty($line->date_end))) {
 					$nbMandated++;
 					break;
@@ -2604,7 +2604,7 @@ 
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer
 	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string', '', 0, 1);
-	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $usercancreate, 'string'.(isset($conf->global->THIRDPARTY_REF_INPUT_SIZE) ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 	// Thirdparty
 	$morehtmlref .= '<br>'.$soc->getNomUrl(1, 'customer');
 	if (!getDolGlobalString('MAIN_DISABLE_OTHER_LINK') && $soc->id > 0) {
@@ -2946,50 +2946,50 @@ 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/object_currency_amount.tpl.php';
 
 		print '<tr>';
-		print '<td class="titlefieldmiddle">' . $langs->trans('AmountHT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ht, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
+		print '<td class="nowrap amountcard right">'.price($object->total_ht, 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ht, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ht, 0, $langs, 1, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		print '<tr>';
-		print '<td>' . $langs->trans('AmountVAT') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_tva, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<td>'.$langs->trans('AmountVAT').'</td>';
+		print '<td class="nowrap amountcard right">'.price($object->total_tva, 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_tva, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_tva, 0, $langs, 1, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) {
 			print '<tr>';
-			print '<td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_localtax1, 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 				$object->multicurrency_total_localtax1 = price2num($object->total_localtax1 * $object->multicurrency_tx, 'MT');
 
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_localtax1, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_localtax1, 0, $langs, 1, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 		}
 
 		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) {
 			print '<tr>';
-			print '<td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
-			print '<td class="nowrap amountcard right">' . price($object->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
+			print '<td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
+			print '<td class="nowrap amountcard right">'.price($object->total_localtax2, 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 			if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 				$object->multicurrency_total_localtax2 = price2num($object->total_localtax2 * $object->multicurrency_tx, 'MT');
 
-				print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_localtax2, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+				print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_localtax2, 0, $langs, 1, -1, -1, $object->multicurrency_code).'</td>';
 			}
 			print '</tr>';
 		}
 
 		print '<tr>';
-		print '<td>' . $langs->trans('AmountTTC') . '</td>';
-		print '<td class="nowrap amountcard right">' . price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '<td>'.$langs->trans('AmountTTC').'</td>';
+		print '<td class="nowrap amountcard right">'.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</td>';
 		if (isModEnabled("multicurrency") && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
-			print '<td class="nowrap amountcard right">' . price($object->multicurrency_total_ttc, 0, $langs, 1, -1, -1, $object->multicurrency_code) . '</td>';
+			print '<td class="nowrap amountcard right">'.price($object->multicurrency_total_ttc, 0, $langs, 1, -1, -1, $object->multicurrency_code).'</td>';
 		}
 		print '</tr>';
 
@@ -3207,8 +3207,8 @@ 
 				} else {
 					// Set not signed (close)
 					if ($object->statut == Propal::STATUS_DRAFT && $usercanclose) {
-						print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&token='.newToken().'&action=closeas&token='.newToken() . (!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#close') . '"';
-						print '>' . $langs->trans('SetRefusedAndClose') . '</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&token='.newToken().'&action=closeas&token='.newToken().(!getDolGlobalString('MAIN_JUMP_TAG') ? '' : '#close').'"';
+						print '>'.$langs->trans('SetRefusedAndClose').'</a>';
 					}
 				}
 

htdocs/includes/parsedown/Parsedown.php

Spacing +59 added lines, -59 removed lines

@@ -205,7 +205,7 @@ 
 
 			if (isset($CurrentBlock['continuable']))
 			{
-				$methodName = 'block' . $CurrentBlock['type'] . 'Continue';
+				$methodName = 'block'.$CurrentBlock['type'].'Continue';
 				$Block = $this->$methodName($Line, $CurrentBlock);
 
 				if (isset($Block))
@@ -218,7 +218,7 @@ 
 				{
 					if ($this->isBlockCompletable($CurrentBlock['type']))
 					{
-						$methodName = 'block' . $CurrentBlock['type'] . 'Complete';
+						$methodName = 'block'.$CurrentBlock['type'].'Complete';
 						$CurrentBlock = $this->$methodName($CurrentBlock);
 					}
 				}
@@ -236,7 +236,7 @@ 
 			{
 				foreach ($this->BlockTypes[$marker] as $blockType)
 				{
-					$blockTypes []= $blockType;
+					$blockTypes [] = $blockType;
 				}
 			}
 
@@ -251,7 +251,7 @@ 
 				{
 					$Block['type'] = $blockType;
 
-					if ( ! isset($Block['identified']))
+					if (!isset($Block['identified']))
 					{
 						if (isset($CurrentBlock))
 						{
@@ -300,7 +300,7 @@ 
 
 		if (isset($CurrentBlock['continuable']) and $this->isBlockCompletable($CurrentBlock['type']))
 		{
-			$methodName = 'block' . $CurrentBlock['type'] . 'Complete';
+			$methodName = 'block'.$CurrentBlock['type'].'Complete';
 			$CurrentBlock = $this->$methodName($CurrentBlock);
 		}
 
@@ -318,7 +318,7 @@ 
 
 	protected function extractElement(array $Component)
 	{
-		if ( ! isset($Component['element']))
+		if (!isset($Component['element']))
 		{
 			if (isset($Component['markup']))
 			{
@@ -335,12 +335,12 @@ 
 
 	protected function isBlockContinuable($Type)
 	{
-		return method_exists($this, 'block' . $Type . 'Continue');
+		return method_exists($this, 'block'.$Type.'Continue');
 	}
 
 	protected function isBlockCompletable($Type)
 	{
-		return method_exists($this, 'block' . $Type . 'Complete');
+		return method_exists($this, 'block'.$Type.'Complete');
 	}
 
 	#
@@ -348,7 +348,7 @@ 
 
 	protected function blockCode($Line, $Block = null)
 	{
-		if (isset($Block) and $Block['type'] === 'Paragraph' and ! isset($Block['interrupted']))
+		if (isset($Block) and $Block['type'] === 'Paragraph' and !isset($Block['interrupted']))
 		{
 			return;
 		}
@@ -432,7 +432,7 @@ 
 			return;
 		}
 
-		$Block['element']['rawHtml'] .= "\n" . $Line['body'];
+		$Block['element']['rawHtml'] .= "\n".$Line['body'];
 
 		if (strpos($Line['text'], '-->') !== false)
 		{
@@ -523,7 +523,7 @@ 
 				return $Block;
 			}
 
-			$Block['element']['element']['text'] .= "\n" . $Line['body'];
+			$Block['element']['element']['text'] .= "\n".$Line['body'];
 
 			return $Block;
 	}
@@ -556,7 +556,7 @@ 
 
 		$Block = array(
 			'element' => array(
-				'name' => 'h' . $level,
+				'name' => 'h'.$level,
 				'handler' => array(
 					'function' => 'lineElements',
 					'argument' => $text,
@@ -583,7 +583,7 @@ 
 			{
 				$contentIndent -= 1;
 				$matches[1] = substr($matches[1], 0, -$contentIndent);
-				$matches[3] = str_repeat(' ', $contentIndent) . $matches[3];
+				$matches[3] = str_repeat(' ', $contentIndent).$matches[3];
 			}
 			elseif ($contentIndent === 0)
 			{
@@ -616,7 +616,7 @@ 
 					if (
 						isset($CurrentBlock)
 						and $CurrentBlock['type'] === 'Paragraph'
-						and ! isset($CurrentBlock['interrupted'])
+						and !isset($CurrentBlock['interrupted'])
 						) {
 							return;
 						}
@@ -634,7 +634,7 @@ 
 				)
 			);
 
-			$Block['element']['elements'] []= & $Block['li'];
+			$Block['element']['elements'] [] = & $Block['li'];
 
 			return $Block;
 		}
@@ -662,7 +662,7 @@ 
 			) {
 				if (isset($Block['interrupted']))
 				{
-					$Block['li']['handler']['argument'] []= '';
+					$Block['li']['handler']['argument'] [] = '';
 
 					$Block['loose'] = true;
 
@@ -684,7 +684,7 @@ 
 					)
 				);
 
-				$Block['element']['elements'] []= & $Block['li'];
+				$Block['element']['elements'] [] = & $Block['li'];
 
 				return $Block;
 			}
@@ -702,7 +702,7 @@ 
 			{
 				if (isset($Block['interrupted']))
 				{
-					$Block['li']['handler']['argument'] []= '';
+					$Block['li']['handler']['argument'] [] = '';
 
 					$Block['loose'] = true;
 
@@ -711,16 +711,16 @@ 
 
 				$text = substr($Line['body'], $requiredIndent);
 
-				$Block['li']['handler']['argument'] []= $text;
+				$Block['li']['handler']['argument'] [] = $text;
 
 				return $Block;
 			}
 
-			if ( ! isset($Block['interrupted']))
+			if (!isset($Block['interrupted']))
 			{
 				$text = preg_replace('/^[ ]{0,'.$requiredIndent.'}+/', '', $Line['body']);
 
-				$Block['li']['handler']['argument'] []= $text;
+				$Block['li']['handler']['argument'] [] = $text;
 
 				return $Block;
 			}
@@ -734,7 +734,7 @@ 
 			{
 				if (end($li['handler']['argument']) !== '')
 				{
-					$li['handler']['argument'] []= '';
+					$li['handler']['argument'] [] = '';
 				}
 			}
 		}
@@ -773,14 +773,14 @@ 
 
 		if ($Line['text'][0] === '>' and preg_match('/^>[ ]?+(.*+)/', $Line['text'], $matches))
 		{
-			$Block['element']['handler']['argument'] []= $matches[1];
+			$Block['element']['handler']['argument'] [] = $matches[1];
 
 			return $Block;
 		}
 
-		if ( ! isset($Block['interrupted']))
+		if (!isset($Block['interrupted']))
 		{
-			$Block['element']['handler']['argument'] []= $Line['text'];
+			$Block['element']['handler']['argument'] [] = $Line['text'];
 
 			return $Block;
 		}
@@ -810,7 +810,7 @@ 
 
 	protected function blockSetextHeader($Line, $Block = null)
 	{
-		if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted']))
+		if (!isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted']))
 		{
 			return;
 		}
@@ -861,7 +861,7 @@ 
 			return;
 		}
 
-		$Block['element']['rawHtml'] .= "\n" . $Line['body'];
+		$Block['element']['rawHtml'] .= "\n".$Line['body'];
 
 		return $Block;
 	}
@@ -896,7 +896,7 @@ 
 
 	protected function blockTable($Line, array $Block = null)
 	{
-		if ( ! isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted']))
+		if (!isset($Block) or $Block['type'] !== 'Paragraph' or isset($Block['interrupted']))
 		{
 			return;
 		}
@@ -945,7 +945,7 @@ 
 					$alignment = $alignment === 'left' ? 'center' : 'right';
 				}
 
-				$alignments []= $alignment;
+				$alignments [] = $alignment;
 			}
 
 			# ~
@@ -986,7 +986,7 @@ 
 					);
 				}
 
-				$HeaderElements []= $HeaderElement;
+				$HeaderElements [] = $HeaderElement;
 			}
 
 			# ~
@@ -1000,16 +1000,16 @@ 
 				),
 			);
 
-			$Block['element']['elements'] []= array(
+			$Block['element']['elements'] [] = array(
 				'name' => 'thead',
 			);
 
-			$Block['element']['elements'] []= array(
+			$Block['element']['elements'] [] = array(
 				'name' => 'tbody',
 				'elements' => array(),
 			);
 
-			$Block['element']['elements'][0]['elements'] []= array(
+			$Block['element']['elements'][0]['elements'] [] = array(
 				'name' => 'tr',
 				'elements' => $HeaderElements,
 			);
@@ -1053,11 +1053,11 @@ 
 				if (isset($Block['alignments'][$index]))
 				{
 					$Element['attributes'] = array(
-						'style' => 'text-align: ' . $Block['alignments'][$index] . ';',
+						'style' => 'text-align: '.$Block['alignments'][$index].';',
 					);
 				}
 
-				$Elements []= $Element;
+				$Elements [] = $Element;
 			}
 
 			$Element = array(
@@ -1065,7 +1065,7 @@ 
 				'elements' => $Elements,
 			);
 
-			$Block['element']['elements'][1]['elements'] []= $Element;
+			$Block['element']['elements'][1]['elements'] [] = $Element;
 
 			return $Block;
 		}
@@ -1165,7 +1165,7 @@ 
 
 				$Inline = $this->{"inline$inlineType"}($Excerpt);
 
-				if ( ! isset($Inline))
+				if (!isset($Inline))
 				{
 					continue;
 				}
@@ -1179,7 +1179,7 @@ 
 
 				# sets a default inline position
 
-				if ( ! isset($Inline['position']))
+				if (!isset($Inline['position']))
 				{
 					$Inline['position'] = $markerPosition;
 				}
@@ -1223,7 +1223,7 @@ 
 
 		foreach ($Elements as &$Element)
 		{
-			if ( ! isset($Element['autobreak']))
+			if (!isset($Element['autobreak']))
 			{
 				$Element['autobreak'] = false;
 			}
@@ -1279,14 +1279,14 @@ 
 		$hostnameLabel = '[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?';
 
 		$commonMarkEmail = '[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]++@'
-			. $hostnameLabel . '(?:\.' . $hostnameLabel . ')*';
+			. $hostnameLabel.'(?:\.'.$hostnameLabel.')*';
 
 			if (strpos($Excerpt['text'], '>') !== false
 				and preg_match("/^<((mailto:)?$commonMarkEmail)>/i", $Excerpt['text'], $matches)
-				){
+				) {
 					$url = $matches[1];
 
-					if ( ! isset($matches[2]))
+					if (!isset($matches[2]))
 					{
 						$url = "mailto:$url";
 					}
@@ -1306,7 +1306,7 @@ 
 
 	protected function inlineEmphasis($Excerpt)
 	{
-		if ( ! isset($Excerpt['text'][1]))
+		if (!isset($Excerpt['text'][1]))
 		{
 			return;
 		}
@@ -1352,12 +1352,12 @@ 
 
 	protected function inlineImage($Excerpt)
 	{
-		if ( ! isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
+		if (!isset($Excerpt['text'][1]) or $Excerpt['text'][1] !== '[')
 		{
 			return;
 		}
 
-		$Excerpt['text']= substr($Excerpt['text'], 1);
+		$Excerpt['text'] = substr($Excerpt['text'], 1);
 
 		$Link = $this->inlineLink($Excerpt);
 
@@ -1443,7 +1443,7 @@ 
 				$definition = strtolower($Element['handler']['argument']);
 			}
 
-			if ( ! isset($this->DefinitionData['Reference'][$definition]))
+			if (!isset($this->DefinitionData['Reference'][$definition]))
 			{
 				return;
 			}
@@ -1498,7 +1498,7 @@ 
 			and preg_match('/^&(#?+[0-9a-zA-Z]++);/', $Excerpt['text'], $matches)
 			) {
 				return array(
-					'element' => array('rawHtml' => '&' . $matches[1] . ';'),
+					'element' => array('rawHtml' => '&'.$matches[1].';'),
 					'extent' => strlen($matches[0]),
 				);
 			}
@@ -1508,7 +1508,7 @@ 
 
 	protected function inlineStrikethrough($Excerpt)
 	{
-		if ( ! isset($Excerpt['text'][1]))
+		if (!isset($Excerpt['text'][1]))
 		{
 			return;
 		}
@@ -1531,7 +1531,7 @@ 
 
 	protected function inlineUrl($Excerpt)
 	{
-		if ($this->urlsLinked !== true or ! isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
+		if ($this->urlsLinked !== true or !isset($Excerpt['text'][2]) or $Excerpt['text'][2] !== '/')
 		{
 			return;
 		}
@@ -1702,7 +1702,7 @@ 
 
 		if ($hasName)
 		{
-			$markup .= '<' . $Element['name'];
+			$markup .= '<'.$Element['name'];
 
 			if (isset($Element['attributes']))
 			{
@@ -1760,7 +1760,7 @@ 
 				}
 			}
 
-			$markup .= $hasName ? '</' . $Element['name'] . '>' : '';
+			$markup .= $hasName ? '</'.$Element['name'].'>' : '';
 		}
 		elseif ($hasName)
 		{
@@ -1789,7 +1789,7 @@ 
 			// (autobreak === false) covers both sides of an element
 			$autoBreak = !$autoBreak ? $autoBreak : $autoBreakNext;
 
-			$markup .= ($autoBreak ? "\n" : '') . $this->element($Element);
+			$markup .= ($autoBreak ? "\n" : '').$this->element($Element);
 			$autoBreak = $autoBreakNext;
 		}
 
@@ -1804,7 +1804,7 @@ 
 	{
 		$Elements = $this->linesElements($lines);
 
-		if ( ! in_array('', $lines)
+		if (!in_array('', $lines)
 			and isset($Elements[0]) and isset($Elements[0]['name'])
 			and $Elements[0]['name'] === 'p'
 			) {
@@ -1861,12 +1861,12 @@ 
 	protected function sanitiseElement(array $Element)
 	{
 		static $goodAttribute = '/^[a-zA-Z0-9][a-zA-Z0-9-_]*+$/';
-		static $safeUrlNameToAtt  = array(
+		static $safeUrlNameToAtt = array(
 			'a'   => 'href',
 			'img' => 'src',
 		);
 
-		if ( ! isset($Element['name']))
+		if (!isset($Element['name']))
 		{
 			unset($Element['attributes']);
 			return $Element;
@@ -1877,12 +1877,12 @@ 
 			$Element = $this->filterUnsafeUrlInAttribute($Element, $safeUrlNameToAtt[$Element['name']]);
 		}
 
-		if ( ! empty($Element['attributes']))
+		if (!empty($Element['attributes']))
 		{
 			foreach ($Element['attributes'] as $att => $val)
 			{
 				# filter out badly parsed attribute
-				if ( ! preg_match($goodAttribute, $att))
+				if (!preg_match($goodAttribute, $att))
 				{
 					unset($Element['attributes'][$att]);
 				}
@@ -1983,8 +1983,8 @@ 
 	protected $textLevelElements = array(
 		'a', 'br', 'bdo', 'abbr', 'blink', 'nextid', 'acronym', 'basefont',
 		'b', 'em', 'big', 'cite', 'small', 'spacer', 'listing',
-		'i', 'rp', 'del', 'code',          'strike', 'marquee',
-		'q', 'rt', 'ins', 'font',          'strong',
+		'i', 'rp', 'del', 'code', 'strike', 'marquee',
+		'q', 'rt', 'ins', 'font', 'strong',
 		's', 'tt', 'kbd', 'mark',
 		'u', 'xm', 'sub', 'nobr',
 		'sup', 'ruby',

htdocs/install/upgrade2.php

Spacing +5 added lines, -5 removed lines

@@ -4225,7 +4225,7 @@ 
 
 	if (!is_object($user)) {
 		include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-		$user = new User($db);	// To avoid error during migration
+		$user = new User($db); // To avoid error during migration
 	}
 
 	dolibarr_install_syslog("upgrade2::migrate_reload_modules force=".$force.", listofmodule=".implode(',', array_keys($listofmodule)));
@@ -4402,7 +4402,7 @@ 
 	$sql = "SELECT rowid , entity, batch, fk_product from ".MAIN_DB_PREFIX."product_lot";
 	$resql = $db->query($sql);
 	if ($resql) {
-		$modulepart="product_batch";
+		$modulepart = "product_batch";
 		while ($obj = $db->fetch_object($resql)) {
 			$entity = (empty($obj->entity) ? 1 : $obj->entity);
 			if ($entity > 1) {
@@ -4416,10 +4416,10 @@ 
 
 			if ($dir && $res > 0) {
 				$lot->ref = $obj->batch;
-				$origin = $dir . '/' . get_exdir(0, 0, 0, 1, $lot, $modulepart);
+				$origin = $dir.'/'.get_exdir(0, 0, 0, 1, $lot, $modulepart);
 
 				$lot->fetch($obj->rowid, $obj->fk_product, $obj->batch);
-				$destin = $dir . '/' . get_exdir(0, 0, 0, 1, $lot, $modulepart);
+				$destin = $dir.'/'.get_exdir(0, 0, 0, 1, $lot, $modulepart);
 
 				if (dol_is_dir($origin) && !dol_is_dir($destin)) {
 					dol_move_dir($origin, $destin, 0);
@@ -5102,7 +5102,7 @@ 
 				$error++;
 			}
 
-			$current_contract =  $obj->cid;
+			$current_contract = $obj->cid;
 		}
 	} else {
 		$error++;