diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index 49114b89f46..294167bb574 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -86,9 +86,9 @@ if ($resql) print ''; if ($objp->public) { - print "".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."\n"; + print "".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".dol_escape_htmltag($objp->societe)."\n"; } else { - print "Anonyme Anonyme\n"; + print "".$langs->trans("Anonymous")."\n"; } print "".dol_print_date($db->jdate($objp->datedon))."\n"; print ''.number_format($objp->amount, 2, '.', ' ').' '.$langs->trans("Currency".$conf->currency).''; @@ -97,7 +97,7 @@ if ($resql) } print ""; } else { - print "Aucun don publique"; + print $langs->trans("Donation"); } } else { dol_print_error($db); diff --git a/htdocs/public/donations/index.php b/htdocs/public/donations/index.php index ceb6bb6031e..0dc9a0aec8c 100644 --- a/htdocs/public/donations/index.php +++ b/htdocs/public/donations/index.php @@ -24,3 +24,4 @@ require '../../master.inc.php'; header("Location: ".DOL_URL_ROOT.'/public/error-404.php'); +exit; \ No newline at end of file diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php index 8c248734175..4408438ceaf 100644 --- a/htdocs/public/onlinesign/newonlinesign.php +++ b/htdocs/public/onlinesign/newonlinesign.php @@ -194,6 +194,7 @@ $text = ''; if (!empty($conf->global->ONLINE_SIGN_NEWFORM_TEXT)) { $langs->load("members"); + $reg = array(); if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) $text .= $langs->trans($reg[1])."
\n"; else $text .= $conf->global->ONLINE_SIGN_NEWFORM_TEXT."
\n"; $text = '
'.$text.'
'."\n"; @@ -256,9 +257,9 @@ if ($source == 'proposal') -if (!$found && !$mesg) $mesg = $langs->trans("ErrorBadParameters"); +if (!$found && !$mesg) $mesg = $langs->transonentitiesnoconv("ErrorBadParameters"); -if ($mesg) print '
'.$mesg.'
'."\n"; +if ($mesg) print '
'.dol_escape_htmltag($mesg).'
'."\n"; print ''."\n"; print "\n"; diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php index 46b9b1c03c6..94f85f911aa 100644 --- a/htdocs/public/recruitment/view.php +++ b/htdocs/public/recruitment/view.php @@ -241,14 +241,13 @@ print '
'; print '
'.$langs->trans("ThisIsInformationOnJobPosition").' :
'."\n"; $error = 0; -$var = false; $found = true; print '
'; // Label print $langs->trans("Label").' : '; -print ''.$object->label.'
'; +print ''.dol_escape_htmltag($object->label).'
'; // Date print $langs->trans("DateExpected").' : '; @@ -263,7 +262,7 @@ print '
'; // Remuneration print $langs->trans("Remuneration").' : '; print ''; -print $object->remuneration_suggested; +print dol_escape_htmltag($object->remuneration_suggested); print '
'; // Contact diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php index 800141244f0..f8cab9c9b9a 100644 --- a/htdocs/public/ticket/view.php +++ b/htdocs/public/ticket/view.php @@ -162,6 +162,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a $url = 'view.php?action=view_ticket&track_id='.GETPOST('track_id', 'alpha'); header("Location: ".$url); + exit; } else { $action = ''; setEventMessages($object->error, $object->errors, 'errors'); @@ -238,17 +239,17 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a // Ref print ''.$langs->trans("Ref").''; - print $object->dao->ref; + print dol_escape_htmltag($object->dao->ref); print ''; // Tracking ID print ''.$langs->trans("TicketTrackId").''; - print $object->dao->track_id; + print dol_escape_htmltag($object->dao->track_id); print ''; // Subject print ''.$langs->trans("Subject").''; - print $object->dao->subject; + print dol_escape_htmltag($object->dao->subject); print ''; // Statut @@ -258,17 +259,17 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a // Type print ''.$langs->trans("Type").''; - print $object->dao->type_label; + print dol_escape_htmltag($object->dao->type_label); print ''; // Category print ''.$langs->trans("Category").''; - print $object->dao->category_label; + print dol_escape_htmltag($object->dao->category_label); print ''; // Severity print ''.$langs->trans("Severity").''; - print $object->dao->severity_label; + print dol_escape_htmltag($object->dao->severity_label); print ''; // Creation date @@ -314,7 +315,7 @@ if ($action == "view_ticket" || $action == "presend" || $action == "close" || $a // Progression print ''.$langs->trans("Progression").''; - print ($object->dao->progress > 0 ? $object->dao->progress : '0').'%'; + print ($object->dao->progress > 0 ? dol_escape_htmltag($object->dao->progress) : '0').'%'; print ''; print '';