Dolibarr / dolibarr

htdocs/admin/remotestore/class/externalModules.class.php

Spacing +26 added lines, -26 removed lines

@@ -202,12 +202,12 @@ 
 			$httpheader[] = 'Authorization: Basic '.base64_encode($basicAuthLogin.':'.$basicAuthPassword);
 		}
 
-		$url = $this->dolistore_api_url . (preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/') . $resource;
+		$url = $this->dolistore_api_url.(preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/').$resource;
 
 		$options['apikey'] = $this->dolistore_api_key;
 
 		if ($options) {
-			$url .= '?' . http_build_query($options);
+			$url .= '?'.http_build_query($options);
 		}
 
 		$url .= (preg_match('/\?/', $url) ? '&' : '?').'apikey='.$this->dolistore_api_key;
@@ -235,13 +235,13 @@ 
 		$modules = array();
 
 		if (!empty($this->cache_file) && file_exists($this->cache_file)) {
-			dol_syslog(__METHOD__ . " - Loading cache file: " . $this->cache_file, LOG_DEBUG);
+			dol_syslog(__METHOD__." - Loading cache file: ".$this->cache_file, LOG_DEBUG);
 
 			$content = file_get_contents($this->cache_file);
 			if ($content !== false) {
 				$modules = $this->readYaml($content);
 			} else {
-				dol_syslog(__METHOD__ . " - Error reading cache file", LOG_ERR);
+				dol_syslog(__METHOD__." - Error reading cache file", LOG_ERR);
 			}
 		}
 
@@ -269,20 +269,20 @@ 
 		if (isset($resCategories['response']) && is_array($resCategories['response'])) {
 			$organized_tree = $resCategories['response'];
 		} else {
-			return $html ;
+			return $html;
 		}
 
 		$html = '';
 		foreach ($organized_tree as $key => $value) {
 			if ($value['label'] != "Versions" && $value['label'] != "Specials") {
-				$html .= '<li' . ($current == $value['rowid'] ? ' class="active"' : '') . '>';
-				$html .= '<a href="?mode=marketplace&categorie=' . $value['rowid'] . '">' . $value['label'] . '</a>';
+				$html .= '<li'.($current == $value['rowid'] ? ' class="active"' : '').'>';
+				$html .= '<a href="?mode=marketplace&categorie='.$value['rowid'].'">'.$value['label'].'</a>';
 				if (isset($value['children'])) {
 					$html .= '<ul>';
 					usort($value['children'], $this->buildSorter('position'));
 					foreach ($value['children'] as $key_children => $value_children) {
-						$html .= '<li' . ($current == $value_children['rowid'] ? ' class="active"' : '') . '>';
-						$html .= '<a href="?mode=marketplace&categorie=' . $value_children['rowid'] . '" title="' . dol_escape_htmltag(strip_tags($value_children['description'])) . '">' . $value_children['label'] . '</a>';
+						$html .= '<li'.($current == $value_children['rowid'] ? ' class="active"' : '').'>';
+						$html .= '<a href="?mode=marketplace&categorie='.$value_children['rowid'].'" title="'.dol_escape_htmltag(strip_tags($value_children['description'])).'">'.$value_children['label'].'</a>';
 						$html .= '</li>';
 					}
 					$html .= '</ul>';
@@ -305,7 +305,7 @@ 
 
 		$html       = "";
 		$last_month = dol_now() - (30 * 24 * 60 * 60);
-		$dolibarrversiontouse = DOL_VERSION;	// full string with version
+		$dolibarrversiontouse = DOL_VERSION; // full string with version
 
 		$this->products = array();
 
@@ -314,7 +314,7 @@ 
 		$this->no_page  = $options['no_page'] ?? 1;
 		$this->search    = $options['search'] ?? '';
 
-		$this->per_page = 11;	// We fix number of products per page to 11
+		$this->per_page = 11; // We fix number of products per page to 11
 
 		// Length of $search must be at least 2 characters
 		if (!empty($this->search) && strlen(str_replace(' ', '', (string) $this->search)) < 2) {
@@ -355,7 +355,7 @@ 
 		$fileProducts = array();
 		$fileProductsTotal = 0;
 		if (!empty($this->githubFileStatus) && getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_COMMUNITY')) {
-			$fileProducts = $this->fetchModulesFromFile($data);			// Return an array with all modules from the cache filecontent in $data
+			$fileProducts = $this->fetchModulesFromFile($data); // Return an array with all modules from the cache filecontent in $data
 
 			$fileProducts = $this->adaptData($fileProducts, 'githubcommunity');
 
@@ -408,7 +408,7 @@ 
 				if ($product['source'] === 'githubcommunity') {
 					$download_link = '<a class="paddingleft paddingright" target="_blank" href="'.$product["link"].'"><img width="32" src="'.DOL_URL_ROOT.'/admin/remotestore/img/follow.png" /></a>';
 					if (!empty($product['direct-download']) && $product['direct-download'] == 'yes') {
-						$urldownload = $product["dolistore-download"];		// In a future, we will have the download to the zip file
+						$urldownload = $product["dolistore-download"]; // In a future, we will have the download to the zip file
 						$reg = array();
 						if (preg_match('/https:.*\?id=(\d+)$/', $urldownload, $reg)) {
 							$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p='.$reg[1];
@@ -418,7 +418,7 @@ 
 				}
 
 				if ($product['source'] === 'dolistore') {
-					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p=' . $product['id'];
+					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p='.$product['id'];
 					$download_link = '<a class="paddingleft paddingright" target="_blank" href="'.$this->shop_url.'/product.php?id='.((int) $product["id"]).'"><img width="32" src="'.DOL_URL_ROOT.'/admin/remotestore/img/follow.png" /></a>';
 					$download_link .= '<a class="paddingleft paddingright" target="_blank" href="'.$urldownload.'" rel="noopener noreferrer"><img width="32" src="'.DOL_URL_ROOT.'/admin/remotestore/img/Download-128.png" /></a>';
 				}
@@ -441,7 +441,7 @@ 
 					$version = '<span class="notcompatible">'.$langs->trans(
 						'NotCompatible',
 						$dolibarrversiontouse,
-						(float)	$product["dolibarr_min"],
+						(float) $product["dolibarr_min"],
 						(float) $product["dolibarr_max"]
 					).'</span>';
 					$compatible = 'NotCompatible';
@@ -452,7 +452,7 @@ 
 					$version = '<span class="notcompatible">'.$langs->trans(
 						'NotCompatible',
 						$dolibarrversiontouse,
-						(float)	$product["dolibarr_min"],
+						(float) $product["dolibarr_min"],
 						(float) $product["dolibarr_max"]
 					).'</span>';
 					$compatible = 'NotCompatible';
@@ -471,12 +471,12 @@ 
 			// Output the line
 			$html .= '<tr class="app oddeven nohover '.dol_escape_htmltag($compatible).'">';
 			$html .= '<td class="center width150"><div class="newAppParent">';
-			$html .= $newapp.$images;	// No dol_escape_htmltag, it is already escape html
+			$html .= $newapp.$images; // No dol_escape_htmltag, it is already escape html
 			$html .= '</div></td>';
 			$html .= '<td class="margeCote"><h2 class="appTitle">';
 			$html .= dol_escape_htmltag(dol_string_nohtmltag($product["label"]));
 			$html .= '<br><small>';
-			$html .= $version;			// No dol_escape_htmltag, it is already escape html
+			$html .= $version; // No dol_escape_htmltag, it is already escape html
 			$html .= '</small></h2>';
 			$html .= '<small> ';
 			if (empty($product['tms'])) {
@@ -509,7 +509,7 @@ 
 
 		$this->numberOfProducts = count($this->products);
 
-		return $html ;
+		return $html;
 	}
 
 	/**
@@ -526,7 +526,7 @@ 
 		 * @param array<string, mixed> $b
 		 * @return int
 		 */
-		function (array $a, array $b) use ($key) {
+		function(array $a, array $b) use ($key) {
 			$valA = isset($a[$key]) && is_scalar($a[$key]) ? (string) $a[$key] : '';
 			$valB = isset($b[$key]) && is_scalar($b[$key]) ? (string) $b[$key] : '';
 
@@ -685,7 +685,7 @@ 
 				$pagelist .= '<li class="pagination">';
 				$pagelist .= '<label for="page_input">Page </label>';
 				if ($this->categorie != 0) {
-					$pagelist .= '<input type="hidden" name="categorie" value="' . $this->categorie . '">';
+					$pagelist .= '<input type="hidden" name="categorie" value="'.$this->categorie.'">';
 				}
 				$pagelist .= '<input type="text" id="page_input" name="no_page" value="'.($page).'" min="1" max="'.$nbpages.'" class="width40 page_input" oninput="if(this.value > '.$nbpages.') this.value='.$nbpages.'">';
 				$pagelist .= ' / '.$nbpages;
@@ -735,12 +735,12 @@ 
 		}
 
 		// Get the predefined error message or use a default one
-		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: ' . $request['status_code'];
+		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: '.$request['status_code'];
 
 		// Append error details if available
 		if (!empty($request['response']) && isset($request['response']['errors']) && is_array($request['response']['errors'])) {
 			foreach ($request['response']['errors'] as $error) {
-				$error_message .= ' - (Code ' . $error['code'] . '): ' . $error['message'];
+				$error_message .= ' - (Code '.$error['code'].'): '.$error['message'];
 			}
 		}
 
@@ -971,7 +971,7 @@ 
 			 *
 			 * @return int
 			 */
-			static function ($a, $b) {
+			static function($a, $b) {
 				return strtotime($b['datec'] ?? '0') - strtotime($a['datec'] ?? '0');
 			}
 		);
@@ -986,7 +986,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return stripos($package['label'], $options['search']) !== false || stripos($package['description'], $options['search']) !== false;
 				}
 			);
@@ -1002,7 +1002,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return in_array($options['categorieid'], $package['category']);
 				}
 			);

htdocs/opensurvey/list.php

Spacing +1 added lines, -1 removed lines

@@ -326,7 +326,7 @@
 }
 
 $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' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

htdocs/comm/action/card.php

Spacing +29 added lines, -29 removed lines

@@ -82,7 +82,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;
@@ -563,7 +563,7 @@ 
 				if (is_array($listofresourceid) && count($listofresourceid)) {
 					foreach ($listofresourceid as $resource_id => $val) {
 						$resource_type = 'dolresource';
-						$busy = 1;//GETPOSTINT('busy');
+						$busy = 1; //GETPOSTINT('busy');
 
 						// Resources association
 						if (getDolGlobalString('RESOURCE_USED_IN_EVENT_CHECK')) {
@@ -579,24 +579,24 @@ 
 							}
 
 							$sql = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
-							$sql .= " FROM " . MAIN_DB_PREFIX . "element_resources as er";
-							$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = '" . $db->escape($resource_type) . "'";
-							$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($object->element) . "'";
-							$sql .= " WHERE er.resource_id = " . ((int) $resource_id);
+							$sql .= " FROM ".MAIN_DB_PREFIX."element_resources as er";
+							$sql .= " INNER JOIN ".MAIN_DB_PREFIX."resource as r ON r.rowid = er.resource_id AND er.resource_type = '".$db->escape($resource_type)."'";
+							$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as ac ON ac.id = er.element_id AND er.element_type = '".$db->escape($object->element)."'";
+							$sql .= " WHERE er.resource_id = ".((int) $resource_id);
 							$sql .= " AND er.busy = 1";
 							$sql .= " AND (";
 
 							// event date start between ac.datep and ac.datep2 (if datep2 is null we consider there is no end)
-							$sql .= " (ac.datep <= '" . $db->idate($eventDateStart) . "' AND (ac.datep2 IS NULL OR ac.datep2 >= '" . $db->idate($eventDateStart) . "'))";
+							$sql .= " (ac.datep <= '".$db->idate($eventDateStart)."' AND (ac.datep2 IS NULL OR ac.datep2 >= '".$db->idate($eventDateStart)."'))";
 							// event date end between ac.datep and ac.datep2
 							if (!empty($eventDateEnd)) {
-								$sql .= " OR (ac.datep <= '" . $db->idate($eventDateEnd) . "' AND (ac.datep2 >= '" . $db->idate($eventDateEnd) . "'))";
+								$sql .= " OR (ac.datep <= '".$db->idate($eventDateEnd)."' AND (ac.datep2 >= '".$db->idate($eventDateEnd)."'))";
 							}
 							// event date start before ac.datep and event date end after ac.datep2
 							$sql .= " OR (";
-							$sql .= "ac.datep >= '" . $db->idate($eventDateStart) . "'";
+							$sql .= "ac.datep >= '".$db->idate($eventDateStart)."'";
 							if (!empty($eventDateEnd)) {
-								$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '" . $db->idate($eventDateEnd) . "')";
+								$sql .= " AND (ac.datep2 IS NOT NULL AND ac.datep2 <= '".$db->idate($eventDateEnd)."')";
 							}
 							$sql .= ")";
 
@@ -610,9 +610,9 @@ 
 								if ($db->num_rows($resql) > 0) {
 									// Resource already in use
 									$error++;
-									$object->error = $langs->trans('ErrorResourcesAlreadyInUse') . ' : ';
+									$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
 									while ($obj = $db->fetch_object($resql)) {
-										$object->error .= '<br> - ' . $langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label . ' [' . $obj->ac_id . ']');
+										$object->error .= '<br> - '.$langs->trans('ErrorResourceUseInEvent', $obj->r_ref, $obj->ac_label.' ['.$obj->ac_id.']');
 									}
 									$object->errors[] = $object->error;
 
@@ -723,12 +723,12 @@ 
 			if ($selectedrecurrulefreq == 'WEEKLY' && !empty($selectedrecurrulebyday)) {
 				$firstdatearray = dol_get_first_day_week(GETPOSTINT("apday"), GETPOSTINT("apmonth"), GETPOSTINT("apyear"));
 				$datep = dol_mktime($fulldayevent ? 0 : GETPOSTINT("aphour"), $fulldayevent ? 0 : GETPOSTINT("apmin"), $fulldayevent ? 0 : 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 ? 0 : GETPOSTINT("aphour"), $fulldayevent ? 0 : GETPOSTINT("apmin"), $fulldayevent ? 0 : GETPOSTINT("apsec"), $firstmonth, $firstday, GETPOSTINT("apyear"), $tzforfullday ? $tzforfullday : 'tzuserrel');
 				$dayoffset = 0;
 				$monthoffset = 1;
@@ -832,9 +832,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) {
@@ -876,7 +876,7 @@ 
 		$object->fetch($id);
 		$object->fetch_optionals();
 		$object->fetch_userassigned();
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		// Clean parameters
 		if ($fulldayevent) {
@@ -1155,7 +1155,7 @@ 
 	$object->fetch($id);
 	$object->fetch_optionals();
 	$object->fetch_userassigned();
-	$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+	$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 	if ($user->hasRight('agenda', 'myactions', 'delete')
 		|| $user->hasRight('agenda', 'allactions', 'delete')) {
@@ -1177,7 +1177,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');
@@ -1351,7 +1351,7 @@ 
 								if (new_startdate > old_enddate) {
 									var timeDiff = old_enddate - old_startdate;
 									var new_enddate = new Date(new_startdate.getTime() + timeDiff);
-									$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput') . '"));
+									$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput').'"));
 									$("#p2day").val(new_enddate.getDate());
 									$("#p2month").val(new_enddate.getMonth() + 1);
 									$("#p2year").val(new_enddate.getFullYear());
@@ -1419,7 +1419,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>';
 	}
 
@@ -1504,7 +1504,7 @@ 
 		*/
 
 		// limit date
-		$repeateventlimitdate = empty($repeateventlimitdate) ?  (dol_now() + ((24 * 3600 * 365) + 1)) : $repeateventlimitdate;
+		$repeateventlimitdate = empty($repeateventlimitdate) ? (dol_now() + ((24 * 3600 * 365) + 1)) : $repeateventlimitdate;
 
 		print '<div class="hidden marginrightonly inline-block repeateventlimitdate">';
 		print $langs->trans("Until")." ";
@@ -1762,7 +1762,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">';
@@ -1851,7 +1851,7 @@ 
 						$("#addreminder").prop("checked", true);
 
 						// Set period with default reminder period
-						$("[name=\"offsetvalue\"]").val(\'' . dol_escape_js((string) $reminderDefaultOffset) . '\');
+						$("[name=\"offsetvalue\"]").val(\'' . dol_escape_js((string) $reminderDefaultOffset).'\');
 						$("#select_offsetunittype_duration").select2("destroy");
 						$("#select_offsetunittype_duration").val(\''.dol_escape_js($reminderDefaultUnit).'\');
 						$("#select_offsetunittype_duration").select2();
@@ -1948,7 +1948,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');
 	}
@@ -2015,7 +2015,7 @@ 
 									if (new_startdate > old_enddate) {
 										var timeDiff = old_enddate - old_startdate;
 										var new_enddate = new Date(new_startdate.getTime() + timeDiff);
-										$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput') . '"));
+										$("#p2").val(formatDate(new_enddate, "' . $langs->trans('FormatDateShortJavaInput').'"));
 										$("#p2day").val(new_enddate.getDate());
 										$("#p2month").val(new_enddate.getMonth() + 1);
 										$("#p2year").val(new_enddate.getFullYear());
@@ -2040,7 +2040,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.'">';
 		}
 
@@ -2466,7 +2466,7 @@ 
 					});
 			   })';
 			print '</script>'."\n";
-			print '</div>';		// End of div for reminderparameters
+			print '</div>'; // End of div for reminderparameters
 		}
 
 		print dol_get_fiche_end();
@@ -2744,7 +2744,7 @@ 
 
 		// Priority
 		if (getDolGlobalString('AGENDA_SUPPORT_PRIORITY_IN_EVENTS')) {
-			print '<tr><td class="nowrap" class="titlefield">' . $langs->trans("Priority") . '</td><td>';
+			print '<tr><td class="nowrap" class="titlefield">'.$langs->trans("Priority").'</td><td>';
 			print($object->priority ? $object->priority : '');
 			print '</td></tr>';
 		}

htdocs/eventorganization/class/api_eventattendees.class.php

Indentation -1 removed lines

@@ -180,7 +180,6 @@
 	}
 
 	/**
-
 	 * Create an event attendee
 	 *
 	 * Example: {"module":"adherent","type_template":"member","active": 1,"ref":"(SendingEmailOnAutoSubscription)","fk_user":0,"joinfiles": "0", ... }

htdocs/bom/lib/bom.lib.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 	$head[$h][1] = $langs->trans("ExtraFields");
 	$nbExtrafields = is_countable($extrafields->attributes['bom_bom']['label']) ? count($extrafields->attributes['bom_bom']['label']) : 0;
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'bom_extrafields';
 	$h++;
@@ -60,7 +60,7 @@ 
 	$head[$h][1] = $langs->trans("ExtraFieldsLines");
 	$nbExtrafields = is_countable($extrafields->attributes['bom_bomline']['label']) ? count($extrafields->attributes['bom_bomline']['label']) : 0;
 	if ($nbExtrafields > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . $nbExtrafields . '</span>';
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbExtrafields.'</span>';
 	}
 	$head[$h][2] = 'bomline_extrafields';
 	$h++;

htdocs/website/index.php

Spacing +45 added lines, -45 removed lines

@@ -341,7 +341,7 @@ 
 	$algo .= 'sitefiles';
 }
 
-$searchkey = GETPOST('searchstring', 'restricthtmlallowunvalid');	// or 'none', must be same as $searchstring
+$searchkey = GETPOST('searchstring', 'restricthtmlallowunvalid'); // or 'none', must be same as $searchstring
 
 if ($sortfield == '') {
 	if ($action == 'file_manager') {	// Test on permission not required
@@ -369,7 +369,7 @@ 
 }
 
 $usercanedit = $user->hasRight('website', 'write');
-$permissiontoadd = $user->hasRight('website', 'write');	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+$permissiontoadd = $user->hasRight('website', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 $permissiontodelete = $user->hasRight('website', 'delete');
 
 
@@ -436,7 +436,7 @@ 
 if ($sortorder) {
 	$backtopage .= '&sortorder='.urlencode($sortorder);
 }
-include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';	// This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
 
 $backtopage = $savbacktopage;
 //var_dump($backtopage);
@@ -601,7 +601,7 @@ 
 
 // Replacement of string into pages
 if ($massaction == 'replace' && GETPOST('confirmmassaction', 'alpha') && $usercanedit) {
-	$replacestring = GETPOST('replacestring', 'restricthtmlallowunvalid');	// or 'none', must be same then $searchstring
+	$replacestring = GETPOST('replacestring', 'restricthtmlallowunvalid'); // or 'none', must be same then $searchstring
 
 	$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
 	$allowimportsite = true;
@@ -1175,7 +1175,7 @@ 
 		$objectpage->image = GETPOST('WEBSITE_IMAGE', 'alpha');
 		$objectpage->keywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
 		$objectpage->allowed_in_frames = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09') ? 1 : 0;
-		$objectpage->htmlheader = GETPOST('htmlheader', 'none');	// Must accept tags like '<script>' and '<link>'
+		$objectpage->htmlheader = GETPOST('htmlheader', 'none'); // Must accept tags like '<script>' and '<link>'
 		$objectpage->author_alias = GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml');
 		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS');
 		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID');
@@ -1208,7 +1208,7 @@ 
 		$content = '';
 		if (GETPOSTISSET('content')) {
 			//$content = GETPOST('content', 'restricthtmlallowunvalid');	// @TODO Use a restricthtmlallowunvalidwithphp
-			$content = GETPOST('content', 'none');	// @TODO Use a restricthtmlallowunvalidwithphp
+			$content = GETPOST('content', 'none'); // @TODO Use a restricthtmlallowunvalidwithphp
 
 			$objectpage->content = make_substitutions($content, $substitutionarray);
 		} else {
@@ -1586,7 +1586,7 @@ 
 					$error++;
 					setEventMessages($langs->trans('ErrorFaviconMustBeASquaredImage'), array(), 'errors');
 				}
-				if (! $error && ($filesize[0] != 16 && $filesize[0] != 32 && $filesize[0] != 64)) {
+				if (!$error && ($filesize[0] != 16 && $filesize[0] != 32 && $filesize[0] != 64)) {
 					$error++;
 					setEventMessages($langs->trans('ErrorFaviconSize'), array(), 'errors');
 				}
@@ -1598,7 +1598,7 @@ 
 				if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we don not make the redirect
 					$action = 'preview';
 					if ($backtopage) {
-						$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);	// Clean backtopage url
+						$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
 						header("Location: ".$backtopage);
 						exit;
 					}
@@ -1622,7 +1622,7 @@ 
 			}
 
 
-			$dataposted = trim(GETPOST('WEBSITE_HTML_HEADER', 'restricthtmlallowlinkscript'));		// Must accept tags like '<script>' and '<link>'
+			$dataposted = trim(GETPOST('WEBSITE_HTML_HEADER', 'restricthtmlallowlinkscript')); // Must accept tags like '<script>' and '<link>'
 
 			$dataposted = preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), $dataposted);
 			$dataposted = str_replace('<?=', '<?php', $dataposted);
@@ -1632,7 +1632,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$htmlheadercontent = '';
@@ -1670,7 +1670,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$csscontent = '';
@@ -1713,7 +1713,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$jscontent = '';
@@ -1751,7 +1751,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$robotcontent = '';
@@ -1789,7 +1789,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				if ($dataposted) {
@@ -1817,7 +1817,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$manifestjsoncontent = '';
@@ -1856,7 +1856,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$readmecontent = '';
@@ -1895,7 +1895,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$licensecontent = '';
@@ -1937,7 +1937,7 @@ 
 			if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we don not make the redirect
 				$action = 'preview';
 				if ($backtopage) {
-					$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);	// Clean backtopage url
+					$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
 					header("Location: ".$backtopage);
 					exit;
 				}
@@ -1998,7 +1998,7 @@ 
 					$sourcestring .= " ".$source;
 				}
 			}
-			$securityspstring .= $directive . $sourcestring;
+			$securityspstring .= $directive.$sourcestring;
 		}
 		$res = dolibarr_set_const($db, 'WEBSITE_'.$object->id.'_SECURITY_FORCECSP', $securityspstring, 'chaine', 0, '', $conf->entity);
 		if ($res <= 0) {
@@ -2043,7 +2043,7 @@ 
 	if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we don not make the redirect
 		$action = 'preview';
 		if ($backtopage) {
-			$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);	// Clean backtopage url
+			$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
 			header("Location: ".$backtopage);
 			exit;
 		}
@@ -2061,7 +2061,7 @@ 
 
 	$object->fk_default_home = $pageid;
 	$res = $object->update($user);
-	if (! ($res > 0)) {
+	if (!($res > 0)) {
 		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -2176,7 +2176,7 @@ 
 		$objectpage->image = GETPOST('WEBSITE_IMAGE', 'alpha');
 		$objectpage->keywords = str_replace(array('<', '>'), '', GETPOST('WEBSITE_KEYWORDS', 'alphanohtml'));
 		$objectpage->allowed_in_frames = GETPOST('WEBSITE_ALLOWED_IN_FRAMES', 'aZ09') ? 1 : 0;
-		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'restricthtmlallowlinkscript'));		// Must accept tags like '<script>' and '<link>'
+		$objectpage->htmlheader = trim(GETPOST('htmlheader', 'restricthtmlallowlinkscript')); // Must accept tags like '<script>' and '<link>'
 		$objectpage->fk_page = (GETPOSTINT('pageidfortranslation') > 0 ? GETPOSTINT('pageidfortranslation') : 0);
 		$objectpage->author_alias = trim(GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml'));
 		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS', 'alpha');
@@ -2455,7 +2455,7 @@ 
 
 			$phpfullcodestringold = dolKeepOnlyPhpCode($objectpage->content);
 
-			$objectpage->content = GETPOST('PAGE_CONTENT', 'none');	// any HTML content allowed
+			$objectpage->content = GETPOST('PAGE_CONTENT', 'none'); // any HTML content allowed
 
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 
@@ -2684,7 +2684,7 @@ 
 				$fileofzip = '';
 				if (GETPOSTISSET('templateuserfile')) {
 					// Case we selected one template
-					$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha');	// $fileofzip will be sanitized later into the importWebSite()
+					$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha'); // $fileofzip will be sanitized later into the importWebSite()
 				} elseif (!empty($_FILES) && is_array($_FILES['userfile'])) {
 					// Case we upload a new template
 					if (is_array($_FILES['userfile']['tmp_name'])) {
@@ -2766,7 +2766,7 @@ 
 	if ($website->virtualhost) {
 		$domainname = $website->virtualhost;
 	}
-	if (! preg_match('/^http/i', $domainname)) {
+	if (!preg_match('/^http/i', $domainname)) {
 		$domainname = 'https://'.$domainname;
 	}
 
@@ -2832,7 +2832,7 @@ 
 				$url->appendChild($lastmod);
 				// Add suggested frequency for refresh
 				if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
-					$changefreq = $domtree->createElement('changefreq', 'weekly');	// TODO Manage other values
+					$changefreq = $domtree->createElement('changefreq', 'weekly'); // TODO Manage other values
 					$url->appendChild($changefreq);
 				}
 				// Add higher priority for home page
@@ -2937,7 +2937,7 @@ 
 				$url->appendChild($lastmod);
 				// Add suggested frequency for refresh
 				if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
-					$changefreq = $domtree->createElement('changefreq', 'weekly');	// TODO Manage other values
+					$changefreq = $domtree->createElement('changefreq', 'weekly'); // TODO Manage other values
 					$url->appendChild($changefreq);
 				}
 
@@ -3022,7 +3022,7 @@ 
 					$sourcestring .= " ".$source;
 				}
 			}
-			$securityspstring .= $directive . $sourcestring;
+			$securityspstring .= $directive.$sourcestring;
 		}
 		$res = dolibarr_set_const($db, 'WEBSITE_'.$object->id.'_SECURITY_FORCECSP', $securityspstring, 'chaine', 0, '', $conf->entity);
 		if ($res <= 0) {
@@ -3294,11 +3294,11 @@ 
 
 			// // Export web site
 			$extraCssClass = getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE') ? 'hideobject' : '';
-			print '<input type="submit" class="button bordertransp ' . $extraCssClass . '" ' . $disabledexport . ' value="' . dol_escape_htmltag($exportlabel) . '" name="exportsite">';
+			print '<input type="submit" class="button bordertransp '.$extraCssClass.'" '.$disabledexport.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">';
 
 			if (getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE')) {
 				// Overwrite template in sources
-				$overwriteGitUrl = $_SERVER["PHP_SELF"] . '?action=overwritesite&website=' . urlencode($website->ref);
+				$overwriteGitUrl = $_SERVER["PHP_SELF"].'?action=overwritesite&website='.urlencode($website->ref);
 				print dolButtonToOpenExportDialog('exportpopup', $langs->trans('ExportOptions'), $langs->trans('ExportSite'), 'exportsite', $overwriteGitUrl, $website);
 				//print '<a href="'.$_SERVER["PHP_SELF"].'?action=overwritesite&website='.urlencode($website->ref).'" class="button bordertransp hideobject" title="'.dol_escape_htmltag($langs->trans("ExportIntoGIT").". Directory ".getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE')).'">'.dol_escape_htmltag($langs->trans("ExportIntoGIT")).'</a>';
 			}
@@ -3683,7 +3683,7 @@ 
 				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
 
-				print '<div class="inline-block marginrightonly">';	// Button includes dynamic content
+				print '<div class="inline-block marginrightonly">'; // Button includes dynamic content
 				print $langs->trans("ShowSubcontainers");
 				if (!getDolGlobalString('WEBSITE_SUBCONTAINERSINLINE')) {
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', 0, 0, 0, '', 'nomarginleft').'</a>';
@@ -3692,7 +3692,7 @@ 
 				}
 				print '</div>';
 
-				print '<div class="inline-block marginrightonly">';	// Button edit inline
+				print '<div class="inline-block marginrightonly">'; // Button edit inline
 
 				print '<span id="switchckeditorinline">'."\n";
 				// Enable CKEditor inline with js on section and div with conteneditable=true
@@ -3792,15 +3792,15 @@ 
 													// Sending data via AJAX to update section
 													$.ajax({
 														type: \'POST\',
-														url: \'' . DOL_URL_ROOT . '/core/ajax/editinline.php\',
+														url: \'' . DOL_URL_ROOT.'/core/ajax/editinline.php\',
 														data: {
 															website_ref: \''.dol_escape_js($website->ref).'\',
-															page_id: \'' . ((int) $websitepage->id) . '\',
+															page_id: \'' . ((int) $websitepage->id).'\',
 															content: content,
 															element_id: elementId,
 															element_type: elementType,
 															action: \'updatedElementContent\',
-															token: \'' . newToken() . '\'
+															token: \'' . newToken().'\'
 														},
 														success: function(response) {
 															console.log(response);
@@ -3891,7 +3891,7 @@ 
 				} else {
 					$disabled = '';
 					$title = '';
-					$url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref);	// action=delete for webpage, deletesite for website
+					$url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref); // action=delete for webpage, deletesite for website
 				}
 				print '<a href="'.$url.'" class="button buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
 				print '</span>';
@@ -4084,7 +4084,7 @@ 
 		// Clean the php htmlheader file to remove php code and get only html part
 		$htmlheadercontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP( \?>)?\n*/ims', '', $htmlheadercontent);
 	} else {
-		$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none');		// Must accept tags like '<script>' and '<link>'
+		$htmlheadercontent = GETPOST('WEBSITE_HTML_HEADER', 'none'); // Must accept tags like '<script>' and '<link>'
 	}
 	if (!trim($htmlheadercontent)) {
 		$htmlheadercontent = "<html>\n";
@@ -4115,7 +4115,7 @@ 
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP( \?>)?\n*/ims', '', $htaccesscontent);
 	} else {
-		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');	// We must use 'nohtml' and not 'alphanohtml' because we must accept "
+		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml'); // We must use 'nohtml' and not 'alphanohtml' because we must accept "
 	}
 
 	if (!GETPOSTISSET('WEBSITE_MANIFEST_JSON')) {
@@ -4215,7 +4215,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 minwidth300" name="addedfile" id="addedfile"/>';
 
@@ -4257,7 +4257,7 @@ 
 	print '<tr><td class="tdtop">';
 	print $langs->trans('WEBSITE_HTML_HEADER');
 	$htmlhelp = $langs->trans("Example").' :<br>';
-	$htmlhelp .= dol_nl2br(dol_htmlentities($htmlheadercontentdefault));	// do not use dol_htmlentitiesbr here, $htmlheadercontentdefault is HTML with content like <link> and <script> that we want to be html encode as they must be show as doc content not executable instruction.
+	$htmlhelp .= dol_nl2br(dol_htmlentities($htmlheadercontentdefault)); // do not use dol_htmlentitiesbr here, $htmlheadercontentdefault is HTML with content like <link> and <script> that we want to be html encode as they must be show as doc content not executable instruction.
 	$textwithhelp = $form->textwithpicto('', $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
 	$htmlhelp2 = $langs->trans("LinkAndScriptsHereAreNotLoadedInEditor").'<br>';
 	print $form->textwithpicto($textwithhelp, $htmlhelp2, 1, 'warning', '', 0, 2, 'htmlheadertooltip2');
@@ -4655,7 +4655,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 class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
 		print '<input type="submit" class="button small" name="buttonsubmitimportfile" value="'.dol_escape_htmltag($langs->trans("Upload")).'">';
@@ -5178,7 +5178,7 @@ 
 	print '<tr><td class="tdhtmlheader tdtop">';
 	$htmlhelp = $langs->trans("EditTheWebSiteForACommonHeader").'<br><br>';
 	$htmlhelp .= $langs->trans("Example").' :<br>';
-	$htmlhelp .= dol_nl2br(dol_htmlentities($htmlheadercontentdefault));	// do not use dol_htmlentitiesbr here, $htmlheadercontentdefault is HTML with content like <link> and <script> that we want to be html encode as they must be show as doc content not executable instruction.
+	$htmlhelp .= dol_nl2br(dol_htmlentities($htmlheadercontentdefault)); // do not use dol_htmlentitiesbr here, $htmlheadercontentdefault is HTML with content like <link> and <script> that we want to be html encode as they must be show as doc content not executable instruction.
 	print $form->textwithpicto($langs->transnoentitiesnoconv('HtmlHeaderPage'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
 	print '</td><td>';
 	$poscursor = array('x' => GETPOST('htmlheader_x'), 'y' => GETPOST('htmlheader_y'));
@@ -5315,7 +5315,7 @@ 
 	print '<div class="fiche"><br>';
 
 	$module = 'medias';
-	$formalreadyopen = 2;	// So the form to submit a new file will not be open another time inside the core/tpl/filemanager.tpl.php
+	$formalreadyopen = 2; // So the form to submit a new file will not be open another time inside the core/tpl/filemanager.tpl.php
 	if (empty($url)) {
 		$url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
 	}
@@ -5552,8 +5552,8 @@ 
 			print getTitleFieldOfList("Categories", 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
 			print getTitleFieldOfList("UserCreation", 0, $_SERVER['PHP_SELF'], 'fk_user_creat', '', $param, '', $sortfield, $sortorder, '')."\n";
-			print getTitleFieldOfList("DateCreation", 0, $_SERVER['PHP_SELF'], 'date_creation', '', $param, '', $sortfield, $sortorder, 'center ')."\n";		// Date creation
-			print getTitleFieldOfList("DateLastModification", 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";		// Date last modif
+			print getTitleFieldOfList("DateCreation", 0, $_SERVER['PHP_SELF'], 'date_creation', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; // Date creation
+			print getTitleFieldOfList("DateLastModification", 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; // Date last modif
 			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
 			// Action column
 			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

htdocs/core/boxes/box_dolibarr_state_board.php

Spacing +50 added lines, -50 removed lines

@@ -26,7 +26,7 @@ 
  *	\brief      Module Dolibarr state base
  */
 
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 
 
 /**
@@ -159,54 +159,54 @@ 
 				'dolresource' => 'Dolresource'
 			);
 			$includes = array(
-				'users' => DOL_DOCUMENT_ROOT . "/user/class/user.class.php",
-				'members' => DOL_DOCUMENT_ROOT . "/adherents/class/adherent.class.php",
-				'customers' => DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-				'prospects' => DOL_DOCUMENT_ROOT . "/societe/class/client.class.php",
-				'suppliers' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.class.php",
-				'contacts' => DOL_DOCUMENT_ROOT . "/contact/class/contact.class.php",
-				'products' => DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-				'services' => DOL_DOCUMENT_ROOT . "/product/class/product.class.php",
-				'proposals' => DOL_DOCUMENT_ROOT . "/comm/propal/class/propal.class.php",
-				'orders' => DOL_DOCUMENT_ROOT . "/commande/class/commande.class.php",
-				'invoices' => DOL_DOCUMENT_ROOT . "/compta/facture/class/facture.class.php",
-				'donations' => DOL_DOCUMENT_ROOT . "/don/class/don.class.php",
-				'contracts' => DOL_DOCUMENT_ROOT . "/contrat/class/contrat.class.php",
-				'interventions' => DOL_DOCUMENT_ROOT . "/fichinter/class/fichinter.class.php",
-				'supplier_orders' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.commande.class.php",
-				'supplier_invoices' => DOL_DOCUMENT_ROOT . "/fourn/class/fournisseur.facture.class.php",
-				'supplier_proposals' => DOL_DOCUMENT_ROOT . "/supplier_proposal/class/supplier_proposal.class.php",
-				'projects' => DOL_DOCUMENT_ROOT . "/projet/class/project.class.php",
-				'expensereports' => DOL_DOCUMENT_ROOT . "/expensereport/class/expensereport.class.php",
-				'holidays' => DOL_DOCUMENT_ROOT . "/holiday/class/holiday.class.php",
-				'ticket' => DOL_DOCUMENT_ROOT . "/ticket/class/ticket.class.php",
-				'knowledgebase' => DOL_DOCUMENT_ROOT . "/knowledgemanagement/class/knowledgerecord.class.php",
-				'dolresource' => DOL_DOCUMENT_ROOT . "/resource/class/dolresource.class.php"
+				'users' => DOL_DOCUMENT_ROOT."/user/class/user.class.php",
+				'members' => DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php",
+				'customers' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+				'prospects' => DOL_DOCUMENT_ROOT."/societe/class/client.class.php",
+				'suppliers' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.class.php",
+				'contacts' => DOL_DOCUMENT_ROOT."/contact/class/contact.class.php",
+				'products' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+				'services' => DOL_DOCUMENT_ROOT."/product/class/product.class.php",
+				'proposals' => DOL_DOCUMENT_ROOT."/comm/propal/class/propal.class.php",
+				'orders' => DOL_DOCUMENT_ROOT."/commande/class/commande.class.php",
+				'invoices' => DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php",
+				'donations' => DOL_DOCUMENT_ROOT."/don/class/don.class.php",
+				'contracts' => DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php",
+				'interventions' => DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php",
+				'supplier_orders' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.commande.class.php",
+				'supplier_invoices' => DOL_DOCUMENT_ROOT."/fourn/class/fournisseur.facture.class.php",
+				'supplier_proposals' => DOL_DOCUMENT_ROOT."/supplier_proposal/class/supplier_proposal.class.php",
+				'projects' => DOL_DOCUMENT_ROOT."/projet/class/project.class.php",
+				'expensereports' => DOL_DOCUMENT_ROOT."/expensereport/class/expensereport.class.php",
+				'holidays' => DOL_DOCUMENT_ROOT."/holiday/class/holiday.class.php",
+				'ticket' => DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php",
+				'knowledgebase' => DOL_DOCUMENT_ROOT."/knowledgemanagement/class/knowledgerecord.class.php",
+				'dolresource' => DOL_DOCUMENT_ROOT."/resource/class/dolresource.class.php"
 			);
 			$links = array(
-				'users' => DOL_URL_ROOT . '/user/list.php',
-				'members' => DOL_URL_ROOT . '/adherents/list.php?statut=1&mainmenu=members',
-				'customers' => DOL_URL_ROOT . '/societe/list.php?type=c&mainmenu=companies',
-				'prospects' => DOL_URL_ROOT . '/societe/list.php?type=p&mainmenu=companies',
-				'suppliers' => DOL_URL_ROOT . '/societe/list.php?type=f&mainmenu=companies',
-				'contacts' => DOL_URL_ROOT . '/contact/list.php?mainmenu=companies',
-				'products' => DOL_URL_ROOT . '/product/list.php?type=0&mainmenu=products',
-				'services' => DOL_URL_ROOT . '/product/list.php?type=1&mainmenu=products',
-				'proposals' => DOL_URL_ROOT . '/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
-				'orders' => DOL_URL_ROOT . '/commande/list.php?mainmenu=commercial&leftmenu=orders',
-				'invoices' => DOL_URL_ROOT . '/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
-				'donations' => DOL_URL_ROOT . '/don/list.php?leftmenu=donations',
-				'contracts' => DOL_URL_ROOT . '/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
-				'interventions' => DOL_URL_ROOT . '/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
-				'supplier_orders' => DOL_URL_ROOT . '/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
-				'supplier_invoices' => DOL_URL_ROOT . '/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
-				'supplier_proposals' => DOL_URL_ROOT . '/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
-				'projects' => DOL_URL_ROOT . '/projet/list.php?mainmenu=project',
-				'expensereports' => DOL_URL_ROOT . '/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
-				'holidays' => DOL_URL_ROOT . '/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
-				'ticket' => DOL_URL_ROOT . '/ticket/list.php?leftmenu=ticket',
-				'knowledgebase' => DOL_URL_ROOT . '/knowledgemanagement/knowledgerecord_list.php?leftmenu=knowledgebase',
-				'dolresource' => DOL_URL_ROOT . '/resource/list.php?mainmenu=agenda',
+				'users' => DOL_URL_ROOT.'/user/list.php',
+				'members' => DOL_URL_ROOT.'/adherents/list.php?statut=1&mainmenu=members',
+				'customers' => DOL_URL_ROOT.'/societe/list.php?type=c&mainmenu=companies',
+				'prospects' => DOL_URL_ROOT.'/societe/list.php?type=p&mainmenu=companies',
+				'suppliers' => DOL_URL_ROOT.'/societe/list.php?type=f&mainmenu=companies',
+				'contacts' => DOL_URL_ROOT.'/contact/list.php?mainmenu=companies',
+				'products' => DOL_URL_ROOT.'/product/list.php?type=0&mainmenu=products',
+				'services' => DOL_URL_ROOT.'/product/list.php?type=1&mainmenu=products',
+				'proposals' => DOL_URL_ROOT.'/comm/propal/list.php?mainmenu=commercial&leftmenu=propals',
+				'orders' => DOL_URL_ROOT.'/commande/list.php?mainmenu=commercial&leftmenu=orders',
+				'invoices' => DOL_URL_ROOT.'/compta/facture/list.php?mainmenu=billing&leftmenu=customers_bills',
+				'donations' => DOL_URL_ROOT.'/don/list.php?leftmenu=donations',
+				'contracts' => DOL_URL_ROOT.'/contrat/list.php?mainmenu=commercial&leftmenu=contracts',
+				'interventions' => DOL_URL_ROOT.'/fichinter/list.php?mainmenu=commercial&leftmenu=ficheinter',
+				'supplier_orders' => DOL_URL_ROOT.'/fourn/commande/list.php?mainmenu=commercial&leftmenu=orders_suppliers',
+				'supplier_invoices' => DOL_URL_ROOT.'/fourn/facture/list.php?mainmenu=billing&leftmenu=suppliers_bills',
+				'supplier_proposals' => DOL_URL_ROOT.'/supplier_proposal/list.php?mainmenu=commercial&leftmenu=',
+				'projects' => DOL_URL_ROOT.'/projet/list.php?mainmenu=project',
+				'expensereports' => DOL_URL_ROOT.'/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
+				'holidays' => DOL_URL_ROOT.'/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
+				'ticket' => DOL_URL_ROOT.'/ticket/list.php?leftmenu=ticket',
+				'knowledgebase' => DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_list.php?leftmenu=knowledgebase',
+				'dolresource' => DOL_URL_ROOT.'/resource/list.php?mainmenu=agenda',
 			);
 			$titres = array(
 				'users' => "Users",
@@ -277,10 +277,10 @@ 
 					$langs->load(empty($langfile[$val]) ? $val : $langfile[$val]);
 
 					$text = $langs->trans($titres[$val]);
-					$boxstatItem .= '<a href="' . $links[$val] . '" class="boxstatsindicator thumbstat nobold nounderline">';
+					$boxstatItem .= '<a href="'.$links[$val].'" class="boxstatsindicator thumbstat nobold nounderline">';
 					$boxstatItem .= '<div class="boxstats">';
-					$boxstatItem .= '<span class="boxstatstext" title="' . dol_escape_htmltag($text) . '">' . $text . '</span><br>';
-					$boxstatItem .= '<span class="boxstatsindicator">' . img_object("", $board->picto, 'class="inline-block"') . ' ' . (!empty($board->nb[$val]) ? $board->nb[$val] : 0) . '</span>';
+					$boxstatItem .= '<span class="boxstatstext" title="'.dol_escape_htmltag($text).'">'.$text.'</span><br>';
+					$boxstatItem .= '<span class="boxstatsindicator">'.img_object("", $board->picto, 'class="inline-block"').' '.(!empty($board->nb[$val]) ? $board->nb[$val] : 0).'</span>';
 					$boxstatItem .= '</div>';
 					$boxstatItem .= '</a>';
 

htdocs/public/payment/newpayment.php

Spacing +35 added lines, -35 removed lines

@@ -359,10 +359,10 @@ 
 	if (getDolGlobalString('PAYMENT_SECURITY_TOKEN_UNIQUE')) {
 		if ($tmpsource && $REF) {
 			// Use the source in the hash to avoid duplicates if the references are identical
-			$tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $tmpsource.$REF, $SECUREKEY, '2');
+			$tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').$tmpsource.$REF, $SECUREKEY, '2');
 			// Do a second test for retro-compatibility (token may have been hashed with membersubscription in external module)
 			if ($tmpsource != $source) {
-				$tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $source.$REF, $SECUREKEY, '2');
+				$tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').$source.$REF, $SECUREKEY, '2');
 			}
 		} else {
 			$tokenisok = dol_verifyHash(getDolGlobalString('PAYMENT_SECURITY_TOKEN'), $SECUREKEY, '2');
@@ -371,7 +371,7 @@ 
 		$tokenisok = (getDolGlobalString('PAYMENT_SECURITY_TOKEN') == $SECUREKEY);
 	}
 
-	if (! $tokenisok) {
+	if (!$tokenisok) {
 		if (!getDolGlobalString('PAYMENT_SECURITY_ACCEPT_ANY_TOKEN')) {
 			$valid = false; // PAYMENT_SECURITY_ACCEPT_ANY_TOKEN is for backward compatibility
 		} else {
@@ -401,9 +401,9 @@ 
 $paramcreditor = 'ONLINE_PAYMENT_CREDITOR';
 $paramcreditorlong = 'ONLINE_PAYMENT_CREDITOR_'.$suffix;
 if (getDolGlobalString($paramcreditorlong)) {
-	$creditor = getDolGlobalString($paramcreditorlong);	// use label long of the seller to show
+	$creditor = getDolGlobalString($paramcreditorlong); // use label long of the seller to show
 } elseif (getDolGlobalString($paramcreditor)) {
-	$creditor = getDolGlobalString($paramcreditor);		// use label short of the seller to show
+	$creditor = getDolGlobalString($paramcreditor); // use label short of the seller to show
 }
 
 $mesg = '';
@@ -792,13 +792,13 @@ 
 		}
 
 		if ($error) {
-			$randomseckey = getRandomPassword(true, null, 20);		// TODO Generate a key including fulltag to avoid forging URL.
-			$_SESSION['paymentkosessioncode'] = $randomseckey;		// key between newpayment.php to paymentko.php
+			$randomseckey = getRandomPassword(true, null, 20); // TODO Generate a key including fulltag to avoid forging URL.
+			$_SESSION['paymentkosessioncode'] = $randomseckey; // key between newpayment.php to paymentko.php
 
 			$urlko .= '&paymentkosessioncode='.urlencode($randomseckey);
 		} else {
-			$randomseckey = getRandomPassword(true, null, 20);		// TODO Generate a key including fulltag to avoid forging URL.
-			$_SESSION['paymentoksessioncode'] = $randomseckey;		// key between newpayment.php to paymentok.php
+			$randomseckey = getRandomPassword(true, null, 20); // TODO Generate a key including fulltag to avoid forging URL.
+			$_SESSION['paymentoksessioncode'] = $randomseckey; // key between newpayment.php to paymentok.php
 
 			$urlok .= '&paymentoksessioncode='.urlencode($randomseckey);
 		}
@@ -845,8 +845,8 @@ 
 			setEventMessages($paymentintent->status, null, 'errors');
 			$action = '';
 
-			$randomseckey = getRandomPassword(true, null, 20);		// TODO Generate a key including fulltag to avoid forging URL.
-			$_SESSION['paymentkosessioncode'] = $randomseckey;		// key between newpayment.php to paymentko.php
+			$randomseckey = getRandomPassword(true, null, 20); // TODO Generate a key including fulltag to avoid forging URL.
+			$_SESSION['paymentkosessioncode'] = $randomseckey; // key between newpayment.php to paymentko.php
 
 			$urlko .= '&paymentkosessioncode='.urlencode($randomseckey);
 		} else {
@@ -872,8 +872,8 @@ 
 
 			dol_syslog("StatusOfRetrievedIntent is succeeded for amount = ".$amount." currency = ".$currency, LOG_DEBUG, 0, '_payment');
 
-			$randomseckey = getRandomPassword(true, null, 20);		// TODO Generate a key including fulltag to avoid forging URL.
-			$_SESSION['paymentoksessioncode'] = $randomseckey;		// key between newpayment.php to paymentok.php
+			$randomseckey = getRandomPassword(true, null, 20); // TODO Generate a key including fulltag to avoid forging URL.
+			$_SESSION['paymentoksessioncode'] = $randomseckey; // key between newpayment.php to paymentok.php
 
 			$urlok .= '&paymentoksessioncode='.urlencode($randomseckey);
 		}
@@ -883,8 +883,8 @@ 
 	$remoteip = getUserRemoteIP();
 
 	$_SESSION["onlinetoken"] = $stripeToken;
-	$_SESSION["FinalPaymentAmt"] = $amount;			// amount really paid (coming from Stripe). Will be used for check in paymentok.php.
-	$_SESSION["currencyCodeType"] = $currency;		// currency really used for payment (coming from Stripe). Will be used for check in paymentok.php.
+	$_SESSION["FinalPaymentAmt"] = $amount; // amount really paid (coming from Stripe). Will be used for check in paymentok.php.
+	$_SESSION["currencyCodeType"] = $currency; // currency really used for payment (coming from Stripe). Will be used for check in paymentok.php.
 	$_SESSION["paymentType"] = '';
 	$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
 	$_SESSION['payerID'] = is_object($customer) ? $customer->id : '';
@@ -931,7 +931,7 @@ 
 
 $head = '';
 if (getDolGlobalString('ONLINE_PAYMENT_CSS_URL')) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.(!empty($getpostlang) ? $getpostlang : $langs->defaultlang).'">'."\n";
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('ONLINE_PAYMENT_CSS_URL').'?lang='.(!empty($getpostlang) ? $getpostlang : $langs->defaultlang).'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -1004,7 +1004,7 @@ 
 // Output html code for logo
 if ($ws) {
 	// Look for a personalized header file (htmlheaderpayment.html) if the payment system is called from a website
-	$filehtmlheader = dol_sanitizePathName(DOL_DATA_ROOT . ($conf->entity > 1 ? '/' . $conf->entity : '') . '/website/' . $ws . '/htmlheaderpayment.html');
+	$filehtmlheader = dol_sanitizePathName(DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$ws.'/htmlheaderpayment.html');
 	if (dol_is_file($filehtmlheader)) {
 		print file_get_contents(dol_osencode($filehtmlheader));
 	}
@@ -1065,7 +1065,7 @@ 
 	if (preg_match('/^\((.*)\)$/', getDolGlobalString('PAYMENT_NEWFORM_TEXT'), $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
 	} else {
-		$text .= getDolGlobalString('PAYMENT_NEWFORM_TEXT') . "<br>\n";
+		$text .= getDolGlobalString('PAYMENT_NEWFORM_TEXT')."<br>\n";
 	}
 	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
@@ -1076,7 +1076,7 @@ 
 print $text;
 
 // Output payment summary form
-print '<tr><td align="center">';	// class=center does not have the payment button centered so we keep align here.
+print '<tr><td align="center">'; // class=center does not have the payment button centered so we keep align here.
 print '<table class="centpercent left" id="tablepublicpayment">';
 print '<tr class="hideonsmartphone"><td colspan="2" align="left" class="opacitymedium">'.$langs->trans("ThisIsInformationOnPayment").' :</td></tr>'."\n";
 
@@ -1118,7 +1118,7 @@ 
 		// Currency
 		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	} else {
-		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	}
@@ -1219,7 +1219,7 @@ 
 		// Currency
 		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	} else {
-		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	}
@@ -1351,12 +1351,12 @@ 
 			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.price2num(GETPOST("newamount", "alpha"), 'MT').'">';
 			print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 		} else {
-			print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+			print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 			print '<input type="hidden" name="amount" value="'.$amount.'">';
 			print '<input type="hidden" name="newamount" value="'.$amount.'">';
 		}
 	} else {
-		print '<b class="amount">'.price($object->total_ttc, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+		print '<b class="amount">'.price($object->total_ttc, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 	}
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
@@ -1560,7 +1560,7 @@ 
 		// Currency
 		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
 	} else {
-		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 		print '<input type="hidden" name="amount" value="'.$amount.'">';
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	}
@@ -1622,7 +1622,7 @@ 
 	$member = new Adherent($db);
 	$adht = new AdherentType($db);
 
-	$result = $member->fetch(0, $ref, 0, '', true, true);	// This fetch also ->last_subscription_amount
+	$result = $member->fetch(0, $ref, 0, '', true, true); // This fetch also ->last_subscription_amount
 	if ($result <= 0) {
 		$mesg = $member->error;
 		$error++;
@@ -1726,7 +1726,7 @@ 
 		$newtypeid = (int) (GETPOSTISSET("typeid") ? GETPOSTINT("typeid") : $member->typeid);
 		if (getDolGlobalString('MEMBER_ALLOW_CHANGE_OF_TYPE')) {
 			$typeid = $newtypeid;
-			$adht->fetch($typeid);	// Reload with the new type id
+			$adht->fetch($typeid); // Reload with the new type id
 		}
 
 		$caneditamount = $adht->caneditamount;
@@ -1786,7 +1786,7 @@ 
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	// This place no longer allows amount edition
 	if (getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO')) {
-		print ' - <a href="' . getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
+		print ' - <a href="'.getDolGlobalString('MEMBER_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
 	}
 	print '</td><td class="CTableRow2">';
 
@@ -1800,9 +1800,9 @@ 
 			print '<input type="text" class="width75" name="newamount" value="'.price($amount, 1, $langs, 1, -1, -1).'">';
 		}
 	} else {
-		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+		print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 		if ($minimumamount > $amount) {
-			print ' &nbsp; <span class="opacitymedium small">'. $langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)).'</span>';
+			print ' &nbsp; <span class="opacitymedium small">'.$langs->trans("AmountIsLowerToMinimumNotice", price($minimumamount, 1, $langs, 1, -1, -1, $currency)).'</span>';
 		}
 		print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	}
@@ -1923,7 +1923,7 @@ 
 			print ' ('.$langs->trans("ToComplete");
 		}
 		if (getDolGlobalString('DONATION_EXT_URL_SUBSCRIPTION_INFO')) {
-			print ' - <a href="' . getDolGlobalString('DONATION_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
+			print ' - <a href="'.getDolGlobalString('DONATION_EXT_URL_SUBSCRIPTION_INFO').'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
 		}
 		if (!getDolGlobalString('DONATION_NEWFORM_AMOUNT')) {
 			print ')';
@@ -1961,7 +1961,7 @@ 
 			$valtoshow = max(getDolGlobalString('DONATION_MIN_AMOUNT'), $valtoshow);
 			$amount = $valtoshow;
 		}
-		print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+		print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 		print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
 	}
@@ -2037,7 +2037,7 @@ 
 	print '</b>';
 	print '</td></tr>'."\n";
 
-	if (! is_object($attendee->project)) {
+	if (!is_object($attendee->project)) {
 		$text = 'ErrorProjectNotFound';
 	} else {
 		$text = $langs->trans("PaymentEvent").' - '.$attendee->project->title;
@@ -2054,7 +2054,7 @@ 
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow2">';
 	$valtoshow = $amount;
-	print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+	print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 	print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
@@ -2138,7 +2138,7 @@ 
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow2">';
 	$valtoshow = $amount;
-	print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+	print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>'; // Price with currency
 	print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
 	print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
@@ -2396,7 +2396,7 @@ 
 
 		//print '<br>';
 
-		print '<!-- Show Stripe form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = ' . getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION').' STRIPE_USE_NEW_CHECKOUT = ' . getDolGlobalString('STRIPE_USE_NEW_CHECKOUT').' -->'."\n";
+		print '<!-- Show Stripe form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = '.getDolGlobalString('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION').' STRIPE_USE_NEW_CHECKOUT = '.getDolGlobalString('STRIPE_USE_NEW_CHECKOUT').' -->'."\n";
 		print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">'."\n";
 
 		print '<input type="hidden" name="token" value="'.newToken().'">'."\n";

htdocs/public/stripe/ipn.php

Spacing +31 added lines, -31 removed lines

@@ -194,12 +194,12 @@ 
 		if (!empty($user->email)) {
 			$sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
 		} else {
-			$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') . '" <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
+			$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'" <'.getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
 		}
 		$replyto = $sendto;
 		$sendtocc = '';
 		if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
-			$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL') . '" <' . getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
+			$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'" <'.getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
 		}
 
 		$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." should arrive in your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
@@ -297,12 +297,12 @@ 
 				if (!empty($user->email)) {
 					$sendto = dolGetFirstLastname($user->firstname, $user->lastname)." <".$user->email.">";
 				} else {
-					$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') . '" <' . getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
+					$sendto = getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'" <'.getDolGlobalString('MAIN_INFO_SOCIETE_MAIL').'>';
 				}
 				$replyto = $sendto;
 				$sendtocc = '';
 				if (getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL')) {
-					$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL') . '" <' . getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
+					$sendtocc = getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'" <'.getDolGlobalString('ONLINE_PAYMENT_SENDEMAIL').'>';
 				}
 
 				$message = "A bank transfer of ".price2num($event->data->object->amount / 100)." ".$event->data->object->currency." has been done to your account the ".dol_print_date($event->data->object->arrival_date, 'dayhour');
@@ -348,19 +348,19 @@ 
 	dol_syslog("object = ".var_export($event->data, true));
 	dol_syslog("object = ".var_export($event->data, true), LOG_DEBUG, 0, '_payment');
 
-	include_once DOL_DOCUMENT_ROOT . '/compta/paiement/class/paiement.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 	global $stripearrayofkeysbyenv;
 	$error = 0;
 	$object = $event->data->object;
-	$TRANSACTIONID = $object->id;	// Example pi_123456789...
+	$TRANSACTIONID = $object->id; // Example pi_123456789...
 	$ipaddress = $object->metadata->ipaddress;
 	$now = dol_now();
 	$currencyCodeType = strtoupper($object->currency);
 	$paymentmethodstripeid = $object->payment_method;
 	$customer_id = $object->customer;
 	$invoice_id = "";
-	$paymentTypeCode = "";			// payment type according to Stripe
-	$paymentTypeCodeInDolibarr = "";	// payment type according to Dolibarr
+	$paymentTypeCode = ""; // payment type according to Stripe
+	$paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr
 	$payment_amount = 0;
 	$payment_amountInDolibarr = 0;
 
@@ -432,7 +432,7 @@ 
 		$s = new \Stripe\StripeClient($stripeacc);
 
 		$paymentmethodstripe = $s->paymentMethods->retrieve($paymentmethodstripeid);
-		$paymentTypeCode =  $paymentmethodstripe->type;
+		$paymentTypeCode = $paymentmethodstripe->type;
 		if ($paymentTypeCode == "ban" || $paymentTypeCode == "sepa_debit") {
 			$paymentTypeCode = "PRE";
 		} elseif ($paymentTypeCode == "card") {
@@ -459,9 +459,9 @@ 
 			$paiement->datepaye = $now;
 			$paiement->date = $now;
 			if ($currencyCodeType == $conf->currency) {
-				$paiement->amounts = [$invoice_id => $payment_amount];   // Array with all payments dispatching with invoice id
+				$paiement->amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching with invoice id
 			} else {
-				$paiement->multicurrency_amounts = [$invoice_id => $payment_amount];   // Array with all payments dispatching
+				$paiement->multicurrency_amounts = [$invoice_id => $payment_amount]; // Array with all payments dispatching
 
 				$postactionmessages[] = 'Payment was done in a currency ('.$currencyCodeType.') other than the expected currency of company ('.$conf->currency.')';
 				$ispostactionok = -1;
@@ -484,8 +484,8 @@ 
 
 			$paiement->num_payment = '';
 			$paiement->note_public = '';
-			$paiement->note_private = 'StripeSepa payment received by IPN webhook - ' . dol_print_date($now, 'standard') . ' (TZ server) using servicestatus=' . $servicestatus . ($ipaddress ? ' from ip ' . $ipaddress : '') . ' - Transaction ID = ' . $TRANSACTIONID;
-			$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer_id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key'];		// May be we should store py_... instead of pi_... but we started with pi_... so we continue.
+			$paiement->note_private = 'StripeSepa payment received by IPN webhook - '.dol_print_date($now, 'standard').' (TZ server) using servicestatus='.$servicestatus.($ipaddress ? ' from ip '.$ipaddress : '').' - Transaction ID = '.$TRANSACTIONID;
+			$paiement->ext_payment_id = $TRANSACTIONID.':'.$customer_id.'@'.$stripearrayofkeysbyenv[$servicestatus]['publishable_key']; // May be we should store py_... instead of pi_... but we started with pi_... so we continue.
 			$paiement->ext_payment_site = $service;
 
 			$ispaymentdone = 0;
@@ -504,23 +504,23 @@ 
 			$db->begin();
 
 			if (!$error && !$ispaymentdone) {
-				dol_syslog('* Record payment type PRE for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document.');
-				dol_syslog('* Record payment type PRE for invoice id ' . $invoice_id . '. It includes closing of invoice and regenerating document.', LOG_DEBUG, 0, '_payment');
+				dol_syslog('* Record payment type PRE for invoice id '.$invoice_id.'. It includes closing of invoice and regenerating document.');
+				dol_syslog('* Record payment type PRE for invoice id '.$invoice_id.'. It includes closing of invoice and regenerating document.', LOG_DEBUG, 0, '_payment');
 
 				// This include closing invoices to 'paid' (and trigger including unsuspending) and regenerating document
 				$paiement_id = $paiement->create($user, 1);
 				if ($paiement_id < 0) {
-					$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . implode("<br>\n", $paiement->errors);
+					$postactionmessages[] = $paiement->error.($paiement->error ? ' ' : '').implode("<br>\n", $paiement->errors);
 					$ispostactionok = -1;
 					$error++;
 
-					dol_syslog("Failed to create the payment for invoice id " . $invoice_id);
-					dol_syslog("Failed to create the payment for invoice id " . $invoice_id, LOG_DEBUG, 0, '_payment');
+					dol_syslog("Failed to create the payment for invoice id ".$invoice_id);
+					dol_syslog("Failed to create the payment for invoice id ".$invoice_id, LOG_DEBUG, 0, '_payment');
 				} else {
 					$postactionmessages[] = 'Payment created';
 
-					dol_syslog("The payment has been created for invoice id " . $invoice_id);
-					dol_syslog("The payment has been created for invoice id " . $invoice_id, LOG_DEBUG, 0, '_payment');
+					dol_syslog("The payment has been created for invoice id ".$invoice_id);
+					dol_syslog("The payment has been created for invoice id ".$invoice_id, LOG_DEBUG, 0, '_payment');
 				}
 			}
 
@@ -552,14 +552,14 @@ 
 						$label = '(CustomerInvoicePayment)';
 						$result = $paiement->addPaymentToBank($user, 'payment', $label, $bankaccountid, $customer_id, '');
 						if ($result < 0) {
-							$postactionmessages[] = $paiement->error . ($paiement->error ? ' ' : '') . implode("<br>\n", $paiement->errors);
+							$postactionmessages[] = $paiement->error.($paiement->error ? ' ' : '').implode("<br>\n", $paiement->errors);
 							$ispostactionok = -1;
 							$error++;
 						} else {
 							$postactionmessages[] = 'Bank transaction of payment created (by ipn.php file)';
 						}
 					} else {
-						$postactionmessages[] = 'Setup of bank account to use in module ' . $paymentmethod . ' was not set. No way to record the payment.';
+						$postactionmessages[] = 'Setup of bank account to use in module '.$paymentmethod.' was not set. No way to record the payment.';
 						$ispostactionok = -1;
 						$error++;
 					}
@@ -731,7 +731,7 @@ 
 			$error++;
 		}
 
-		if (! $error) {
+		if (!$error) {
 			$db->commit();
 		} else {
 			$db->rollback();
@@ -765,7 +765,7 @@ 
 		$companypaymentmode->card_type       = $event->data->object->card->branding;
 
 		$companypaymentmode->owner_name      = $event->data->object->billing_details->name;
-		$companypaymentmode->proprio         = $companypaymentmode->owner_name;			// We may still need this formodulebuilder because name of field is "proprio"
+		$companypaymentmode->proprio         = $companypaymentmode->owner_name; // We may still need this formodulebuilder because name of field is "proprio"
 
 		$companypaymentmode->exp_date_month  = (int) $event->data->object->card->exp_month;
 		$companypaymentmode->exp_date_year   = (int) $event->data->object->card->exp_year;
@@ -862,12 +862,12 @@ 
 	$paymentmethodstripeid = $object->payment_method;
 	$customer_id = $object->customer;
 	$reason = $object->reason;
-	$amountdisputestripe = $object->amoutndispute;	// In stripe format
-	$amountdispute = $amountdisputestripe;			// In real currency format
+	$amountdisputestripe = $object->amoutndispute; // In stripe format
+	$amountdispute = $amountdisputestripe; // In real currency format
 
 	$invoice_id = 0;
-	$paymentTypeCode = "";			// payment type according to Stripe
-	$paymentTypeCodeInDolibarr = "";	// payment type according to Dolibarr
+	$paymentTypeCode = ""; // payment type according to Stripe
+	$paymentTypeCodeInDolibarr = ""; // payment type according to Dolibarr
 	$payment_amount = 0;
 	$payment_amountInDolibarr = 0;
 
@@ -949,7 +949,7 @@ 
 	$paiement->multicurrency_tx = $multicurrency_tx; // Array with all currency tx of payments dispatching
 	*/
 	$paiement->paiementid   = dol_getIdFromCode($db, 'PRE', 'c_paiement', 'code', 'id', 1);
-	$paiement->num_payment  = $object->id;	// A string like 'du_...'
+	$paiement->num_payment  = $object->id; // A string like 'du_...'
 	$paiement->note_public = 'Fund withdrawn by bank. Reason: '.$reason;
 	$paiement->note_private = '';
 	$paiement->fk_account   = $accountfrom->id;
@@ -965,7 +965,7 @@ 
 		$error++;
 	}
 
-	if (! $error && $tmpinvoice->status == Facture::STATUS_CLOSED) {
+	if (!$error && $tmpinvoice->status == Facture::STATUS_CLOSED) {
 		// Switch back the invoice to status validated
 		$result = $tmpinvoice->setStatut(Facture::STATUS_VALIDATED);
 		if ($result < 0) {
@@ -974,7 +974,7 @@ 
 		}
 	}
 
-	if (! $error) {
+	if (!$error) {
 		$paiement_id = $paiement->create($user, 0, $tmpinvoice->thirdparty); // This include regenerating documents
 		if ($paiement_id < 0) {
 			$errormsg = $paiement->error.implode(', ', $paiement->errors);