index 82289820300c81a961f69b28b8b35a63711b7d59..c1e7184a548eb1fda0474ae8f27bf46235672077 100644 (file)
}
/* Error messages are hidden in GOsa, so we only send them to the logging class and abort here */
- if(isset($config->data) && $config->get_cfg_value("displayerrors") != "true"){
+ if(isset($config->data) && $config->get_cfg_value("core","displayErrors") != "true"){
/* Write to syslog */
if(class_exists("log") && !preg_match("/No such object/",$errstr)){
new log("debug","all",$errfile,array(),"Type:".$errno.", Message:".$errstr.", File:".$errfile.", Line: ".$errline);
}
+ // Log errors in usage DB
+ if(class_exists('stats') && !preg_match("/No such object/",$errstr)){
+ stats::log('error', $class = 'ERROR', $category = array(), $action = __FUNCTION__,
+ $amount = 1, $duration = 0, $errno);
+ }
+
/* Create header as needed */
if ($error_collector == ""){
if (session::is_set('js') && session::get('js')==FALSE){
$error_collector= "<div>";
} else {
- $error_collector= "
- <table summary=\"\" width=\"100%\" style='background-color:#E0E0E0;border-bottom:1px solid black;z-index:150;'>
+ $error_collector= "
+ <table summary=\"\" class='error-collector'>
<tr>
- <td>
- <img alt=\"\" align=\"middle\" src='".get_template_path('images/warning.png')."'>
- <font style='font-size:14px;font-weight:bold'>".
- _("Generating this page caused the PHP interpreter to raise some errors!")."
- </font>
- </td>
- <td align=right>
- <a href=\"mailto:gosa-bugs@oss.gonicus.de?subject=GOsa%20bugreport&body=%BUGBODY%\">
- <img border='0' src='images/mailto.png' title='"._("Send bug report to the GOsa Team")."' class='center' alt=''> "._("Send bugreport")."
- </a>
- </td>
- <td align=right>
- <button onClick=\"$('errorbox').toggle();\">".
- _("Toggle information")."
- </button>
+ <td style='width:32px'>".image('images/toolbar-warning.png')."</td>
+ <td><span>"._("Generating this page caused the PHP interpreter to raise some errors!")."</span></td>
+ <td align='right'>
+ <a href=\"mailto:gosa-bugs@oss.gonicus.de?subject=GOsa%20bugreport&body=%BUGBODY%\">
+ ".image('images/mailto.png')." "._("Send bug report")."
+ </a>
+ </td>
+ <td align='right'>
+ <button onClick=\"$('errorbox').toggle();\">"._("Toggle details")."</button>
</td>
</tr>
</table>
$line="";
}
$color= ($index&1)?'#404040':'606060';
- $error_collector.= "<tr style='background-color:$color'><td style='padding-left:20px' width=\"30%\">"._("Trace")."[$index]: $loc</td>";
+ $error_collector.= "<tr style='background-color:$color'><td style='padding-left:20px' width=\"30%\">"._("Traceback")."[$index]: $loc</td>";
$error_collector.= "<td>"._("File").": $file ("._('Line')." $line)</td><td width=\"10%\">"._("Type").": $type</td></tr>";
$error_collector.= "<tr style='background-color:$color'><td colspan=3 style='padding-left:20px;'>"._("Arguments").": $args</td></tr>";