';
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index aebd2ae4c0e..39f44e35585 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1520,7 +1520,7 @@ if ($action == 'create') {
// Area with common detail of line
print '
';
- print '
';
+ print '';
$sql = "SELECT cd.rowid, cd.statut, cd.label as label_det, cd.fk_product, cd.product_type, cd.description, cd.price_ht, cd.qty,";
$sql .= " cd.tva_tx, cd.vat_src_code, cd.remise_percent, cd.info_bits, cd.subprice, cd.multicurrency_subprice,";
@@ -1540,6 +1540,7 @@ if ($action == 'create') {
$objp = $db->fetch_object($result);
+ // Line title
print '';
print '| '.$langs->trans("ServiceNb", $cursorline).' | ';
print ''.$langs->trans("VAT").' | ';
@@ -1584,7 +1585,9 @@ if ($action == 'create') {
if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $objp->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') {
$moreparam = 'style="display: none;"';
}
+
print '
';
+
// Label
if ($objp->fk_product > 0) {
$productstatic->id = $objp->fk_product;
@@ -1610,7 +1613,7 @@ if ($action == 'create') {
$description = ''; // Already added into main visible desc
}
- echo $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 0, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
+ print $form->textwithtooltip($text, $description, 3, '', '', $cursorline, 3, (!empty($line->fk_parent_line) ?img_picto('', 'rightarrow') : ''));
print '';
} else {
@@ -1666,16 +1669,16 @@ if ($action == 'create') {
print "
\n";
+ $colspan = 6;
+ if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
+ $colspan++;
+ }
+ if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+ $colspan++;
+ }
+
// Dates of service planed and real
if ($objp->subprice >= 0) {
- $colspan = 6;
-
- if (isModEnabled('margin') && getDolGlobalString('PRODUCT_USE_UNITS')) {
- $colspan = 8;
- } elseif (isModEnabled('margin') || getDolGlobalString('PRODUCT_USE_UNITS')) {
- $colspan = 7;
- }
-
print '';
print '| ';
@@ -1832,8 +1835,17 @@ if ($action == 'create') {
if (!empty($conf->global->CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT) && $object->lines[$cursorline - 1]->statut == ContratLigne::STATUS_CLOSED && $action != 'showclosedlines') {
$moreparam = 'style="display: none;"';
}
+
+ $colspan = 6;
+ if (getDolGlobalInt('PRODUCT_USE_UNITS')) {
+ $colspan++;
+ }
+ if (isModEnabled('margin') && !empty($conf->global->MARGIN_SHOW_ON_CONTRACT)) {
+ $colspan++;
+ }
+
print ' |
';
- print '
| ';
+ print '
| ';
print "
\n";
}
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index b680a81521c..b599480f583 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -96,7 +96,7 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && !emp
// Parse $newUrl
$newUrlArray = parse_url($link);
- // Check URL is external
+ // Allow external links to svg ?
if (!getDolGlobalString('MAIN_ALLOW_SVG_FILES_AS_EXTERNAL_LINKS')) {
if (!empty($newUrlArray['path']) && preg_match('/\.svg$/i', $newUrlArray['path'])) {
$error++;
@@ -104,9 +104,9 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC) && !emp
setEventMessages($langs->trans('ErrorSVGFilesNotAllowedAsLinksWithout', 'MAIN_ALLOW_SVG_FILES_AS_EXTERNAL_LINKS'), null, 'errors');
}
}
- // Alow external links to svg ?
+ // Check URL is external (must refuse local link by default)
if (!getDolGlobalString('MAIN_ALLOW_LOCAL_LINKS_AS_EXTERNAL_LINKS')) {
- // Test $newUrlAray['host'] to check link is external using isIPAllowed()
+ // Test $newUrlAray['host'] to check link is external using isIPAllowed() and if not refuse the local link
// TODO
}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 614fdfa366a..8e1b4d62a45 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -955,8 +955,6 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
*/
function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)
{
- global $conf;
-
// TODO : use class "Validate" to perform tests (and add missing tests) if needed for factorize
// Check is done after replacement
switch ($check) {
@@ -1044,8 +1042,9 @@ function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options
case 'nohtml': // No html
$out = dol_string_nohtmltag($out, 0);
break;
- case 'restricthtml': // Recommended for most html textarea
case 'restricthtmlnolink':
+ case 'restricthtml': // Recommended for most html textarea
+ case 'restricthtmlallowclass':
case 'restricthtmlallowunvalid':
$out = dol_htmlwithnojs($out, 1, $check);
break;
@@ -7356,7 +7355,7 @@ function dol_nl2br($stringtoencode, $nl2brmode = 0, $forxml = false)
*
* @param string $stringtoencode String to encode
* @param int $nouseofiframesandbox Allow use of option MAIN_SECURITY_USE_SANDBOX_FOR_HTMLWITHNOJS for html sanitizing
- * @param string $check 'restricthtmlnolink' or 'restricthtml' or 'restricthtmlallowunvalid'
+ * @param string $check 'restricthtmlnolink' or 'restricthtml' or 'restricthtmlallowclass' or 'restricthtmlallowunvalid'
* @return string HTML sanitized
*/
function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = 'restricthtml')
@@ -7415,7 +7414,7 @@ function dol_htmlwithnojs($stringtoencode, $nouseofiframesandbox = 0, $check = '
$out = preg_replace('/&#x?[0-9]+/i', '', $out); // For example if we have javascript with an entities without the ; to hide the 'a' of 'javascript'.
// Keep only some html tags and remove also some 'javascript:' strings
- $out = dol_string_onlythesehtmltags($out, 0, 1, 1);
+ $out = dol_string_onlythesehtmltags($out, 0, ($check == 'restricthtmlallowclass' ? 0 : 1), 1);
// We should also exclude non expected HTML attributes and clean content of some attributes (keep only alt=, title=...).
if (!empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)) {
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index e6e8dd819c0..d27c4dac376 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -760,7 +760,7 @@ function getStructuredData($type, $data = array())
$ret .= "\n".'}'."\n";
$ret .= ''."\n";
} else {
- $ret .= ''."\n";
+ $ret = ''."\n";
}
} elseif ($type == 'product') {
$ret = ''."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 5e586cecd99..0194c45b457 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -986,7 +986,14 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
} else {
print '
';
print '';
if ($action == 'contrat') {
- $formcontract = new Formcontract($db);
+ $formcontract = new FormContract($db);
$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1);
} else {
if ($object->fk_contrat) {
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 36ff728fe75..fe5850a6cd9 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1248,7 +1248,7 @@ if ($action == 'create') {
print ' |
';
print '
';
if ($action == 'contrat') {
- $formcontract = new Formcontract($db);
+ $formcontract = new FormContract($db);
$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1, 1);
} else {
if ($object->fk_contrat) {
diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql
index 52b576411cb..0561dfdf8e5 100644
--- a/htdocs/install/mysql/tables/llx_menu.sql
+++ b/htdocs/install/mysql/tables/llx_menu.sql
@@ -36,7 +36,7 @@ CREATE TABLE llx_menu
url varchar(255) NOT NULL, -- Relative (or absolute) url to go
target varchar(100) NULL, -- Target of Url link
titre varchar(255) NOT NULL, -- Key for menu translation
- prefix varchar(255) NULL, -- prefix
+ prefix varchar(255) NULL, -- picto
langs varchar(100), -- Lang file to load for translation
level smallint, -- Deprecated. Not used.
perms text, -- Condition to show enabled or disabled
diff --git a/htdocs/langs/en_US/dict.lang b/htdocs/langs/en_US/dict.lang
index e3b159e50de..bbd536679fe 100644
--- a/htdocs/langs/en_US/dict.lang
+++ b/htdocs/langs/en_US/dict.lang
@@ -137,7 +137,7 @@ CountryLV=Latvia
CountryLB=Lebanon
CountryLS=Lesotho
CountryLR=Liberia
-CountryLY=Libyan
+CountryLY=Libya
CountryLI=Liechtenstein
CountryLT=Lithuania
CountryLU=Luxembourg
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index 82ff5c41c11..4d4fdc012d8 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -534,6 +534,8 @@ class SocieteAccount extends CommonObject
return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
}
}
+
+ return '';
}
/**
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index c007bd5d5fd..a46e3b329be 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -2532,7 +2532,7 @@ img.photorefnoborder {
}
.tdhrthin {
- margin: 0;
+ margin: 0 !important;
padding-bottom: 0 !important;
}
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index a8b73cbdd1f..328d41e8720 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2706,7 +2706,7 @@ img.photorefnoborder {
border-bottom: 1px solid var(--colortopbordertitle1) !important;
}
.tdhrthin {
- margin: 0;
+ margin: 0 !important;
padding-bottom: 0 !important;
}
/* Payment Screen : Pointer cursor in the autofill image */
|