Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: best practice

Browse Source
This commit is contained in:
Regis Houssin
2012-07-28 22:28:33 +02:00
parent a27e347ee0
commit cdc9dda11e
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
htdocs/core/lib/functions.lib.php
View File

@@ -3460,37 +3460,39 @@ function get_date_range($date_start,$date_end,$format = '',$outputlangs='')
*/ */
function dol_htmloutput_events($mesgs=array(),$errors=array(),$warnings=array()) function dol_htmloutput_events($mesgs=array(),$errors=array(),$warnings=array())
{ {
if (isset($_SESSION['dol_events'])) // Show mesgs
{ if (is_array($mesgs) && ! empty($mesgs)) {
if (is_array($mesgs) && isset($_SESSION['dol_events']['mesgs'])) { if (isset($_SESSION['dol_events']['mesgs'])) {
if (! is_array($_SESSION['dol_events']['mesgs'])) { if (! is_array($_SESSION['dol_events']['mesgs'])) {
$_SESSION['dol_events']['mesgs']=array($_SESSION['dol_events']['mesgs']); // For backward compatibility $_SESSION['dol_events']['mesgs']=array($_SESSION['dol_events']['mesgs']); // For backward compatibility
} }
$mesgs = array_merge($mesgs, $_SESSION['dol_events']['mesgs']); $mesgs = array_merge($mesgs, $_SESSION['dol_events']['mesgs']);
unset($_SESSION['dol_events']['mesgs']);
} }
if (is_array($errors) && isset($_SESSION['dol_events']['errors'])) { dol_htmloutput_mesg('',$mesgs);
}
// Show errors
if (is_array($errors) && ! empty($errors)) {
if (isset($_SESSION['dol_events']['errors'])) {
if (! is_array($_SESSION['dol_events']['errors'])) { if (! is_array($_SESSION['dol_events']['errors'])) {
$_SESSION['dol_events']['errors']=array($_SESSION['dol_events']['errors']); // For backward compatibility $_SESSION['dol_events']['errors']=array($_SESSION['dol_events']['errors']); // For backward compatibility
} }
$errors = array_merge($errors, $_SESSION['dol_events']['errors']); $errors = array_merge($errors, $_SESSION['dol_events']['errors']);
unset($_SESSION['dol_events']['errors']);
} }
if (is_array($warnings) && isset($_SESSION['dol_events']['warnings'])) { dol_htmloutput_mesg('',$errors, 'error');
}
// Show warnings
if (is_array($warnings) && ! empty($warnings)) {
if (isset($_SESSION['dol_events']['warnings'])) {
if (! is_array($_SESSION['dol_events']['warnings'])) { if (! is_array($_SESSION['dol_events']['warnings'])) {
$_SESSION['dol_events']['warnings']=array($_SESSION['dol_events']['warnings']); // For backward compatibility $_SESSION['dol_events']['warnings']=array($_SESSION['dol_events']['warnings']); // For backward compatibility
} }
$warnings = array_merge($warnings, $_SESSION['dol_events']['warnings']); $warnings = array_merge($warnings, $_SESSION['dol_events']['warnings']);
unset($_SESSION['dol_events']['warnings']);
} }
unset($_SESSION['dol_events']);
}
if (is_array($mesgs) && ! empty($mesgs)) {
dol_htmloutput_mesg('',$mesgs);
}
if (is_array($errors) && ! empty($errors)) {
dol_htmloutput_mesg('',$errors, 'error');
}
if (is_array($warnings) && ! empty($warnings)) {
dol_htmloutput_mesg('',$warnings, 'warning'); dol_htmloutput_mesg('',$warnings, 'warning');
} }
} }