* @since 1.5.1
*/
function ErrorHandler(&$oTemplate, $sTemplateFile) {
+# echo 'init error handler...';
$this->TemplateName = $sTemplateFile;
$this->Template =& $oTemplate;
$this->aErrors = array();
$this->header_sent = false;
+ $this->delayed_errors = false;
+ $this->Template->assign('delayed_errors', $this->delayed_errors);
}
/**
$this->header_sent = true;
}
+ /**
+ * Turn on/off delayed error handling
+ * @since 1.5.2
+ */
+ function setDelayedErrors ($val = true) {
+ $this->delayed_errors = $val===true;
+ $this->Template->assign('delayed_errors', $this->delayed_errors);
+ }
+
/**
* Store errors generated in a previous script but couldn't be displayed
* due to a header redirect. This requires storing of aDelayedErrors in the session
$aError['message'] = $sErrStr;
$aError['extra'] = array(
'FILE' => $sErrFile,
- 'LINE' => $iErrLine) ;;
+ 'LINE' => $iErrLine) ;
// what todo with $aContext?
break;
case E_USER_ERROR:
default: break;
}
+ /**
+ * If delayed error handling is enabled, always record the location
+ * and tag the error is delayed to make debugging easier.
+ */
+ if (isset($this->Template->values['delayed_errors']) && $this->Template->values['delayed_errors']) {
+ $aErrorCategory[] = 'Delayed';
+ $aError['extra'] = array(
+ 'FILE' => $sErrFile,
+ 'LINE' => $iErrLine) ;
+ }
+
$aErrorTpl = array(
'type' => $iType,
'category' => $aErrorCategory,
* @since 1.5.1
*/
function DisplayErrors() {
- if (count($this->aErrors)) {
- $this->Template->display($this->TemplateName);
+ // Check for delayed errors...
+ if (!$this->delayed_errors) {
+ sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION);
+ if (is_array($delayed_errors)) {
+ $this->AssignDelayedErrors($delayed_errors);
+ sqsession_unregister("delayed_errors");
+ }
+ }
+
+ if (isset($this->Template->values['aErrors']) && count($this->Template->values['aErrors']) > 0) {
+ $this->aErrors = array_merge($this->aErrors, $this->Template->values['aErrors']);
+ $this->Template->assign('aErrors',$this->aErrors);
+ }
+
+ if (count($this->aErrors) > 0) {
+ if ($this->delayed_errors) {
+ sqsession_register($this->aErrors,"delayed_errors");
+ } else {
+ $this->Template->display($this->TemplateName);
+ }
}
}
}
/* retrieve the template vars */
extract($t);
+
if (isset($aErrors) && is_array($aErrors)) {
?>
<div id="error_list">
<?php echo _("Category:"); ?>
</td>
<td class="error_val">
- <?php foreach ($aError['category'] as $sCategory) {echo $sCategory;} ?>
+ <?php echo join(', ', $aError['category']); ?>
</td>
</tr>
<tr>
<td class="error_key">
<?php echo $sKey; ?>:
</td>
- <td>
+ <td class="error_val">
<?php echo $sValue; ?>
</td>
</tr>
</td>
</tr>
<?php } // (isset($aError['link']) && ($aError['link']))
+ ?>
+ <tr class="error_thead">
+ <td class="error_thead_caption" colspan="2">
+ </td>
+ </tr>
+ <?php
} // foreach($aErrors as $aError)
?>
</table>