diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index c5b8fd20045..f2a7842dbbb 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -504,8 +504,8 @@ if ($id) {
print '
';
@@ -173,7 +172,7 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
$monCompte = GETPOST('codeventil'.$monId);
if ($monCompte <= 0) {
- $msg .= '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'
';
+ $msg .= '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'
';
$ko++;
} else {
$sql = " UPDATE ".MAIN_DB_PREFIX."expensereport_det";
@@ -185,10 +184,10 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
dol_syslog('accountancy/expensereport/list.php:: sql='.$sql, LOG_DEBUG);
if ($db->query($sql)) {
- $msg .= '
'.$langs->trans("LineOfExpenseReport").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'
';
+ $msg .= '
'.$langs->trans("LineOfExpenseReport").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'
';
$ok++;
} else {
- $msg .= '
'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).' '.$sql.' ';
+ $msg .= '
'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).' '.$sql.' ';
$ko++;
}
}
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index aae34a51e03..3ec92f490bd 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -170,7 +170,6 @@ if (empty($reshook)) {
if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
$msg = '';
- //print '
' . $langs->trans("Processing") . '...
';
if (!empty($mesCasesCochees)) {
$msg = '
'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'
';
$msg .= '
';
@@ -184,7 +183,7 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
$monCompte = GETPOST('codeventil'.$monId);
if ($monCompte <= 0) {
- $msg .= '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'
';
+ $msg .= '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NoAccountSelected").'
';
$ko++;
} else {
$sql = " UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
@@ -196,10 +195,10 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
dol_syslog('accountancy/supplier/list.php', LOG_DEBUG);
if ($db->query($sql)) {
- $msg .= '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'
';
+ $msg .= '
'.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'
';
$ok++;
} else {
- $msg .= '
'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).' '.$sql.' ';
+ $msg .= '
'.$langs->trans("ErrorDB").' : '.$langs->trans("Lineofinvoice").' '.$monId.' - '.$langs->trans("NotVentilatedinAccount").' : '.length_accountg($accountventilated->account_number).' '.$sql.' ';
$ko++;
}
}
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index f9a43e47f0f..4bc3e3e55e4 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1873,7 +1873,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print "\n";
print "
\n";
- print '';
@@ -2411,7 +2410,7 @@ class Adherent extends CommonObject
if ($withpictoimg) {
$paddafterimage = '';
if (abs($withpictoimg) == 1) {
- $paddafterimage = 'style="margin-right: 3px;"';
+ $morecss .= ' paddingrightonly';
}
// Only picto
if ($withpictoimg > 0) {
diff --git a/htdocs/adherents/stats/index.php b/htdocs/adherents/stats/index.php
index 30b79f4bd76..0efdda9fbd2 100644
--- a/htdocs/adherents/stats/index.php
+++ b/htdocs/adherents/stats/index.php
@@ -225,7 +225,7 @@ print '';
print '
';
-print '';
$moreforfilter .= '
';
$moreforfilter .= img_picto($langs->trans("Filter"), 'filter', 'class="paddingright opacityhigh hideonsmartphone"').'
';
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index e1b47b5beaa..eec4d564d9f 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -580,14 +580,14 @@ print '
';
print '
MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED = '.getDolGlobalString('MAIN_DOCUMENT_IS_OUTSIDE_WEBROOT_SO_NOEXE_NOT_REQUIRED', '
'.$langs->trans("Undefined").' ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0) ')."
";
print '
';
-print '
MAIN_SECURITY_FORCECSP = '.getDolGlobalString('MAIN_SECURITY_FORCECSP', '
'.$langs->trans("Undefined").' ').'
('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self'; img-src *;\") ";
+print '
MAIN_SECURITY_FORCECSP = '.getDolGlobalString('MAIN_SECURITY_FORCECSP', '
'.$langs->trans("Undefined").' ').'
('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self' 'unsafe-inline'; img-src *;\") ";
print '
';
print '
MAIN_SECURITY_FORCERP = '.getDolGlobalString('MAIN_SECURITY_FORCERP', '
'.$langs->trans("Undefined").' ').'
('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\" so browser doesn't send any referrer when going into another web site domain) ";
print '
';
print '
WEBSITE_MAIN_SECURITY_FORCECSP = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSP', '
'.$langs->trans("Undefined").' ');
-print '
('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self'; style-src https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src *;\") ";
+print '
('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self' 'unsafe-inline'; style-src https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src https://cdn.transifex.com https://www.googletagmanager.com 'unsafe-inline'; object-src https://youtube.com; frame-src https://youtube.com; img-src *;\") ";
print '
';
print '
WEBSITE_MAIN_SECURITY_FORCERP = '.getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCERP', '
'.$langs->trans("Undefined").' ').'
('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\") ";
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 8afd1f7e03c..3ce6dbd48a4 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -169,7 +169,7 @@ print '
';
print $langs->trans("DatabaseName").' : '.$dolibarr_main_db_name.' ';
print ' ';
print '';
-print '
';
+print ' ';
print '';
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 88cae3e4293..12d1b561683 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -196,7 +196,7 @@ function printDropdownBookmarksList()
';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index b8a73cf1b9b..8cabb3d3215 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -2493,7 +2493,7 @@ if ($id > 0) {
if ($action != 'edit') {
if (empty($conf->global->AGENDA_DISABLE_BUILDDOC)) {
- print '
';
+ print '
';
print '
'; // ancre
/*
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 600d22b432a..32f6e571fcd 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -1539,7 +1539,7 @@ if ($object->id > 0) {
}
print '
';
- print '
';
+ print '
';
print dol_get_fiche_end();
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index db85490e1bb..9473ca3bcb5 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -366,7 +366,7 @@ print '
';
print '';
-print '
';
+print '
';
print dol_get_fiche_end();
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 9052ed7ab27..20fccd3f000 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -426,7 +426,7 @@ print ' ';
print '
';
-print '