Dolibarr / dolibarr

htdocs/takepos/public/auto_order.php

Spacing +3 added lines, -3 removed lines

@@ -38,12 +38,12 @@
 	accessforbidden('Auto order is not allowed'); // If Auto Order is disabled never allow access to this page (that is a NO LOGIN access)
 }
 
-$_SESSION["basiclayout"] = 1;	// For the simple layout for public submission
-$_SESSION["takeposterminal"] = getDolGlobalInt('TAKEPOS_TERMINAL_NB_FOR_PUBLIC', 1);	// Default terminal for public submission is 1
+$_SESSION["basiclayout"] = 1; // For the simple layout for public submission
+$_SESSION["takeposterminal"] = getDolGlobalInt('TAKEPOS_TERMINAL_NB_FOR_PUBLIC', 1); // Default terminal for public submission is 1
 
 define('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE', 1);
 if (GETPOSTISSET("mobilepage")) {
-	require DOL_DOCUMENT_ROOT.'/takepos/invoice.php';	// The section with list of selected products in order
+	require DOL_DOCUMENT_ROOT.'/takepos/invoice.php'; // The section with list of selected products in order
 } elseif (GETPOSTISSET("genimg")) {
 	require DOL_DOCUMENT_ROOT.'/takepos/genimg/index.php';
 } else {

htdocs/user/group/card.php

Spacing +4 added lines, -4 removed lines

@@ -139,7 +139,7 @@ 
 		} else {
 			$object->name	= GETPOST("nom", 'alphanohtml');
 			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
-			$object->color	= GETPOST("color", 'alphanohtml');
+			$object->color = GETPOST("color", 'alphanohtml');
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -180,7 +180,7 @@ 
 	if (($action == 'adduser' || $action == 'removeuser') && $permissiontoedit) {
 		if ($userid > 0) {
 			$object->fetch($id);
-			$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 
 			$edituser = new User($db);
 			$edituser->fetch($userid);
@@ -206,7 +206,7 @@ 
 
 		$object->fetch($id);
 
-		$object->oldcopy = clone $object;  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = clone $object; // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$object->name = GETPOST("nom", 'alphanohtml');
 		$object->note = dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
@@ -458,7 +458,7 @@ 
 				print '<td class="liste_titre right" width="5">&nbsp;</td>';
 				print "</tr>\n";
 
-				$object->fetch($object->id, '', true);	// true to force load of all users, member of the group
+				$object->fetch($object->id, '', true); // true to force load of all users, member of the group
 
 				if (!empty($object->members)) {
 					foreach ($object->members as $useringroup) {

htdocs/adherents/card.php

Spacing +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
-$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');	// if not set, $backtopage will be used
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha'); // if not set, $backtopage will be used
 $confirm = GETPOST('confirm', 'alpha');
 $rowid = GETPOSTINT('rowid');
 $id = GETPOST('id') ? GETPOSTINT('id') : $rowid;
@@ -276,7 +276,7 @@ 
 	}
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('adherent', 'creer')) {
 		$member_origin_id = GETPOSTINT('member_origin');
-		$member_origin = new Adherent($db);		// The thirdparty that we will delete
+		$member_origin = new Adherent($db); // The thirdparty that we will delete
 
 		if ($member_origin_id <= 0) {
 			$langs->load('errors');
@@ -335,7 +335,7 @@ 
 		}
 		// Create new object
 		if ($result > 0 && !$error) {
-			$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+			$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 			// Change values
 			$object->civility_id = trim(GETPOST("civility_id", 'alphanohtml'));
@@ -344,7 +344,7 @@ 
 			$object->gender      = trim(GETPOST("gender", 'alphanohtml'));
 			$object->login       = trim(GETPOST("login", 'alphanohtml'));
 			if (GETPOSTISSET('pass')) {
-				$object->pass        = trim(GETPOST("pass", 'password'));	// For password, we must use 'none'
+				$object->pass = trim(GETPOST("pass", 'password')); // For password, we must use 'none'
 			}
 
 			$object->societe     = trim(GETPOST("societe", 'alphanohtml')); // deprecated
@@ -399,10 +399,10 @@ 
 			}
 
 			// Check if we need to also synchronize password information
-			$nosyncuserpass = 1;	// no by default
+			$nosyncuserpass = 1; // no by default
 			if (GETPOSTISSET('pass')) {
 				if ($object->user_id) {	// If member is linked to a user
-					$nosyncuserpass = 0;	// We may try to sync password
+					$nosyncuserpass = 0; // We may try to sync password
 					if ($user->id == $object->user_id) {
 						if (!$user->hasRight('user', 'self', 'password')) {
 							$nosyncuserpass = 1; // Disable synchronizing
@@ -512,7 +512,7 @@ 
 		$email = preg_replace('/\s+/', '', GETPOST("member_email", 'aZ09arobase'));
 		$url = trim(GETPOST('url', 'url'));
 		$login = GETPOST("member_login", 'alphanohtml');
-		$pass = GETPOST("password", 'password');	// For password, we use 'none'
+		$pass = GETPOST("password", 'password'); // For password, we use 'none'
 		$photo = GETPOST("photo", 'alphanohtml');
 		$morphy = GETPOST("morphy", 'alphanohtml');
 		$public = GETPOSTINT("public");
@@ -888,7 +888,7 @@ 
 	}
 
 	if ($action == 'update_extras' && $permissiontoeditextra) {
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
 		// Fill array 'array_options' with data from update form
@@ -1441,7 +1441,7 @@ 
 			$maxfilesizearray = getMaxFileSizeArray();
 			$maxmin = $maxfilesizearray['maxmin'];
 			if ($maxmin > 0) {
-				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 			}
 			print '<input type="file" class="flat" name="photo" id="photoinput">';
 			print '</td></tr>';

htdocs/adherents/type.php

Spacing +9 added lines, -9 removed lines

@@ -180,7 +180,7 @@ 
 	$object->note_public = trim($comment);
 	$object->note_private = '';
 	$object->mail_valid = trim($mail_valid);
-	$object->vote = $vote;  // $vote is already int
+	$object->vote = $vote; // $vote is already int
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object);
@@ -214,7 +214,7 @@ 
 			$urltogo = $backtopage ? str_replace('__ID__', (string) $id, $backtopage) : $backurlforlist;
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', (string) $object->id, $urltogo); // New method to autoselect field created after a New on another form object creation
 
-			header("Location: " . $urltogo);
+			header("Location: ".$urltogo);
 			exit;
 		} else {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -228,7 +228,7 @@ 
 if ($action == 'update' && $user->hasRight('adherent', 'configurer')) {
 	$object->fetch($rowid);
 
-	$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+	$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 	$object->label = trim($label);
 	$object->morphy	= trim($morphy);
@@ -241,7 +241,7 @@ 
 	$object->note_public = trim($comment);
 	$object->note_private = '';
 	$object->mail_valid = trim($mail_valid);
-	$object->vote = $vote;  // $vote is already int.
+	$object->vote = $vote; // $vote is already int.
 
 	// Fill array 'array_options' with data from add form
 	$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
@@ -345,7 +345,7 @@ 
 		print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 		$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-		$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column);  // This also change content of $arrayfields with user setup
+		$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, $conf->main_checkbox_left_column); // This also change content of $arrayfields with user setup
 		$selectedfields = (($mode != 'kanban' && $mode != 'kanbangroupby') ? $htmlofselectarray : '');
 		//$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -547,7 +547,7 @@ 
 	print '<table class="border centpercent">';
 	print '<tbody>';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" value= "'. $label. '" autofocus="autofocus"></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" value= "'.$label.'" autofocus="autofocus"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
 	print $form->selectarray('status', array('0' => $langs->trans('ActivityCeased'), '1' => $langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
@@ -580,7 +580,7 @@ 
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3">';
-	print '<input name="duration_value" size="5" value="'. $duration_value .'"> ';
+	print '<input name="duration_value" size="5" value="'.$duration_value.'"> ';
 	print $formproduct->selectMeasuringUnits("duration_unit", "time", GETPOSTISSET("duration_unit") ? GETPOST('duration_unit', 'aZ09') : 'y', 0, 1);
 	print '</td></tr>';
 
@@ -831,7 +831,7 @@ 
 
 			$query = ['rowid' => $object->id];
 			if (!empty($mode)) {
-				$query+= ['mode' => $mode];
+				$query += ['mode' => $mode];
 			}
 			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 				$query += ['contextpage' => $contextpage];
@@ -857,7 +857,7 @@ 
 			if (!empty($filter)) {
 				$query += ['filter' => $filter];
 			}
-			$param = '&' . http_build_query($query);
+			$param = '&'.http_build_query($query);
 
 			if ($sall) {
 				print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;

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

Spacing +32 added lines, -32 removed lines

@@ -160,7 +160,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;
 		}
 
@@ -345,7 +345,7 @@ 
 				if (!getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS') && $nbpayments > 0) {
 					$this->heightforinfotot += (4 * $nbpayments);
 				}
-				$this->heightforfreetext = getDolGlobalInt('MAIN_PDF_FREETEXT_HEIGHT', 5);	// Height reserved to output the free text on last page
+				$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)
 
 				$heightforqrinvoice = 0;
@@ -368,7 +368,7 @@ 
 					if (!empty($conf->mycompany->multidir_output[$object->entity ?? $conf->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity ?? $conf->entity];
 					}
-					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$tplidx = $pdf->importPage(1);
 				}
 
@@ -465,7 +465,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.
@@ -899,7 +899,7 @@ 
 								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
 								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
 
-								$this->setAfterColsLinePositionsData('options_' . $extrafieldColKey, $pdf->GetY(), $pdf->getPage());
+								$this->setAfterColsLinePositionsData('options_'.$extrafieldColKey, $pdf->GetY(), $pdf->getPage());
 							}
 						}
 					}
@@ -978,14 +978,14 @@ 
 					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;
 					}
 					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 {
@@ -1092,7 +1092,7 @@ 
 
 				// Add number of pages in footer
 				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')) {
@@ -1349,7 +1349,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);
@@ -1399,8 +1399,8 @@ 
 			$posy += 3;
 		}
 
-		$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;
 		}
@@ -1409,11 +1409,11 @@ 
 		if ($object->status > Facture::STATUS_DRAFT && getDolGlobalInt('PDF_INVOICE_SHOW_BALANCE_SUMMARY')) {
 			// All customer previous invoices
 			$sql = "SELECT f.rowid, f.datef, f.total_ttc";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
-			$sql .= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql .= " AND f.entity IN (" . getEntity('invoice') . ")";
-			$sql .= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
-			$sql .= " AND f.rowid < " . ((int) $object->id);
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND f.datef <= '".$this->db->idate($object->date)."'";
+			$sql .= " AND f.rowid < ".((int) $object->id);
 			$sql .= " AND f.fk_statut > 0";
 			$sql .= " ORDER BY f.datef ASC";
 
@@ -1430,11 +1430,11 @@ 
 
 			// All payments before current date
 			$sql_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_payments .= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_payments .= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_payments .= " AND p.datep < '" . $this->db->idate($object->date) . "'";
+			$sql_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_payments .= " AND p.datep < '".$this->db->idate($object->date)."'";
 			$sql_payments .= " ORDER BY p.datep ASC";
 
 			$total_payments = 0;
@@ -1448,11 +1448,11 @@ 
 
 			// Payments made on current invoice date (including current invoice)
 			$sql_current_date_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_current_date_payments .= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_current_date_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_current_date_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_current_date_payments .= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_current_date_payments .= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
+			$sql_current_date_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_current_date_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_current_date_payments .= " AND DATE(p.datep) = DATE('".$this->db->idate($object->date)."')";
 
 			$current_date_payments = 0;
 			$resql_current_date = $this->db->query($sql_current_date_payments);
@@ -1508,7 +1508,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
@@ -1686,7 +1686,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', false);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": ".$outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
 					}
 				}
 			}
@@ -2377,7 +2377,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);
 			}
@@ -2494,7 +2494,7 @@ 
 		}
 		if ($this->situationinvoice) {
 			$outputlangs->loadLangs(array("other"));
-			$title = $outputlangs->transnoentities("PDFInvoiceSituation") . " " . $outputlangs->transnoentities("NumberingShort") . $object->situation_counter . " -";
+			$title = $outputlangs->transnoentities("PDFInvoiceSituation")." ".$outputlangs->transnoentities("NumberingShort").$object->situation_counter." -";
 			$subtitle = $outputlangs->transnoentities("PDFSituationTitle", (string) $object->situation_counter);
 		}
 		if (getDolGlobalString('PDF_USE_ALSO_LANGUAGE_CODE') && is_object($outputlangsbis)) {
@@ -2779,7 +2779,7 @@ 
 				$idaddressshipping = $object->getIdContact('external', 'SHIPPING');
 
 				if (!empty($idaddressshipping)) {
-					$object->fetch_contact($idaddressshipping[0]);	// Load $object->contact
+					$object->fetch_contact($idaddressshipping[0]); // Load $object->contact
 					$companystatic = new Societe($this->db);
 					$companystatic->fetch($object->contact->fk_soc);
 					$carac_client_name_shipping = pdfBuildThirdpartyName($object->contact, $outputlangs);
@@ -2791,7 +2791,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 +67 added lines, -67 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
@@ -215,7 +215,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;
 		}
 
@@ -287,7 +287,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;
 		}
@@ -407,15 +407,15 @@ 
 				$pdf->setAutoPageBreak(true, 0);
 
 				// Compute height for total, free text and footer
-				$this->heightforinfotot = 50;	// Height reserved to output the info and total part and payment part
+				$this->heightforinfotot = 50; // 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)
 
 				$heightforqrinvoice = 0;
 				if (getDolGlobalString('INVOICE_ADD_SWISS_QR_CODE') == 'bottom') {
@@ -437,7 +437,7 @@ 
 					if (!empty($conf->mycompany->multidir_output[$object->entity ?? $conf->entity])) {
 						$logodir = $conf->mycompany->multidir_output[$object->entity ?? $conf->entity];
 					}
-					$pagecount = $pdf->setSourceFile($logodir.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+					$pagecount = $pdf->setSourceFile($logodir.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 					$this->tplidx = $pdf->importPage(1);
 				}
 
@@ -534,7 +534,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.
@@ -1064,14 +1064,14 @@ 
 					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;
 					}
 					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 {
@@ -1169,7 +1169,7 @@ 
 
 				// Add number of pages in footer
 				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')) {
@@ -1430,7 +1430,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);
@@ -1481,8 +1481,8 @@ 
 		}
 
 
-		$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;
 		}
@@ -1491,11 +1491,11 @@ 
 		if ($object->status > Facture::STATUS_DRAFT && getDolGlobalInt('PDF_INVOICE_SHOW_BALANCE_SUMMARY')) {
 			// All customer previous invoices
 			$sql = "SELECT f.rowid, f.datef, f.total_ttc";
-			$sql .= " FROM " . MAIN_DB_PREFIX . "facture as f";
-			$sql .= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql .= " AND f.entity IN (" . getEntity('invoice') . ")";
-			$sql .= " AND f.datef <= '" . $this->db->idate($object->date) . "'";
-			$sql .= " AND f.rowid < " . ((int) $object->id);
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+			$sql .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND f.datef <= '".$this->db->idate($object->date)."'";
+			$sql .= " AND f.rowid < ".((int) $object->id);
 			$sql .= " AND f.fk_statut > 0";
 			$sql .= " ORDER BY f.datef ASC";
 
@@ -1512,11 +1512,11 @@ 
 
 			// All payments before current date
 			$sql_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_payments .= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_payments .= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_payments .= " AND p.datep < '" . $this->db->idate($object->date) . "'";
+			$sql_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_payments .= " AND p.datep < '".$this->db->idate($object->date)."'";
 			$sql_payments .= " ORDER BY p.datep ASC";
 
 			$total_payments = 0;
@@ -1530,11 +1530,11 @@ 
 
 			// Payments made on current invoice date (including current invoice)
 			$sql_current_date_payments = "SELECT p.datep, pf.fk_facture, pf.amount";
-			$sql_current_date_payments .= " FROM " . MAIN_DB_PREFIX . "paiement_facture as pf";
-			$sql_current_date_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "paiement as p ON p.rowid = pf.fk_paiement";
-			$sql_current_date_payments .= " INNER JOIN " . MAIN_DB_PREFIX . "facture as f ON f.rowid = pf.fk_facture";
-			$sql_current_date_payments .= " WHERE f.fk_soc = " . ((int) $object->socid);
-			$sql_current_date_payments .= " AND DATE(p.datep) = DATE('" . $this->db->idate($object->date) . "')";
+			$sql_current_date_payments .= " FROM ".MAIN_DB_PREFIX."paiement_facture as pf";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."paiement as p ON p.rowid = pf.fk_paiement";
+			$sql_current_date_payments .= " INNER JOIN ".MAIN_DB_PREFIX."facture as f ON f.rowid = pf.fk_facture";
+			$sql_current_date_payments .= " WHERE f.fk_soc = ".((int) $object->socid);
+			$sql_current_date_payments .= " AND DATE(p.datep) = DATE('".$this->db->idate($object->date)."')";
 
 			$current_date_payments = 0;
 			$resql_current_date = $this->db->query($sql_current_date_payments);
@@ -1590,7 +1590,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
@@ -1768,7 +1768,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', false);
+						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('StructuredCommunication').": ".$outputlangs->convToOutputCharset($invoicePaymentKey), 0, 'L', false);
 					}
 				}
 			}
@@ -1945,7 +1945,7 @@ 
 						if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
 							$vatrate .= '*';
 						}
-						if (! isset($tvas[$vatrate])) {
+						if (!isset($tvas[$vatrate])) {
 							$tvas[$vatrate] = 0;
 						}
 						$tvas[$vatrate] += $tvaligne;
@@ -2229,7 +2229,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);
 			}
@@ -2249,7 +2249,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);
@@ -2289,7 +2289,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
 		}
 	}
 
@@ -2652,7 +2652,7 @@ 
 				$idaddressshipping = $object->getIdContact('external', 'SHIPPING');
 
 				if (!empty($idaddressshipping)) {
-					$object->fetch_contact($idaddressshipping[0]);	// Load $object->contact
+					$object->fetch_contact($idaddressshipping[0]); // Load $object->contact
 					$companystatic = new Societe($this->db);
 					$companystatic->fetch($object->contact->fk_soc);
 					$carac_client_name_shipping = pdfBuildThirdpartyName($object->contact, $outputlangs);
@@ -2664,7 +2664,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);
@@ -2874,7 +2874,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
 			),
 		);
@@ -2899,13 +2899,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;
 		}
 
@@ -2920,7 +2920,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;
 		}
 
@@ -2935,9 +2935,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
 			),
 		);
@@ -3061,7 +3061,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)) {
@@ -3118,7 +3118,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 {
@@ -3182,7 +3182,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 {
@@ -3259,7 +3259,7 @@ 
 
 		$TDataSituation = array();
 
-		if (! empty($facDerniereSituation)) {
+		if (!empty($facDerniereSituation)) {
 			$TDataSituation['derniere_situation'] = $facDerniereSituation;
 			$TDataSituation['date_derniere_situation'] = $facDerniereSituation->date;
 		}
@@ -3268,9 +3268,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
@@ -3300,7 +3300,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;
 					}
 
@@ -3310,7 +3310,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 {
@@ -3322,14 +3322,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();
 			}
 
@@ -3343,7 +3343,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);
@@ -3553,16 +3553,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;
 		}
@@ -3702,7 +3702,7 @@ 
 				$label = $outputlangs->transnoentities("SituationInvoiceTotalProposal");
 				$pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $label, 0, 'L', false, 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', false, 1, $posx + $width, $posy + 1);
 
 				$pdf->SetFont('', '', $default_font_size - 1);
@@ -3746,7 +3746,7 @@ 
 
 		$force_to_zero = false;
 
-		$idinv = 0;//count($previousinvoices);
+		$idinv = 0; //count($previousinvoices);
 		while ($idinv < count($previousinvoices)) {
 			$invoice = $previousinvoices[$idinv];
 
@@ -3768,7 +3768,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', false);
 
@@ -3799,7 +3799,7 @@ 
 				if (($invoice->lines[$i]->info_bits & 0x01) == 0x01) {
 					$vatrate .= '*';
 				}
-				if (! isset($tvas[$vatrate])) {
+				if (!isset($tvas[$vatrate])) {
 					$tvas[$vatrate] = 0;
 				}
 				$tvas[$vatrate] += $tvaligne;
@@ -3977,7 +3977,7 @@ 
 						$pdf->SetXY($posx + $width4, $posy + $height * $index + $y);
 						$pdf->MultiCell($width4, $height - 1, price($sign * $payment['amount'], 0, $outputlangs), 0, 'L', false);
 						$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', false);
 						$pdf->SetXY($posx + $width4 * 3, $posy + $height * $index + $y);
@@ -4008,7 +4008,7 @@ 
 					$this->_pagehead($pdf, $object, 0, $outputlangs);
 				}
 				$pdf->setPage($pageposafter + 1);
-				$pdf->setPageOrientation('', true, 0);	// The only function to edit the bottom margin of current page to set it.
+				$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 				$posy = $this->tab_top_newpage + 1;
 			} else {
@@ -4040,7 +4040,7 @@ 
 
 		$posy += 10;
 
-		$pdf->setPageOrientation('', true, 0);	// The only function to edit the bottom margin of current page to set it.
+		$pdf->setPageOrientation('', true, 0); // The only function to edit the bottom margin of current page to set it.
 
 		// If invoice was linked to propals or orders
 		// TODO This part is bugged because the same proposals may be split in different invoices also several proposals may have been merged into the same invoice,

htdocs/core/modules/accountancy/doc/pdf_bookkeeping.modules.php

Spacing +9 added lines, -9 removed lines

@@ -111,7 +111,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;
 		}
 
@@ -215,7 +215,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->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
+			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
 			$tplidx = $pdf->importPage(1);
 		}
 
@@ -224,7 +224,7 @@ 
 		$pdf->SetDrawColor(128, 128, 128);
 
 		if (method_exists($pdf, 'AliasNbPages')) {
-			$pdf->AliasNbPages();  // @phan-suppress-current-line PhanUndeclaredMethod
+			$pdf->AliasNbPages(); // @phan-suppress-current-line PhanUndeclaredMethod
 		}
 
 		$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
@@ -250,7 +250,7 @@ 
 		$pdf->MultiCell(0, 3, ''); // Set interline to 3
 		$pdf->SetTextColor(0, 0, 0);
 
-		$tab_top = 40;	// position of top tab
+		$tab_top = 40; // position of top tab
 		$tab_top_newpage = (getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 10 : $tab_top);
 
 		$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
@@ -285,7 +285,7 @@ 
 		$nbMonths = (((int) $toYear - (int) $fromYear) * 12) + ((int) $toMonth - (int) $fromMonth) + 1;
 		$datePlusOneMonth = dol_time_plus_duree($this->fromDate, -1, 'm');
 		$dates = [];
-		for ($i = 0; $i  < $nbMonths; $i++) {
+		for ($i = 0; $i < $nbMonths; $i++) {
 			$datePlusOneMonth = dol_time_plus_duree($datePlusOneMonth, 1, "m");
 			$dates[$datePlusOneMonth] = dol_print_date($datePlusOneMonth, "%B %Y");
 		}
@@ -532,7 +532,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
 		}
 
 		$pdf->Close();
@@ -661,7 +661,7 @@ 
 		$pdf->SetXY($this->marge_gauche + 2, $nexY);
 		$pdf->SetTextColor(0, 0, 60);
 		$textDateNow = $outputlangs->transnoentities("PrintDate");
-		$pdf->MultiCell($w / 3, 3, $textDateNow . " : " . date('d/m/Y', dol_now()), '', 'L');
+		$pdf->MultiCell($w / 3, 3, $textDateNow." : ".date('d/m/Y', dol_now()), '', 'L');
 		$nexY = max($pdf->GetY(), $nexY);
 
 		// Page title
@@ -679,7 +679,7 @@ 
 
 		$fromDate = dol_print_date($this->fromDate, 'day');
 		$toDate = dol_print_date($this->toDate, 'day');
-		$textDate = $outputlangs->transnoentities("From") . " " . $fromDate . " " . $outputlangs->transnoentities("To") . " " . $toDate;
+		$textDate = $outputlangs->transnoentities("From")." ".$fromDate." ".$outputlangs->transnoentities("To")." ".$toDate;
 		$pdf->MultiCell($w / 3, 4, $textDate, 0, 'R');
 		$nexY = max($pdf->GetY(), $nexY);
 
@@ -956,7 +956,7 @@ 
 
 		if ($this->getColumnStatus('balance')) {
 			$solde = $credit - $debit;
-			$soldeText = price(price2num(abs($solde), 'MT')) . ($solde >= 0 ? ' ' . $langs->trans('CreditShort') : ' ' . $langs->trans('DebitShort'));
+			$soldeText = price(price2num(abs($solde), 'MT')).($solde >= 0 ? ' '.$langs->trans('CreditShort') : ' '.$langs->trans('DebitShort'));
 			$this->printStdColumnContent($pdf, $curY, 'balance', $soldeText);
 			$nexY = max($pdf->GetY(), $nexY);
 		}

htdocs/core/lib/member.lib.php

Spacing +24 added lines, -24 removed lines

@@ -39,7 +39,7 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/card.php', ['id' => $object->id]);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/card.php', ['id' => $object->id]);
 	$head[$h][1] = $langs->trans("Member");
 	$head[$h][2] = 'general';
 	$h++;
@@ -48,7 +48,7 @@ 
 		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {
 		$langs->load("ldap");
 
-		$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/ldap.php', ['id' => $object->id]);
+		$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/ldap.php', ['id' => $object->id]);
 		$head[$h][1] = $langs->trans("LDAPCard");
 		$head[$h][2] = 'ldap';
 		$h++;
@@ -56,7 +56,7 @@ 
 
 	if ($user->hasRight('adherent', 'cotisation', 'lire')) {
 		$nbSubscription = is_array($object->subscriptions) ? count($object->subscriptions) : 0;
-		$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/subscription.php', ['id' => $object->id]);
+		$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/subscription.php', ['id' => $object->id]);
 		$head[$h][1] = $langs->trans("Subscriptions");
 		$head[$h][2] = 'subscription';
 		if ($nbSubscription > 0) {
@@ -68,7 +68,7 @@ 
 	if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 		if ($user->hasRight('partnership', 'read')) {
 			$nbPartnership = is_array($object->partnerships) ? count($object->partnerships) : 0;
-			$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/partnership/partnership_list.php', ['id' => $object->id]);
+			$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/partnership/partnership_list.php', ['id' => $object->id]);
 			$head[$h][1] = $langs->trans("Partnerships");
 			$nbNote = 0;
 			$sql = "SELECT COUNT(n.rowid) as nb";
@@ -105,7 +105,7 @@ 
 	if (!empty($object->note_public)) {
 		$nbNote++;
 	}
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/note.php', ['id' => $object->id]);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/note.php', ['id' => $object->id]);
 	$head[$h][1] = $langs->trans("Note");
 	$head[$h][2] = 'note';
 	if ($nbNote > 0) {
@@ -119,7 +119,7 @@ 
 	$upload_dir = $conf->adherent->multidir_output[$object->entity ?? $conf->entity].'/'.get_exdir(0, 0, 0, 1, $object, 'member');
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/document.php', ['id' => $object->id]);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/document.php', ['id' => $object->id]);
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) {
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
@@ -128,7 +128,7 @@ 
 	$h++;
 
 	// Show agenda tab
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/agenda.php', ['id' => $object->id]);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/agenda.php', ['id' => $object->id]);
 	$head[$h][1] = $langs->trans("Events");
 	if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
 		$nbEvent = 0;
@@ -149,7 +149,7 @@ 
 			} else {
 				dol_syslog('Failed to count actioncomm '.$db->lasterror(), LOG_ERR);
 			}
-			dol_setcache($cachekey, $nbEvent, 120);		// If setting cache fails, this is not a problem, so we do not test result.
+			dol_setcache($cachekey, $nbEvent, 120); // If setting cache fails, this is not a problem, so we do not test result.
 		}
 
 		$head[$h][1] .= '/';
@@ -181,14 +181,14 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/type.php', ['rowid' => $object->id]);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/type.php', ['rowid' => $object->id]);
 	$head[$h][1] = $langs->trans("MemberType");
 	$head[$h][2] = 'card';
 	$h++;
 
 	// Multilangs
 	if (getDolGlobalInt('MAIN_MULTILANGS')) {
-		$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/type_translation.php', ['rowid' => $object->id]);
+		$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/type_translation.php', ['rowid' => $object->id]);
 		$head[$h][1] = $langs->trans("Translation");
 		$head[$h][2] = 'translation';
 		$h++;
@@ -198,7 +198,7 @@ 
 		&& (!getDolGlobalString('MAIN_DISABLE_LDAP_TAB') || !empty($user->admin))) {
 		$langs->load("ldap");
 
-		$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/type_ldap.php', ['rowid' => $object->id]);
+		$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/type_ldap.php', ['rowid' => $object->id]);
 		$head[$h][1] = $langs->trans("LDAPCard");
 		$head[$h][2] = 'ldap';
 		$h++;
@@ -231,12 +231,12 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/admin/member.php');
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/admin/member.php');
 	$head[$h][1] = $langs->trans("Miscellaneous");
 	$head[$h][2] = 'general';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/admin/member_emails.php');
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/admin/member_emails.php');
 	$head[$h][1] = $langs->trans("EMails");
 	$head[$h][2] = 'emails';
 	$h++;
@@ -247,7 +247,7 @@ 
 	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'member_admin');
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/admin/member_extrafields.php');
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/admin/member_extrafields.php');
 	$head[$h][1] = $langs->trans("ExtraFieldsMember");
 	$nbExtrafields = $extrafields->attributes['adherent']['count'];
 	if ($nbExtrafields > 0) {
@@ -256,7 +256,7 @@ 
 	$head[$h][2] = 'attributes';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/admin/member_type_extrafields.php');
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/admin/member_type_extrafields.php');
 	$head[$h][1] = $langs->trans("ExtraFieldsMemberType");
 	$nbExtrafields = $extrafields->attributes['adherent_type']['count'];
 	if ($nbExtrafields > 0) {
@@ -265,7 +265,7 @@ 
 	$head[$h][2] = 'attributes_type';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/admin/website.php');
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/admin/website.php');
 	$head[$h][1] = $langs->trans("BlankSubscriptionForm");
 	$head[$h][2] = 'website';
 	$h++;
@@ -289,32 +289,32 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/stats/index.php');
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/stats/index.php');
 	$head[$h][1] = $langs->trans("Subscriptions");
 	$head[$h][2] = 'statssubscription';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/stats/geo.php', ['mode' => 'memberbycountry']);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/stats/geo.php', ['mode' => 'memberbycountry']);
 	$head[$h][1] = $langs->trans("Country");
 	$head[$h][2] = 'statscountry';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/stats/geo.php', ['mode' => 'memberbyregion']);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/stats/geo.php', ['mode' => 'memberbyregion']);
 	$head[$h][1] = $langs->trans("Region");
 	$head[$h][2] = 'statsregion';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/stats/geo.php', ['mode' => 'memberbystate']);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/stats/geo.php', ['mode' => 'memberbystate']);
 	$head[$h][1] = $langs->trans("State");
 	$head[$h][2] = 'statsstate';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/stats/geo.php', ['mode' => 'memberbytown']);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/stats/geo.php', ['mode' => 'memberbytown']);
 	$head[$h][1] = $langs->trans('Town');
 	$head[$h][2] = 'statstown';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/stats/byproperties.php');
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/stats/byproperties.php');
 	$head[$h][1] = $langs->trans('ByProperties');
 	$head[$h][2] = 'statsbyproperties';
 	$h++;
@@ -343,12 +343,12 @@ 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/subscription/card.php', ['rowid' => $object->id]);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/subscription/card.php', ['rowid' => $object->id]);
 	$head[$h][1] = $langs->trans("Subscription");
 	$head[$h][2] = 'general';
 	$h++;
 
-	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT . '/adherents/subscription/info.php', ['rowid' => $object->id]);
+	$head[$h][0] = dolBuildUrl(DOL_URL_ROOT.'/adherents/subscription/info.php', ['rowid' => $object->id]);
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;

htdocs/blockedlog/lib/blockedlog.lib.php

Spacing +3 added lines, -3 removed lines

@@ -95,7 +95,7 @@ 
 		return false;
 	}
 
-	return true;	// all conditions are ok to become a LNE certified version
+	return true; // all conditions are ok to become a LNE certified version
 }
 
 
@@ -130,13 +130,13 @@ 
 {
 	global $conf, $db;
 
-	$result = true;	// by default restrictions are on, so we can't disable them
+	$result = true; // by default restrictions are on, so we can't disable them
 
 	// For the moment, we don't need this. We already have a feature that does not allow to disable the LNE rstriction by
 	// adding an inalterable event in the log.
 	if (!isModEnabled('blockedlog')) {
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."blockedlog";
-		$sql .= " WHERE entity = ".((int) $conf->entity);	// Sharing entity in blocked is disallowed
+		$sql .= " WHERE entity = ".((int) $conf->entity); // Sharing entity in blocked is disallowed
 		if ($ignoresystem) {
 			$sql .= " AND action NOT IN ('MODULE_SET', 'MODULE_RESET')";
 		}