Dolibarr / dolibarr

htdocs/comm/action/card.php

Spacing +11 added lines, -11 removed lines

@@ -74,7 +74,7 @@ 
 $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
 $remindertype = GETPOST('selectremindertype', 'aZ09');
 $modelmail = GETPOSTINT('actioncommsendmodel_mail');
-$complete = GETPOST('complete', 'alpha');	// 'na' must be allowed
+$complete = GETPOST('complete', 'alpha'); // 'na' must be allowed
 $private = GETPOST('private', 'alphanohtml');
 if ($complete == 'na' || $complete == -2) {
 	$complete = -1;
@@ -612,12 +612,12 @@ 
 			if ($selectedrecurrulefreq == 'WEEKLY' && !empty($selectedrecurrulebyday)) {
 				$firstdatearray = dol_get_first_day_week(GETPOSTINT("apday"), GETPOSTINT("apmonth"), GETPOSTINT("apyear"));
 				$datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), $firstdatearray['month'], $firstdatearray['first_day'], $firstdatearray['year'], $tzforfullday ? $tzforfullday : 'tzuserrel');
-				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd');//We begin the week after
+				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd'); //We begin the week after
 				$dayoffset = 7;
 				$monthoffset = 0;
 			} elseif ($selectedrecurrulefreq == 'MONTHLY' && !empty($selectedrecurrulebymonthday)) {
 				$firstday = $selectedrecurrulebymonthday;
-				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth");//We begin the week after
+				$firstmonth = GETPOST("apday") > $selectedrecurrulebymonthday ? GETPOSTINT("apmonth") + 1 : GETPOSTINT("apmonth"); //We begin the week after
 				$datep = dol_mktime($fulldayevent ? '00' : GETPOSTINT("aphour"), $fulldayevent ? '00' : GETPOSTINT("apmin"), $fulldayevent ? '00' : GETPOSTINT("apsec"), $firstmonth, $firstday, GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
 				$dayoffset = 0;
 				$monthoffset = 1;
@@ -722,9 +722,9 @@ 
 
 				// increment date for recurrent events
 				$datep = dol_time_plus_duree($datep, $dayoffset, 'd');
-				$datep = dol_time_plus_duree($datep, $monthoffset, 'm');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datep = dol_time_plus_duree($datep, $monthoffset, 'm'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
 				$datef = dol_time_plus_duree($datef, $dayoffset, 'd');
-				$datef = dol_time_plus_duree($datef, $monthoffset, 'm');  // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
+				$datef = dol_time_plus_duree($datef, $monthoffset, 'm'); // @phan-suppress-current-line PhanPluginSuspiciousParamOrder
 			}
 		}
 		if (!empty($backtopage) && !$error) {
@@ -1066,7 +1066,7 @@ 
 if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
 	$error = 0;
 
-	$shour = (int) dol_print_date($object->datep, "%H", 'tzuserrel');		// We take the date visible by user $newdate is also date visible by user.
+	$shour = (int) dol_print_date($object->datep, "%H", 'tzuserrel'); // We take the date visible by user $newdate is also date visible by user.
 	$smin = (int) dol_print_date($object->datep, "%M", 'tzuserrel');
 
 	$newdate = GETPOST('newdate', 'alpha');
@@ -1276,7 +1276,7 @@ 
 		$default = getDolGlobalString('AGENDA_USE_EVENT_TYPE_DEFAULT', 'AC_RDV');
 		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
 		$selectedvalue = GETPOSTISSET("actioncode") ? GETPOST("actioncode", 'aZ09') : ($object->type_code ? $object->type_code : $default);
-		print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1);	// TODO Replace 0 with -2 in onlyautoornot
+		print $formactions->select_type_actions($selectedvalue, "actioncode", "systemauto", 0, -1, 0, 1); // TODO Replace 0 with -2 in onlyautoornot
 		print '</td></tr>';
 	}
 
@@ -1607,7 +1607,7 @@ 
 		}
 		//var_dump('origin='.$origin.' originid='.$originid.' hasPermissionOnLinkedObject='.$hasPermissionOnLinkedObject);
 
-		if (! in_array($origin, array('societe', 'project', 'task', 'user'))) {
+		if (!in_array($origin, array('societe', 'project', 'task', 'user'))) {
 			// We do not use link for object that already contains a hard coded field to make links with agenda events
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
 			print '<td colspan="3">';
@@ -1758,7 +1758,7 @@ 
 			$object->socpeopleassigned[$id] = array('id' => $tmpid);
 		}
 		$object->contact_id   = GETPOSTINT("contactid");
-		$object->fk_project  = GETPOSTINT("projectid");
+		$object->fk_project = GETPOSTINT("projectid");
 
 		$object->note_private = GETPOST("note", 'restricthtml');
 	}
@@ -1834,7 +1834,7 @@ 
 		if ($backtopage) {
 			print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : '').'">';
 		}
-		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && ! preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
+		if (!getDolGlobalString('AGENDA_USE_EVENT_TYPE') && !preg_match('/^TICKET_MSG_PRIVATE/', $object->code)) {
 			print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
 		}
 
@@ -2222,7 +2222,7 @@ 
                    })';
 			print '</script>'."\n";
 
-			print '</div>';		// End of div for reminderparameters
+			print '</div>'; // End of div for reminderparameters
 		}
 
 		print dol_get_fiche_end();

htdocs/comm/mailing/card.php

Spacing +13 added lines, -13 removed lines

@@ -299,15 +299,15 @@ 
 								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), '2');
 								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), '2');
 							} else {
-								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'member'.$obj->source_id, '2');
-								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'donation'.$obj->source_id, '2');
-								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'order'.$obj->source_id, '2');
-								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'invoice'.$obj->source_id, '2');
-								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . 'contractline'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYMENT_MEMBER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'member'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYMENT_DONATION__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'donation'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYMENT_ORDER__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'order'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYMENT_INVOICE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'invoice'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').'contractline'.$obj->source_id, '2');
 							}
 						}
 						if (getDolGlobalString('MEMBER_ENABLE_PUBLIC')) {
-							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm'). '</a>';
+							$substitutionarray['__PUBLICLINK_NEWMEMBERFORM__'] = '<a target="_blank" rel="noopener noreferrer" href="'.DOL_MAIN_URL_ROOT.'/public/members/new.php'.((isModEnabled('multicompany')) ? '?entity='.$conf->entity : '').'">'.$langs->trans('BlankSubscriptionForm').'</a>';
 						}
 						/* For backward compatibility, deprecated */
 						if (isModEnabled('paypal') && getDolGlobalString('PAYPAL_SECURITY_TOKEN')) {
@@ -316,25 +316,25 @@ 
 							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
 								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), '2');
 							} else {
-								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'membersubscription'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYPAL_MEMBER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN').'membersubscription'.$obj->source_id, '2');
 							}
 
 							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
 								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), '2');
 							} else {
-								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'order'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYPAL_ORDER__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN').'order'.$obj->source_id, '2');
 							}
 
 							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
 								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), '2');
 							} else {
-								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'invoice'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYPAL_INVOICE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN').'invoice'.$obj->source_id, '2');
 							}
 
 							if (!getDolGlobalString('PAYPAL_SECURITY_TOKEN_UNIQUE')) {
 								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN'), '2');
 							} else {
-								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN') . 'contractline'.$obj->source_id, '2');
+								$substitutionarray['__SECUREKEYPAYPAL_CONTRACTLINE__'] = dol_hash(getDolGlobalString('PAYPAL_SECURITY_TOKEN').'contractline'.$obj->source_id, '2');
 							}
 						}
 						//$substitutionisok=true;
@@ -470,7 +470,7 @@ 
 	}
 
 	// Action send test emailing
-	if ($action == 'send' && ! $cancel && $permissiontovalidatesend) {
+	if ($action == 'send' && !$cancel && $permissiontovalidatesend) {
 		$error = 0;
 
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
@@ -547,7 +547,7 @@ 
 	$mesgs = array();
 	// Action add emailing
 	if ($action == 'add' && $permissiontocreate) {
-		$object->messtype       = (string) GETPOST("messtype");
+		$object->messtype = (string) GETPOST("messtype");
 		if ($object->messtype == 'sms') {
 			$object->email_from     = (string) GETPOST("from_phone", 'alphawithlgt'); // Must allow 'name <email>'
 		} else {
@@ -1511,7 +1511,7 @@ 
 				$maxfilesizearray = getMaxFileSizeArray();
 				$maxmin = $maxfilesizearray['maxmin'];
 				if ($maxmin > 0) {
-					$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+					$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 				}
 				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 				$out .= ' ';

htdocs/comm/mailing/cibles.php

Spacing +7 added lines, -7 removed lines

@@ -438,7 +438,7 @@ 
 			}
 		}
 		if (empty($nbemail)) {
-			$nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere'));//.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
+			$nbemail .= ' '.img_warning($langs->trans('ToAddRecipientsChooseHere')); //.' <span class="warning">'.$langs->trans("NoTargetYet").'</span>';
 		}
 		if ($text) {
 			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
@@ -522,7 +522,7 @@ 
 		}
 		print '</div>';
 		print '<div class="tagtd">&nbsp;</div>';
-		print '</div>';	// End tr
+		print '</div>'; // End tr
 
 		clearstatcache();
 
@@ -594,14 +594,14 @@ 
 					}
 					print img_object($langs->trans("EmailingTargetSelector").': '.get_class($obj), $obj->picto, 'class="valignmiddle width25 size15x"');
 					print '</div>';
-					print '<div class="tagtd valignmiddle">';	//  style="height: 4em"
+					print '<div class="tagtd valignmiddle">'; //  style="height: 4em"
 					print $obj->getDesc();
 					print '</div>';
 
 					$nbofrecipient = -1;
 
 					try {
-						$obj->evenunsubscribe = $object->evenunsubscribe;	// Set flag to include/exclude email that has opt-out.
+						$obj->evenunsubscribe = $object->evenunsubscribe; // Set flag to include/exclude email that has opt-out.
 
 						$nbofrecipient = $obj->getNbOfRecipients('');
 					} catch (Exception $e) {
@@ -654,7 +654,7 @@ 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 
-		print '</div>';	// End table
+		print '</div>'; // End table
 		print '</div>';
 
 		print '<br>';
@@ -761,7 +761,7 @@ 
 			$arrayofmassactions['reset_target'] = img_picto('', 'refresh', 'class="pictofixedwidth"').$langs->trans("ResetMailingTargetMassaction");
 		}
 		$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
-		$morehtmlcenter .= $massactionbutton .'<br>';
+		$morehtmlcenter .= $massactionbutton.'<br>';
 
 		if ($object->status == $object::STATUS_DRAFT) {
 			$morehtmlcenter = '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ToClearAllRecipientsClickHere").'</span> <a href="'.$_SERVER["PHP_SELF"].'?clearlist=1&id='.$object->id.'" class="button reposition smallpaddingimp">'.$langs->trans("TargetsReset").'</a>';
@@ -963,7 +963,7 @@ 
 				print '<td class="center nowraponall">';
 				if ($obj->status != $object::STATUS_DRAFT) {		// If status of target line is not draft
 					// Date sent
-					print $obj->date_envoi;		// @TODO Must store date in date format
+					print $obj->date_envoi; // @TODO Must store date in date format
 				}
 				print '</td>';
 

htdocs/admin/dict.php

Spacing +18 added lines, -18 removed lines

@@ -101,7 +101,7 @@ 
 
 $id = GETPOSTINT('id');
 $rowid = GETPOST('rowid', 'alpha');
-$entity = GETPOST('entity', 'alpha');	// Do not use GETPOSTINT here. Should be '', 0 or >0.
+$entity = GETPOST('entity', 'alpha'); // Do not use GETPOSTINT here. Should be '', 0 or >0.
 $code = GETPOST('code', 'alpha');
 $from = GETPOST('from', 'alpha');
 
@@ -570,7 +570,7 @@ 
 $tabcond[DICT_STCOMM] = isModEnabled("societe");
 $tabcond[DICT_HOLIDAY_TYPES] = isModEnabled('holiday');
 $tabcond[DICT_LEAD_STATUS] = isModEnabled('project');
-$tabcond[DICT_FORMAT_CARDS] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('member'));	// stickers format dictionary
+$tabcond[DICT_FORMAT_CARDS] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('member')); // stickers format dictionary
 $tabcond[DICT_INVOICE_SUBTYPE] = ((isModEnabled('invoice') || isModEnabled('supplier_invoice')) && $mysoc->country_code == 'GR');
 $tabcond[DICT_HRM_PUBLIC_HOLIDAY] = (isModEnabled('holiday') || isModEnabled('hrm'));
 $tabcond[DICT_HRM_DEPARTMENT] = isModEnabled('hrm');
@@ -973,7 +973,7 @@ 
 				if ($value == 'price' || preg_match('/^amount/i', $value)) {
 					$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
 				} elseif ($value == 'taux' || $value == 'localtax1') {
-					$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
+					$_POST[$keycode] = price2num(GETPOST($keycode), 8); // Note that localtax2 can be a list of rates separated by coma like X:Y:Z
 				} elseif ($value == 'entity') {
 					$_POST[$keycode] = getEntity($tablename);
 				}
@@ -1042,7 +1042,7 @@ 
 				if ($field == 'price' || preg_match('/^amount/i', $field)) {
 					$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
 				} elseif ($field == 'taux' || $field == 'localtax1') {
-					$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
+					$_POST[$keycode] = price2num(GETPOST($keycode), 8); // Note that localtax2 can be a list of rates separated by coma like X:Y:Z
 				} elseif ($field == 'entity') {
 					$_POST[$keycode] = getEntity($tablename);
 				}
@@ -2520,7 +2520,7 @@ 
 							}
 							// Show value for field
 							if ($showfield) {
-								print '<!-- '. $value .' --><td class="'.$class.'"'.($titletoshow ? ' title="'.dolPrintHTMLForAttribute($titletoshow).'"' : '').'>'.$valuetoshow.'</td>';
+								print '<!-- '.$value.' --><td class="'.$class.'"'.($titletoshow ? ' title="'.dolPrintHTMLForAttribute($titletoshow).'"' : '').'>'.$valuetoshow.'</td>';
 							}
 						}
 
@@ -2704,7 +2704,7 @@ 
 			// Special case for c_actioncomm (field that should not be modified)
 			$hidden = (!empty($obj->{$value}) ? $obj->{$value} : '');
 			print '<td>';
-			print '<input type="hidden" name="'. $value .'" value="'.$hidden.'">';
+			print '<input type="hidden" name="'.$value.'" value="'.$hidden.'">';
 			print $langs->trans($hidden);
 			print '</td>';
 		} elseif ($value == 'country') {
@@ -2725,7 +2725,7 @@ 
 			if (!in_array('country', $fieldlist)) {	// If there is already a field country, we don't show country_id (avoid duplicate)
 				$country_id = (!empty($obj->{$value}) ? $obj->{$value} : 0);
 				print '<td class="tdoverflowmax100">';
-				print '<input type="hidden" name="'. $value .'" value="'.$country_id.'">';
+				print '<input type="hidden" name="'.$value.'" value="'.$country_id.'">';
 				print '</td>';
 			}
 		} elseif ($value == 'region') {
@@ -2735,7 +2735,7 @@ 
 		} elseif ($value == 'region_id') {
 			$region_id = (!empty($obj->{$value}) ? $obj->{$value} : 0);
 			print '<td>';
-			print '<input type="hidden" name="'. $value .'" value="'.$region_id.'">';
+			print '<input type="hidden" name="'.$value.'" value="'.$region_id.'">';
 			print '</td>';
 		} elseif ($value == 'lang') {
 			print '<td>';
@@ -2791,7 +2791,7 @@ 
 				$class = "center"; // Fields aligned on right
 			}
 			print '<td class="'.$class.'">';
-			print '<input type="text" class="flat" value="'.(isset($obj->{$value}) ? $obj->{$value} : '').'" size="3" name="'. $value .'">';
+			print '<input type="text" class="flat" value="'.(isset($obj->{$value}) ? $obj->{$value} : '').'" size="3" name="'.$value.'">';
 			print '</td>';
 		} elseif (in_array($value, array('libelle_facture'))) {
 			print '<td>';
@@ -2801,7 +2801,7 @@ 
 			if ($tabname == 'c_payment_term') {
 				$langs->load("bills");
 				if (isset($obj->code) && !empty($obj->code)) {
-					$transkey = "PaymentCondition" . strtoupper($obj->code);
+					$transkey = "PaymentCondition".strtoupper($obj->code);
 					if ($langs->trans($transkey) != $transkey) {
 						$transfound = 1;
 						print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
@@ -2809,21 +2809,21 @@ 
 				}
 			}
 			if (!$transfound) {
-				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'. $value .'">'.(!empty($obj->{$value}) ? $obj->{$value} : '').'</textarea>';
+				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$value.'">'.(!empty($obj->{$value}) ? $obj->{$value} : '').'</textarea>';
 			} else {
-				print '<input type="hidden" name="'. $value .'" value="'.$transkey.'">';
+				print '<input type="hidden" name="'.$value.'" value="'.$transkey.'">';
 			}
 			print '</td>';
 		} elseif ($value == 'price' || preg_match('/^amount/i', (string) $value)) {
-			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value} : '')).'" name="'. $value .'"></td>';
+			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value} : '')).'" name="'.$value.'"></td>';
 		} elseif ($value == 'code' && isset($obj->{$value})) {
 			print '<td>';
 			if ($tabname == 'c_paiement' && in_array($obj->{$value}, array('LIQ', 'CB', 'CHQ', 'VIR'))) {
 				// Case of code that should not be modified
-				print '<input type="hidden" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'. $value .'">';
+				print '<input type="hidden" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'.$value.'">';
 				print $obj->{$value};
 			} else {
-				print '<input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'. $value .'">';
+				print '<input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'.$value.'">';
 			}
 			print '</td>';
 		} elseif ($value == 'unit') {
@@ -2851,10 +2851,10 @@ 
 			if (isModEnabled('accounting')) {
 				$fieldname = $value;
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
-				print $formaccounting->select_account($accountancy_account, '.'. $value, 1, array(), 1, 1, 'maxwidth200 maxwidthonsmartphone');
+				print $formaccounting->select_account($accountancy_account, '.'.$value, 1, array(), 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			} else {
 				$fieldname = $value;
-				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'. $value .'">';
+				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$value.'">';
 			}
 			print '</td>';
 		} elseif ($value == 'fk_tva') {
@@ -2875,7 +2875,7 @@ 
 			print '</td>';
 		} elseif ($value == 'type_duration') {
 			print '<td>';
-			print $form->selectTypeDuration('', (empty($obj->type_duration) ? '' : $obj->type_duration), array('i','h'));
+			print $form->selectTypeDuration('', (empty($obj->type_duration) ? '' : $obj->type_duration), array('i', 'h'));
 			print '</td>';
 		} else {
 			$fieldValue = isset($obj->{$value}) ? $obj->{$value} : '';

htdocs/admin/agenda_extsites.php

Spacing +17 added lines, -17 removed lines

@@ -81,7 +81,7 @@ 
 	} else {
 		$db->commit();
 		setEventMessage($langs->trans('SetupSaved'));
-		header('Location: ' . $_SERVER["PHP_SELF"]);
+		header('Location: '.$_SERVER["PHP_SELF"]);
 		exit();
 	}
 } elseif (preg_match('/del_(.*)/', $action, $reg)) {
@@ -101,7 +101,7 @@ 
 	} else {
 		$db->commit();
 		setEventMessage($langs->trans('SetupSaved'));
-		header('Location: ' . $_SERVER["PHP_SELF"]);
+		header('Location: '.$_SERVER["PHP_SELF"]);
 		exit();
 	}
 } elseif ($action == 'save') {
@@ -244,7 +244,7 @@ 
 print '<tr class="oddeven">';
 print "<td>".$langs->trans("ExtSitesNbOfAgenda")."</td>";
 print '<td class="center">';
-print '<input class="flat hideifnotset width50 center" type="text" id="AGENDA_EXT_NB" name="AGENDA_EXT_NB" value="' . getDolGlobalString('AGENDA_EXT_NB').'">';
+print '<input class="flat hideifnotset width50 center" type="text" id="AGENDA_EXT_NB" name="AGENDA_EXT_NB" value="'.getDolGlobalString('AGENDA_EXT_NB').'">';
 print "</td>";
 print "</tr>";
 
@@ -266,36 +266,36 @@ 
 $i = 1;
 while ($i <= $MAXAGENDA) {
 	$key = $i;
-	$name = 'AGENDA_EXT_NAME' . $key;
-	$src = 'AGENDA_EXT_SRC' . $key;
-	$offsettz = 'AGENDA_EXT_OFFSETTZ' . $key;
-	$color = 'AGENDA_EXT_COLOR' . $key;
-	$enabled = 'AGENDA_EXT_ENABLED' . $key;
-	$default = 'AGENDA_EXT_ACTIVEBYDEFAULT' . $key;
+	$name = 'AGENDA_EXT_NAME'.$key;
+	$src = 'AGENDA_EXT_SRC'.$key;
+	$offsettz = 'AGENDA_EXT_OFFSETTZ'.$key;
+	$color = 'AGENDA_EXT_COLOR'.$key;
+	$enabled = 'AGENDA_EXT_ENABLED'.$key;
+	$default = 'AGENDA_EXT_ACTIVEBYDEFAULT'.$key;
 
 	print '<tr class="oddeven">';
 	// Nb  @phan-suppress-next-line PhanPluginSuspiciousParamPosition
-	print '<td width="180" class="nowrap">' . $langs->trans("AgendaExtNb", $key) . "</td>";
+	print '<td width="180" class="nowrap">'.$langs->trans("AgendaExtNb", $key)."</td>";
 	// Name
-	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME' . $key . '" value="' . (GETPOST('AGENDA_EXT_NAME' . $key) ? GETPOST('AGENDA_EXT_NAME' . $key, 'alpha') : getDolGlobalString($name)) . '" size="28"></td>';
+	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_NAME'.$key.'" value="'.(GETPOST('AGENDA_EXT_NAME'.$key) ? GETPOST('AGENDA_EXT_NAME'.$key, 'alpha') : getDolGlobalString($name)).'" size="28"></td>';
 	// URL
-	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC' . $key . '" value="' . (GETPOST('AGENDA_EXT_SRC' . $key) ? GETPOST('AGENDA_EXT_SRC' . $key, 'alpha') : getDolGlobalString($src)) . '" size="60"></td>';
+	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC'.$key.'" value="'.(GETPOST('AGENDA_EXT_SRC'.$key) ? GETPOST('AGENDA_EXT_SRC'.$key, 'alpha') : getDolGlobalString($src)).'" size="60"></td>';
 	// Offset TZ
-	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ' . $key . '" value="' . (GETPOST('AGENDA_EXT_OFFSETTZ' . $key) ? GETPOST('AGENDA_EXT_OFFSETTZ' . $key) : getDolGlobalString($offsettz)) . '" size="2"></td>';
+	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ'.$key.'" value="'.(GETPOST('AGENDA_EXT_OFFSETTZ'.$key) ? GETPOST('AGENDA_EXT_OFFSETTZ'.$key) : getDolGlobalString($offsettz)).'" size="2"></td>';
 	// Color (Possible colors are limited by Google)
 	print '<td class="nowraponall right">';
-	print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR" . $key) ? GETPOST("AGENDA_EXT_COLOR" . $key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR" . $key, 'extsitesconfig', 1, array(), 'hideifnotset');
+	print $formother->selectColor((GETPOST("AGENDA_EXT_COLOR".$key) ? GETPOST("AGENDA_EXT_COLOR".$key) : getDolGlobalString($color)), "AGENDA_EXT_COLOR".$key, 'extsitesconfig', 1, array(), 'hideifnotset');
 	print '</td>';
 	// Calendar active by default
 	print '<td class="nowrap right">';
 	if (!empty($conf->use_javascript_ajax)) {
-		print ajax_constantonoff('AGENDA_EXT_ACTIVEBYDEFAULT' . $key);
+		print ajax_constantonoff('AGENDA_EXT_ACTIVEBYDEFAULT'.$key);
 	} else {
 		// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
 		if (getDolGlobalString($default)) {
-			print '<a href="' . $_SERVER['PHP_SELF'] . '?action=del_AGENDA_EXT_ACTIVEBYDEFAULT' . $key . '&token='.newToken().'">' . img_picto($langs->trans("Disabled"), 'off') . '</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_AGENDA_EXT_ACTIVEBYDEFAULT'.$key.'&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		} else {
-			print '<a href="' . $_SERVER['PHP_SELF'] . '?action=set_AGENDA_EXT_ACTIVEBYDEFAULT' . $key . '&token='.newToken().'">' . img_picto($langs->trans("Enabled"), 'on') . '</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_AGENDA_EXT_ACTIVEBYDEFAULT'.$key.'&token='.newToken().'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		}
 	}
 	print '</td>';

htdocs/admin/supplier_invoice.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 
 $type = GETPOST('type', 'alpha');
 $value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -382,7 +382,7 @@ 
 					$module = new $classname($db, $specimenthirdparty);
 					'@phan-var-force ModelePDFSuppliersInvoices $module';
 					if (method_exists($module, 'info')) {
-						print $module->info($langs);  // @phan-suppress-current-line PhanUndeclaredMethod
+						print $module->info($langs); // @phan-suppress-current-line PhanUndeclaredMethod
 					} else {
 						print $module->description;
 					}

htdocs/admin/invoice.php

Spacing +8 added lines, -8 removed lines

@@ -46,7 +46,7 @@ 
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
@@ -251,7 +251,7 @@ 
 		setEventMessages($langs->trans('Error'), null, 'errors');
 	} else {
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-		header("Location: " . $_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit();
 	}
 } elseif (preg_match('/del_(.*)/', $action, $reg)) {
@@ -266,7 +266,7 @@ 
 		setEventMessages($langs->trans('Error'), null, 'errors');
 	} else {
 		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
-		header("Location: " . $_SERVER["PHP_SELF"]);
+		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit();
 	}
 }
@@ -368,7 +368,7 @@ 
 
 							print '<td class="center">';
 							//print "> ".$conf->global->FACTURE_ADDON." - ".$file;
-							if ($conf->global->FACTURE_ADDON == $file || getDolGlobalString('FACTURE_ADDON') . '.php' == $file) {
+							if ($conf->global->FACTURE_ADDON == $file || getDolGlobalString('FACTURE_ADDON').'.php' == $file) {
 								print img_picto($langs->trans("Activated"), 'switch_on');
 							} else {
 								print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&value='.preg_replace('/\.php$/', '', $file).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
@@ -443,7 +443,7 @@ 
 							print '<td class="center">';
 							print $form->textwithpicto('', $htmltooltip, 1, 0);
 
-							if (getDolGlobalString('FACTURE_ADDON') . '.php' == $file) {  // If module is the one used, we show existing errors
+							if (getDolGlobalString('FACTURE_ADDON').'.php' == $file) {  // If module is the one used, we show existing errors
 								if (!empty($module->error)) {
 									dol_htmloutput_mesg($module->error, array(), 'error', 1);
 								}
@@ -551,7 +551,7 @@ 
 								print(empty($module->name) ? $name : $module->name);
 								print "</td><td>\n";
 								if (method_exists($module, 'info')) {
-									print $module->info($langs);  // @phan-suppress-current-line PhanUndeclaredMethod
+									print $module->info($langs); // @phan-suppress-current-line PhanUndeclaredMethod
 								} else {
 									print $module->description;
 								}
@@ -831,8 +831,8 @@ 
 print '</form>';
 
 
-print '<tr class="oddeven"><td>'.$langs->trans("InvoiceCheckPosteriorDate"). '&nbsp;' ;
-print $form->textwithpicto('', $langs->trans("InvoiceCheckPosteriorDateHelp"), 1, 'help') . '</td>';
+print '<tr class="oddeven"><td>'.$langs->trans("InvoiceCheckPosteriorDate").'&nbsp;';
+print $form->textwithpicto('', $langs->trans("InvoiceCheckPosteriorDateHelp"), 1, 'help').'</td>';
 print '<td class="left" colspan="2">';
 print ajax_constantonoff('INVOICE_CHECK_POSTERIOR_DATE');
 print '</td></tr>';

htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php

Spacing +27 added lines, -28 removed lines

@@ -124,7 +124,7 @@ 
 				break;
 			default:
 				throw new PrestaShopWebserviceException(
-					'This call to PrestaShop Web Services returned an unexpected HTTP status of:' . $request['status_code']
+					'This call to PrestaShop Web Services returned an unexpected HTTP status of:'.$request['status_code']
 				);
 		}
 
@@ -133,7 +133,7 @@ 
 			$errors = $response->children()->children();
 			if ($errors && count($errors) > 0) {
 				foreach ($errors as $error) {
-					$error_message .= ' - (Code ' . $error->code . '): ' . $error->message;
+					$error_message .= ' - (Code '.$error->code.'): '.$error->message;
 				}
 			}
 			$error_label = 'This call to PrestaShop Web Services failed and returned an HTTP status of %d. That means: %s.';
@@ -152,7 +152,7 @@ 
 			CURLOPT_RETURNTRANSFER => true,
 			CURLINFO_HEADER_OUT => true,
 			CURLOPT_HTTPAUTH => CURLAUTH_BASIC,
-			CURLOPT_USERPWD => $this->key . ':',
+			CURLOPT_USERPWD => $this->key.':',
 			CURLOPT_HTTPHEADER => array('Expect:'),
 			//CURLOPT_SSL_VERIFYPEER => false, // reminder, in dev environment sometimes self-signed certificates are used
 			//CURLOPT_CAINFO => "PATH2CAINFO", // ssl certificate chain checking
@@ -198,7 +198,7 @@ 
 
 		$index = strpos($response, "\r\n\r\n");
 		if ($index === false && $curl_params[CURLOPT_CUSTOMREQUEST] != 'HEAD') {
-			throw new PrestaShopWebserviceException('Bad HTTP response ' . $response . curl_error($session));
+			throw new PrestaShopWebserviceException('Bad HTTP response '.$response.curl_error($session));
 		}
 
 		$header = substr($response, 0, $index);
@@ -233,7 +233,7 @@ 
 		}
 		$status_code = curl_getinfo($session, CURLINFO_HTTP_CODE);
 		if ($status_code === 0) {
-			throw new PrestaShopWebserviceException('CURL Error: ' . curl_error($session));
+			throw new PrestaShopWebserviceException('CURL Error: '.curl_error($session));
 		}
 		curl_close($session);
 		if ($this->debug) {
@@ -257,7 +257,7 @@ 
 	public function printDebug($title, $content)
 	{
 		if (php_sapi_name() == 'cli') {
-			echo $title . PHP_EOL . $content;
+			echo $title.PHP_EOL.$content;
 		} else {
 			echo '<div style="display:table;background:#CCC;font-size:8pt;padding:7px"><h6 style="font-size:9pt;margin:0">'
 				. $title
@@ -301,7 +301,7 @@ 
 			if (libxml_get_errors()) {
 				$msg = var_export(libxml_get_errors(), true);
 				libxml_clear_errors();
-				throw new PrestaShopWebserviceException('HTTP XML response is not parsable: ' . $msg);
+				throw new PrestaShopWebserviceException('HTTP XML response is not parsable: '.$msg);
 			}
 			return $xml;
 		} else {
@@ -326,13 +326,13 @@ 
 		$xml = '';
 
 		if (isset($options['resource'], $options['postXml']) || isset($options['url'], $options['postXml'])) {
-			$url = (isset($options['resource']) ? $this->url . '/api/' . $options['resource'] : $options['url']);
+			$url = (isset($options['resource']) ? $this->url.'/api/'.$options['resource'] : $options['url']);
 			$xml = $options['postXml'];
 			if (isset($options['id_shop'])) {
-				$url .= '&id_shop=' . $options['id_shop'];
+				$url .= '&id_shop='.$options['id_shop'];
 			}
 			if (isset($options['id_group_shop'])) {
-				$url .= '&id_group_shop=' . $options['id_group_shop'];
+				$url .= '&id_group_shop='.$options['id_group_shop'];
 			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
@@ -379,10 +379,10 @@ 
 		if (isset($options['url'])) {
 			$url = $options['url'];
 		} elseif (isset($options['resource'])) {
-			$url = $this->url . '/api/' . $options['resource'];
+			$url = $this->url.'/api/'.$options['resource'];
 			$url_params = array();
 			if (isset($options['id'])) {
-				$url .= '/' . $options['id'];
+				$url .= '/'.$options['id'];
 			}
 
 			$params = array('filter', 'display', 'sort', 'limit', 'id_shop', 'id_group_shop', 'schema', 'language', 'date', 'price');
@@ -394,7 +394,7 @@ 
 				}
 			}
 			if (count($url_params) > 0) {
-				$url .= '?' . http_build_query($url_params);
+				$url .= '?'.http_build_query($url_params);
 			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
@@ -402,7 +402,7 @@ 
 
 		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
 
-		$this->checkStatusCode($request);// check the response validity
+		$this->checkStatusCode($request); // check the response validity
 
 		return $this->parseXML($request['response']);
 	}
@@ -420,10 +420,10 @@ 
 		if (isset($options['url'])) {
 			$url = $options['url'];
 		} elseif (isset($options['resource'])) {
-			$url = $this->url . '/api/' . $options['resource'];
+			$url = $this->url.'/api/'.$options['resource'];
 			$url_params = array();
 			if (isset($options['id'])) {
-				$url .= '/' . $options['id'];
+				$url .= '/'.$options['id'];
 			}
 
 			$params = array('filter', 'display', 'sort', 'limit');
@@ -435,13 +435,13 @@ 
 				}
 			}
 			if (count($url_params) > 0) {
-				$url .= '?' . http_build_query($url_params);
+				$url .= '?'.http_build_query($url_params);
 			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'HEAD', CURLOPT_NOBODY => true));
-		$this->checkStatusCode($request);// check the response validity
+		$this->checkStatusCode($request); // check the response validity
 		return $request['header'];
 	}
 
@@ -464,21 +464,20 @@ 
 		if (isset($options['url'])) {
 			$url = $options['url'];
 		} elseif ((isset($options['resource'], $options['id']) || isset($options['url'])) && $options['putXml']) {
-			$url = (isset($options['url']) ? $options['url'] :
-				$this->url . '/api/' . $options['resource'] . '/' . $options['id']);
+			$url = (isset($options['url']) ? $options['url'] : $this->url.'/api/'.$options['resource'].'/'.$options['id']);
 			$xml = $options['putXml'];
 			if (isset($options['id_shop'])) {
-				$url .= '&id_shop=' . $options['id_shop'];
+				$url .= '&id_shop='.$options['id_shop'];
 			}
 			if (isset($options['id_group_shop'])) {
-				$url .= '&id_group_shop=' . $options['id_group_shop'];
+				$url .= '&id_group_shop='.$options['id_group_shop'];
 			}
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 
 		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'PUT', CURLOPT_POSTFIELDS => $xml));
-		$this->checkStatusCode($request);// check the response validity
+		$this->checkStatusCode($request); // check the response validity
 		return $this->parseXML($request['response']);
 	}
 
@@ -515,21 +514,21 @@ 
 			$url = $options['url'];
 		} elseif (isset($options['resource']) && isset($options['id'])) {
 			$url = (is_array($options['id']))
-				? $this->url . '/api/' . $options['resource'] . '/?id=[' . implode(',', $options['id']) . ']'
-				: $this->url . '/api/' . $options['resource'] . '/' . $options['id'];
+				? $this->url.'/api/'.$options['resource'].'/?id=['.implode(',', $options['id']).']'
+				: $this->url.'/api/'.$options['resource'].'/'.$options['id'];
 		} else {
 			throw new PrestaShopWebserviceException('Bad parameters given');
 		}
 
 		if (isset($options['id_shop'])) {
-			$url .= '&id_shop=' . $options['id_shop'];
+			$url .= '&id_shop='.$options['id_shop'];
 		}
 		if (isset($options['id_group_shop'])) {
-			$url .= '&id_group_shop=' . $options['id_group_shop'];
+			$url .= '&id_group_shop='.$options['id_group_shop'];
 		}
 
 		$request = $this->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'DELETE'));
-		$this->checkStatusCode($request);// check the response validity
+		$this->checkStatusCode($request); // check the response validity
 		return true;
 	}
 }

htdocs/admin/agenda_other.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 $param = GETPOST('param', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
@@ -272,7 +272,7 @@ 
 						$module = new $classname($db, $specimenthirdparty);
 						'@phan-var-force ModeleAction $module';
 						if (method_exists($module, 'info')) {
-							print $module->info($langs);  // @phan-suppress-current-line PhanUndeclaredMethod
+							print $module->info($langs); // @phan-suppress-current-line PhanUndeclaredMethod
 						} else {
 							print $module->description;
 						}