Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop

This commit is contained in:
Laurent Destailleur 2024-08-22 14:47:00 +02:00
commit a59e933d59
7 changed files with 10 additions and 10 deletions

View file

@ -46,7 +46,7 @@ $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
if (!empty($backtopagejsfields)) {
$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
$dol_openinpopup = $tmpbacktopagejsfields[0];
$dol_openinpopup = preg_replace('/[^a-z0-9_]/i', '', $tmpbacktopagejsfields[0]);
}
$error = 0;

View file

@ -51,7 +51,7 @@ $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
if (!empty($backtopagejsfields)) {
$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
$dol_openinpopup = $tmpbacktopagejsfields[0];
$dol_openinpopup = preg_replace('/[^a-z0-9_]/i', '', $tmpbacktopagejsfields[0]);
}
// Initialize a technical objects

View file

@ -11166,11 +11166,11 @@ class Form
$retstring .= $withoutdiv ? '' : '</div>';
if ($dol_openinpopup) {
$retstring .= '<!-- buttons are shown into a $dol_openinpopup=' . $dol_openinpopup . ' context, so we enable the close of dialog on cancel -->' . "\n";
$retstring .= '<!-- buttons are shown into a $dol_openinpopup=' . dol_escape_htmltag($dol_openinpopup) . ' context, so we enable the close of dialog on cancel -->' . "\n";
$retstring .= '<script nonce="' . getNonce() . '">';
$retstring .= 'jQuery(".button-cancel").click(function(e) {
e.preventDefault(); console.log(\'We click on cancel in iframe popup ' . $dol_openinpopup . '\');
window.parent.jQuery(\'#idfordialog' . $dol_openinpopup . '\').dialog(\'close\');
e.preventDefault(); console.log(\'We click on cancel in iframe popup ' . dol_escape_js($dol_openinpopup) . '\');
window.parent.jQuery(\'#idfordialog' . dol_escape_js($dol_openinpopup) . '\').dialog(\'close\');
});';
$retstring .= '</script>';
}

View file

@ -105,7 +105,7 @@ $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
if (!empty($backtopagejsfields)) {
$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
$dol_openinpopup = $tmpbacktopagejsfields[0];
$dol_openinpopup = preg_replace('/[^a-z0-9_]/i', '', $tmpbacktopagejsfields[0]);
}
// Initialize a technical objects

View file

@ -57,10 +57,10 @@ $backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
$cancel = GETPOST('cancel', 'alpha');
$confirm = GETPOST('confirm', 'aZ09');
$dol_openinpopup = 0;
$dol_openinpopup = '';
if (!empty($backtopagejsfields)) {
$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
$dol_openinpopup = $tmpbacktopagejsfields[0];
$dol_openinpopup = preg_replace('/[^a-z0-9_]/i', '', $tmpbacktopagejsfields[0]);
}
$status = GETPOSTINT('status');

View file

@ -109,7 +109,7 @@ $confirm = GETPOST('confirm', 'alpha');
$dol_openinpopup = '';
if (!empty($backtopagejsfields)) {
$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
$dol_openinpopup = $tmpbacktopagejsfields[0];
$dol_openinpopup = preg_replace('/[^a-z0-9_]/i', '', $tmpbacktopagejsfields[0]);
}
$socid = GETPOSTINT('socid') ? GETPOSTINT('socid') : GETPOSTINT('id');

View file

@ -52,7 +52,7 @@ $dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
if (!empty($backtopagejsfields)) {
$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
$dol_openinpopup = $tmpbacktopagejsfields[0];
$dol_openinpopup = preg_replace('/[^a-z0-9_]/i', '', $tmpbacktopagejsfields[0]);
}
$groups = GETPOST('groups', 'array:int');