Fix phpcs

dev/setup/codesniffer/ruleset.xml

@@ -167,7 +167,6 @@
 	<rule ref="Generic.Strings.UnnecessaryStringConcat" />
 
 	<rule ref="Generic.Strings.UnnecessaryStringConcat.Found">
-        <severity>0</severity>
 	</rule>
 
 	<!-- Disallow usage of tab -->

htdocs/accountancy/journal/purchasesjournal.php

@@ -936,7 +936,7 @@ if (empty($action) || $action == 'view') {
 					$accountoshow = length_accountg($k);
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
-						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')'.'</span>';
+						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Purchase").')</span>';
 					}
 					else print $accountoshow;
 					print "</td>";

htdocs/accountancy/journal/sellsjournal.php

@@ -874,7 +874,7 @@ if (empty($action) || $action == 'view') {
 					$accountoshow = length_accountg($k);
 					if (($accountoshow == "") || $accountoshow == 'NotDefined')
 					{
-						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')'.'</span>';
+						print '<span class="error">'.$langs->trans("VATAccountNotDefined").' ('.$langs->trans("Sale").')</span>';
 					}
 					else print $accountoshow;
 					print "</td>";

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

@@ -213,19 +213,17 @@ class Dolistore
 		{
 			$cat = $this->categories[$i];
 			if ($cat->is_root_category == 1 && $parent == 0) {
-				$html .= '<li class="root"><h3 class="nomargesupinf"><a class="nomargesupinf link2cat" href="?mode=marketplace&categorie='.$cat->id.'" '
-					.'title="'.dol_escape_htmltag(strip_tags($cat->description->language[$this->lang - 1])).'"'
-						.'>'.$cat->name->language[$this->lang - 1].' <sup>'.$cat->nb_products_recursive.'</sup></a></h3>';
-						$html .= self::get_categories($cat->id);
-						$html .= "</li>\n";
+				$html .= '<li class="root"><h3 class="nomargesupinf"><a class="nomargesupinf link2cat" href="?mode=marketplace&categorie='.$cat->id.'" ';
+				$html .= 'title="'.dol_escape_htmltag(strip_tags($cat->description->language[$this->lang - 1])).'">'.$cat->name->language[$this->lang - 1].' <sup>'.$cat->nb_products_recursive.'</sup></a></h3>';
+				$html .= self::get_categories($cat->id);
+				$html .= "</li>\n";
 			} elseif (trim($cat->id_parent) == $parent && $cat->active == 1 && trim($cat->id_parent) != 0) { // si cat est de ce niveau
 				$select = ($cat->id == $this->categorie) ? ' selected' : '';
-				$html   .= '<li><a class="link2cat'.$select.'" href="?mode=marketplace&categorie='.$cat->id.'"'
-					.' title="'.dol_escape_htmltag(strip_tags($cat->description->language[$this->lang - 1])).'" '
-						.'>'.$cat->name->language[$this->lang - 1].' <sup>'.$cat->nb_products_recursive.'</sup></a>';
-						$html   .= self::get_categories($cat->id);
-						$html   .= "</li>\n";
-			} else {
+				$html .= '<li><a class="link2cat'.$select.'" href="?mode=marketplace&categorie='.$cat->id.'"';
+				$html .= ' title="'.dol_escape_htmltag(strip_tags($cat->description->language[$this->lang - 1])).'" ';
+				$html .= '>'.$cat->name->language[$this->lang - 1].' <sup>'.$cat->nb_products_recursive.'</sup></a>';
+				$html .= self::get_categories($cat->id);
+				$html .= "</li>\n";
 			}
 		}
 

htdocs/admin/external_rss.php

@@ -327,7 +327,7 @@ if ($resql)
 
 		print '</table>'."\n";
 
-		print "</form>"."\n";
+		print "</form>\n";
 
 		$i++;
 	}

htdocs/admin/system/perf.php

@@ -66,7 +66,7 @@ if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
 else
 {
 	print img_picto('', 'warning').' '.$langs->trans("ModuleActivated", $langs->transnoentities("XDebug"));
-	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
 }
 print '<br>';
 
@@ -123,7 +123,7 @@ if (!$foundcache && $test)
 {
 	$foundcache++;
 	print img_picto('', 'tick.png').' '.$langs->trans("PHPModuleLoaded", "XCache");
-	print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xcache.php'.'">Xcache admin page</a>';
+	print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xcache.php">Xcache admin page</a>';
 }
 $test = function_exists('eaccelerator_info');
 if (!$foundcache && $test)

htdocs/blockedlog/admin/blockedlog_list.php

@@ -223,20 +223,20 @@ if ($action === 'downloadblockchain') {
 				{
 					$statusofrecordnote = $langs->trans("PreviousFingerprint").': '.$previoushash.($statusofrecordnote ? ' - '.$statusofrecordnote : '');
 				}
-				print $obj->rowid
-					.';'.$obj->date_creation
-					.';"'.$obj->user_fullname.'"'
-					.';'.$obj->action
-					.';'.$obj->element
-					.';'.$obj->amounts
-					.';'.$obj->fk_object
-					.';'.$obj->date_object
-					.';"'.$obj->ref_object.'"'
-					.';'.$obj->signature
-					.';'.$statusofrecord
-					.';'.$statusofrecordnote
-					.';"'.str_replace('"', '""', $obj->object_data).'"'
-					."\n";
+				print $obj->rowid;
+				print ';'.$obj->date_creation;
+				print ';"'.str_replace('"', '""', $obj->user_fullname).'"';
+				print ';'.$obj->action;
+				print ';'.$obj->element;
+				print ';'.$obj->amounts;
+				print ';'.$obj->fk_object;
+				print ';'.$obj->date_object;
+				print ';"'.str_replace('"', '""', $obj->ref_object).'"';
+				print ';'.$obj->signature;
+				print ';'.$statusofrecord;
+				print ';'.$statusofrecordnote;
+				print ';"'.str_replace('"', '""', $obj->object_data).'"';
+				print "\n";
 
 				// Set new previous hash for next fetch
 				$previoushash = $obj->signature;

htdocs/categories/index.php

@@ -184,9 +184,7 @@ foreach ($fulltree as $key => $val)
 	'rowid'=>$val['rowid'],
 	'fk_menu'=>$val['fk_parent'],
 	'entry'=>'<table class="nobordernopadding centpercent"><tr><td><span class="noborderoncategories" '.($categstatic->color ? ' style="background: #'.$categstatic->color.';"' : ' style="background: #aaa"').'>'.$li.'</span></td>'.$counter.
-	//'<td width="50%">'.dolGetFirstLineOfText($desc).'</td>'.
-	'<td class="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a></td>'.
-	'</tr></table>'
+		'<td class="right" width="20px;"><a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.$val['id'].'&type='.$type.'">'.img_view().'</a></td></tr></table>'
 	);
 }
 

htdocs/compta/tva/clients.php

@@ -191,15 +191,15 @@ if (!empty($conf->global->MAIN_MODULE_ACCOUNTING)) $description .= '<br>'.$langs
 $description .= ($description ? '<br>' : '').$fsearch;
 if (!empty($conf->global->TAX_REPORT_EXTRA_REPORT))
 {
-    $description .= '<br>'
-        . '<input type="radio" name="extra_report" value="0" '.($special_report ? '' : 'checked="checked"').'> '
-            . $langs->trans('SimpleReport')
-            . '</input>'
-                . '<br>'
-                    . '<input type="radio" name="extra_report" value="1" '.($special_report ? 'checked="checked"' : '').'> '
-                        . $langs->trans('AddExtraReport')
-                        . '</input>'
-                            . '<br>';
+    $description .= '<br>';
+    $description .= '<input type="radio" name="extra_report" value="0" '.($special_report ? '' : 'checked="checked"').'> ';
+    $description .= $langs->trans('SimpleReport');
+    $description .= '</input>';
+    $description .= '<br>';
+    $description .= '<input type="radio" name="extra_report" value="1" '.($special_report ? 'checked="checked"' : '').'> ';
+    $description .= $langs->trans('AddExtraReport');
+    $description .= '</input>';
+    $description .= '<br>';
 }
 
 $elementcust = $langs->trans("CustomersInvoices");

htdocs/core/class/html.form.class.php

@@ -6642,8 +6642,7 @@ class Form
 				$out .= 'function formatResult(record) {'."\n";
 				if ($elemtype == 'category')
 				{
-					$out .= '	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';
-									  	return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> \'+record.text+\'</span>\';';
+					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> \'+record.text+\'</span>\';';
 				}
 				else
 				{

htdocs/core/filemanagerdol/connectors/php/util.php

@@ -56,16 +56,10 @@ function RemoveFromEnd($sourceString, $charToRemove)
  */
 function FindBadUtf8($string)
 {
-	$regex = '([\x00-\x7F]'.
-	'|[\xC2-\xDF][\x80-\xBF]'.
-	'|\xE0[\xA0-\xBF][\x80-\xBF]'.
-	'|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.
-	'|\xED[\x80-\x9F][\x80-\xBF]'.
-	'|\xF0[\x90-\xBF][\x80-\xBF]{2}'.
-	'|[\xF1-\xF3][\x80-\xBF]{3}'.
-	'|\xF4[\x80-\x8F][\x80-\xBF]{2}'.
-	'|(.{1}))';
+	$regex = '([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]';
+	$regex .= '|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2}|(.{1}))';
 
+	$matches =array();
 	while (preg_match('/'.$regex.'/S', $string, $matches)) {
 		if (isset($matches[2])) {
 			return true;

htdocs/core/js/lib_notification.js.php

@@ -75,7 +75,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
                     	var audio = null;
                         <?php
 						if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-							print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
+							print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav\');';
 						}
 						?>
 

htdocs/core/lib/cron.lib.php

@@ -107,7 +107,7 @@ function dol_print_cron_urls()
 
 	print '<u>'.$langs->trans("FileToLaunchCronJobs").':</u><br>';
 
-	$file = '/scripts/cron/cron_run_jobs.php'.' '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
+	$file = '/scripts/cron/cron_run_jobs.php '.(empty($conf->global->CRON_KEY) ? 'securitykey' : ''.$conf->global->CRON_KEY.'').' '.$logintouse.' [cronjobid]';
 	print '<textarea class="quatrevingtpercent">..'.$file."</textarea><br>\n";
 	print '<br>';
 

htdocs/core/lib/project.lib.php

@@ -642,7 +642,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 								if ($source == 'internal') $c = new User($db);
 								else $c = new Contact($db);
 								$c->fetch($contacttask['id']);
-								print $c->getNomUrl(1).' ('.$contacttask['libelle'].')'.'<br>';
+								print $c->getNomUrl(1).' ('.$contacttask['libelle'].')<br>';
 							}
 						}
 					}

htdocs/core/lib/website2.lib.php

@@ -133,7 +133,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 	$tplcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {\n";
 	$tplcontent .= '	$pathdepth = count(explode(\'/\', $_SERVER[\'SCRIPT_NAME\'])) - 2;'."\n";
 	$tplcontent .= '	require_once ($pathdepth ? str_repeat(\'../\', $pathdepth) : \'./\').\'master.inc.php\';'."\n";
-	$tplcontent .= "} // Not already loaded"."\n";
+	$tplcontent .= "} // Not already loaded\n";
 	$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
 	$tplcontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 	$tplcontent .= "ob_start();\n";
@@ -212,7 +212,7 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage)
 
 	$tplcontent .= '<?php // BEGIN PHP'."\n";
 	$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", '.$objectpage->id.');'."\n";
-	$tplcontent .= "// END PHP ?>"."\n";
+	$tplcontent .= "// END PHP ?>\n";
 
 	//var_dump($filetpl);exit;
 	$result = file_put_contents($filetpl, $tplcontent);

htdocs/core/lib/xcal.lib.php

@@ -251,7 +251,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				}
 
 				fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
-				fwrite($calfileh, "STATUS:CONFIRMED"."\n");
+				fwrite($calfileh, "STATUS:CONFIRMED\n");
 
 				if (!empty($transparency))
 				{
@@ -295,7 +295,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 
 				fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
 				fwrite($calfileh, "DESCRIPTION:".$encoding.$description."\n");
-				fwrite($calfileh, "STATUS:CONFIRMED"."\n");
+				fwrite($calfileh, "STATUS:CONFIRMED\n");
 				fwrite($calfileh, "CATEGORIES:".$category."\n");
 				fwrite($calfileh, "LOCATION:".$location."\n");
 				fwrite($calfileh, "TRANSP:OPAQUE\n");
@@ -381,7 +381,7 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 			$url = $urlwithroot."/public/agenda/agendaexport.php?format=rss&exportkey=".urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY);
 		}
 
-		fwrite($fichier, "<link><![CDATA[".$url."]]></link>"."\n");
+		fwrite($fichier, "<link><![CDATA[".$url."]]></link>\n");
 
 		foreach ($events_array as $key => $event)
 		{
@@ -480,9 +480,9 @@ function format_cal($format, $string)
 	if ($format === "ical")
 	{
 		// Replace new lines chars by "\n"
-		$newstring = preg_replace("/"."\r\n"."/i", "\\n", $newstring);
-		$newstring = preg_replace("/"."\n\r"."/i", "\\n", $newstring);
-		$newstring = preg_replace("/"."\n"."/i", "\\n", $newstring);
+		$newstring = preg_replace("/\r\n/i", "\\n", $newstring);
+		$newstring = preg_replace("/\n\r/i", "\\n", $newstring);
+		$newstring = preg_replace("/\n/i", "\\n", $newstring);
 
 		// Must not exceed 75 char. Cut with "\r\n"+Space
 		$newstring = calEncode($newstring);
@@ -586,7 +586,7 @@ function quotedPrintEncode($str, $forcal = 0)
 			if ((strlen($newpara) + strlen($char)) >= 76)
 			{
 				// New line with carray-return (CR) and line-feed (LF)
-				$out .= $newpara."="."\r\n";
+				$out .= $newpara."=\r\n";
 
 				// extra space for cal
 				if ($forcal)

htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php

@@ -227,14 +227,14 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 				$posY += 2;
 
 				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->transnoentitiesnoconv("RUM").')'.' : '.$object->rum, 0, 'L');
+				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->transnoentitiesnoconv("RUM").') : '.$object->rum, 0, 'L');
 
 				$posY = $pdf->GetY();
 				$posY += 2;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$ics = '';
 				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").')'.' : '.$ics, 0, 'L');
+				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").') : '.$ics, 0, 'L');
 
 				$posY = $pdf->GetY();
 				$posY += 1;

htdocs/install/repair.php

@@ -1440,9 +1440,9 @@ if ($ok && GETPOST('repair_link_dispatch_lines_supplier_order_lines')) {
             exit;
         }
         while ($obj_dispatch = $db->fetch_object($resql_dispatch)) {
-            $sql_line = 'SELECT line.rowid, line.qty FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet AS line'
-                .       ' WHERE line.fk_commande = '.$obj_dispatch->fk_commande
-                .       ' AND   line.fk_product  = '.$obj_dispatch->fk_product;
+            $sql_line = 'SELECT line.rowid, line.qty FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet AS line';
+            $sql_line .= ' WHERE line.fk_commande = '.$obj_dispatch->fk_commande;
+            $sql_line .= ' AND   line.fk_product  = '.$obj_dispatch->fk_product;
             $resql_line = $db->query($sql_line);
 
             // s’il y a plusieurs lignes avec le même produit sur cette commande fournisseur,

htdocs/opensurvey/fonctions.php

@@ -84,7 +84,7 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 
 	print '<span id="dolpaymentspan"></span>'."\n";
 	print '<div class="center">'."\n";
-	print '<form name="formulaire" action="studs.php?sondage='.$numsondage.'"'.'#bas" method="POST">'."\n";
+	print '<form name="formulaire" action="studs.php?sondage='.urlencode($numsondage).'#bas" method="POST">'."\n";
 	print '<input type="hidden" name="sondage" value="'.$numsondage.'"/>';
 	print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 	print "\n";

htdocs/product/stock/replenishorders.php

@@ -172,22 +172,22 @@ if ($resql)
     print '<table class="noborder centpercent">';
 
     print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre">'.
-         '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">'.
-         '</td>'.
-         '<td class="liste_titre">'.
-         '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">'.
-         '</td>'.
-         '<td class="liste_titre">'.
-         '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">'.
-         '</td>'.
-         '<td class="liste_titre">'.
-         '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">'.
-         '</td>'.
-         '<td class="liste_titre">'.
-         $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '').
-         '</td>'.
-         '<td class="liste_titre right">';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
+    print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
+    print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">';
+    print '</td>';
+    print '<td class="liste_titre">';
+    print '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
+    print '</td>';
+    print '<td class="liste_titre">';
+    print $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '');
+    print '</td>';
+    print '<td class="liste_titre right">';
     $searchpicto = $form->showFilterAndCheckAddButtons(0);
     print $searchpicto;
     print '</td>';

htdocs/public/members/public_card.php

@@ -66,7 +66,7 @@ $extrafields = new ExtraFields($db);
 
 $morehead = '';
 if (!empty($conf->global->MEMBER_PUBLIC_CSS)) $morehead = '<link rel="stylesheet" type="text/css" href="'.$conf->global->MEMBER_PUBLIC_CSS.'">';
-else $morehead = '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php'.'">';
+else $morehead = '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.'/theme/eldy/style.css.php">';
 
 llxHeaderVierge($langs->trans("MemberCard"), $morehead);
 

htdocs/public/opensurvey/studs.php

@@ -690,7 +690,7 @@ if ($object->allow_spy) {
 
 				if (strpos($toutsujet[$i], '@') !== false) {
 					$toutsujetdate = explode("@", $toutsujet[$i]);
-					$meilleursujet .= dol_print_date($toutsujetdate[0], 'daytext').' ('.dol_print_date($toutsujetdate[0], '%A').')'.' - '.$toutsujetdate[1];
+					$meilleursujet .= dol_print_date($toutsujetdate[0], 'daytext').' ('.dol_print_date($toutsujetdate[0], '%A').') - '.$toutsujetdate[1];
 				} else {
 					$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').' ('.dol_print_date($toutsujet[$i], '%A').')';
 				}

htdocs/public/payment/newpayment.php

@@ -1924,7 +1924,7 @@ if (preg_match('/^dopayment/', $action))			// If we choosed/click on the payment
 
         print '<br>';
         print '<button class="button buttonpayment" style="text-align: center; padding-left: 0; padding-right: 0;" id="buttontopay" data-secret="'.(is_object($paymentintent) ? $paymentintent->client_secret : '').'">'.$langs->trans("ValidatePayment").'</button>';
-        print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif'.'">';
+        print '<img id="hourglasstopay" class="hidden" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/working.gif">';
 
         print '</td></tr></tbody>';
         print '</table>';

htdocs/reception/card.php

@@ -1858,7 +1858,7 @@ elseif ($id || $ref)
 						print '<!-- case edit 1 -->';
 						print '<tr>';
 						// Qty to receive or received
-						print '<td>'.'<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">'.'</td>';
+						print '<td><input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'"></td>';
 						// Warehouse source
 						print '<td>'.$formproduct->selectWarehouses($lines[$i]->fk_entrepot, 'entl'.$line_id, '', 1, 0, $lines[$i]->fk_product, '', 1).'</td>';
 						// Batch number managment
@@ -1878,11 +1878,11 @@ elseif ($id || $ref)
 						print '<!-- case edit 2 -->';
 						print '<tr>';
 						// Qty to receive or received
-						print '<td>'.'<input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'">'.'</td>';
+						print '<td><input name="qtyl'.$line_id.'" id="qtyl'.$line_id.'" type="text" size="4" value="'.$lines[$i]->qty.'"></td>';
 						// Warehouse source
-						print '<td>'.'</td>';
+						print '<td></td>';
 						// Batch number managment
-						print '<td>'.'</td>';
+						print '<td></td>';
 						print '</tr>';
 					}
 				}

htdocs/takepos/admin/terminal.php

@@ -264,7 +264,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 
 print '<tr class="oddeven"><td>'.$langs->trans('CashDeskReaderKeyCodeForEnter').'</td>';
 print '<td>';
-print '<input type="text" name="'.'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse.'" value="'.$conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse}.'" />';
+print '<input type="text" name="CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse.'" value="'.$conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$terminaltouse}.'" />';
 print '</td></tr>';
 
 // Numbering module