*
* This contains the custom error handler for SquirrelMail.
*
- * @copyright © 2005-2006 The SquirrelMail Project Team
+ * @copyright © 2005-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
}
if ($aError['category'] & SQM_ERROR_PLUGIN) {
$aErrorCategory[] = 'PLUGIN';
- do_hook_function('error_handler_plugin',$aError);
+ do_hook('error_handler_plugin', $aError);
// plugin related error handling inside
}
//if ($aError['category'] & SQM_ERROR_X) {
// Show the error immediate in case of fatal errors
if ($iType == SQM_ERROR) {
if (isset($this->Template->values['header_sent']) && !$this->Template->values['header_sent']) {
- // TODO replace this with template that can be assigned
+// TODO replace this with template that can be assigned
+// UPDATE: displayHtmlHeader() no longer sends anything
+// directly to the browser itself and instead
+// displays all output through the template file
+// "protocol_header" as well as calls to the
+// template's header() method, so perhaps the
+// above TODO is alleviated?? (however, I don't fully
+// understand the problem behind the TODO comment myself (Paul))
displayHtmlHeader(_("Error"),'',false);
}
$this->DisplayErrors();
}
}
+ /**
+ * Force the delayed errors to be stored in the session in case
+ * $this->displayErrors() never gets called, e.g. in compose.php
+ */
+ function saveDelayedErrors () {
+ if($this->delayed_errors) {
+ // Check for previous delayed errors...
+ sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION);
+ if (is_array($delayed_errors)) {
+ $this->AssignDelayedErrors($delayed_errors);
+ sqsession_unregister("delayed_errors");
+ }
+
+ if (count($this->aErrors) > 0) {
+ sqsession_register($this->aErrors,"delayed_errors");
+ }
+ }
+ }
+
/**
* Display the error array in the error template
* @return void
}
if (isset($this->Template->values['aErrors']) && count($this->Template->values['aErrors']) > 0) {
- $this->aErrors = array_merge($this->aErrors, $this->Template->values['aErrors']);
+ foreach ($this->Template->values['aErrors'] as $err) {
+ if (!in_array($err, $this->aErrors, true)) {
+ $this->aErrors[] = $err;
+ }
+ }
$this->Template->assign('aErrors',$this->aErrors);
}