X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=160d41e5100dce8fe0d84bda8dd4d55b9c516f8f;hb=8864b1ec0fd3321e510511ef22614bc36845540e;hp=04874a392538a6145ba61e7ea151b5ed43deccea;hpb=9a2baf28c28edc0745f70f758ed9a1335dd87f07;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index 04874a39..160d41e5 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -1,60 +1,70 @@
.
+***********************************************************************/
$messages = array(); // container for system messages
$before_box = ''; // temporary container for output html data before error box
-$msg_colors = array(
- E_USER_ERROR => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'),
- E_USER_WARNING => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'),
- E_USER_NOTICE => array('bg'=>'#ccffcc', 'txt'=>'#007700', 'bd'=>'#33cc00'));
-
//-----------------------------------------------------------------------------
// Error handler - collects all php/user messages for
// display in message box.
-// FIX: fatal errors ?
function error_handler($errno, $errstr, $file, $line) {
global $messages;
// error_reporting==0 when messages are set off with @
- if ($errno & error_reporting())
+ if ($errno & error_reporting()) {
$messages[] = array($errno, $errstr, $file, $line);
-
+ }
return true;
}
//------------------------------------------------------------------------------
// Formats system messages before insert them into message
// FIX center is unused now
-function fmt_errors($center=true) {
- global $messages, $msg_colors;
+function fmt_errors($center=false) {
+ global $messages, $path_to_root;
+ $msg_class = array(
+ E_USER_ERROR => 'err_msg',
+ E_USER_WARNING =>'warn_msg',
+ E_USER_NOTICE => 'note_msg');
+
$type = E_USER_NOTICE;
-
+ $content = '';
+ $class = 'no_msg';
if (count($messages)) {
- $content = '';
- foreach($messages as $msg) {
+ foreach($messages as $cnt=>$msg) {
if ($msg[0]>$type) continue;
- if ($msg[0]<$type && $type>E_USER_ERROR) {
- $content = ''; // clean notices when we have errors
- $type = E_USER_ERROR; // php or user errors
+
+ if ($msg[0]<$type) {
+ if ($msg[0] == E_USER_WARNING) {
+ $type = E_USER_WARNING; // user warnings
+ $content = ''; // clean notices when we have errors
+ } else {
+ $type = E_USER_ERROR; // php or user errors
+ if($type == E_USER_WARNING)
+ $content = ''; // clean other messages
+ }
}
$str = $msg[1];
- $c = $msg_colors[$type];
- if ($msg[0]
"
- .$str."";
- }
-
- $str = "
\n";
-
- }
- else
- $str = '';
-
- return $str;
+ $content .= ($cnt ? '
' : '').$str;
+ }
+ $class = $msg_class[$type];
+ } else
+ if ($path_to_root=='.')
+ return '';
+
+ $content = "$content
";
+ return $content;
}
//-----------------------------------------------------------------------------
// Error box element.
@@ -65,6 +75,7 @@ function error_box() {
echo "
";
$before_box = ob_get_clean(); // save html content before error box
// Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2
+ register_shutdown_function('ob_end_flush');
ob_start('output_html');
echo "
";
}