X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=class%2Ferror.class.php;h=e24242badc9f97793c48a79b2badaa6708659ab8;hp=c741307effadc9887c7c187feb584ef8e6139305;hb=2f8c79ee4f62a50c854141fb0ff2f44d8f5f5b9c;hpb=4ed31137c331d10be6d966762fa992f3ab915640

diff --git a/class/error.class.php b/class/error.class.php
index c741307e..e24242ba 100644
--- a/class/error.class.php
+++ b/class/error.class.php
@@ -5,7 +5,7 @@
  *
  * This contains the custom error handler for SquirrelMail.
  *
- * @copyright © 2005-2006 The SquirrelMail Project Team
+ * @copyright 2005-2011 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -177,7 +177,7 @@ class ErrorHandler {
                         }
                         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) {
@@ -219,8 +219,15 @@ class ErrorHandler {
 
         // Show the error immediate in case of fatal errors
         if ($iType == SQM_ERROR) {
-            if (!$this->header_sent || (isset($this->Template->values['header_sent']) && !$this->Template->values['header_sent'])) {
-                // TODO replace this with template that can be assigned
+            if (isset($this->Template->values['header_sent']) && !$this->Template->values['header_sent']) {
+// 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();
@@ -228,6 +235,25 @@ class ErrorHandler {
         }
     }
 
+    /**
+     * 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
@@ -244,7 +270,11 @@ class ErrorHandler {
         }
 
         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);
         }