[SM-CVS] CVS: squirrelmail/include errors.php,1.6,1.7

[Marc G. K. <st...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29111/include

Modified Files:
	errors.php 
Log Message:
Fix for #1093360.
The fix also includes the move from manual generated error messages in
imap_general to the central error handler.
In order to catch non fatal error message in compose.php I had to collect
the error messages array before the header redirect and write them to the
session. In read_body.php, compose.php and right_main.php I add the error
messages to the error handler again and clean up the delayed error messages
array.
I also modified the error handler in order to display the page_header in
case it wasn't displayed yet.





Index: errors.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/include/errors.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- errors.php	8 Feb 2006 07:59:19 -0000	1.6
+++ errors.php	11 Feb 2006 15:14:31 -0000	1.7
@@ -49,6 +49,21 @@
     'tip'      => _("Run \"configure\", choose option 4 (General options) and set option 12 (Allow server charset search) to false) or choose option 10 (Language settings) and set option 2 (Default charset) to a charset supported by your IMAP server.")
 );
 
+$aErrors['SQM_IMAP_APPEND_QUOTA_ERROR'] = array(
+    'level'    => E_USER_NOTICE,
+    'category' => SQM_ERROR_IMAP,
+    'message'  => _( "Out of quota error."),
+    'link'     => '',
+    'tip'      => _("Remove unneccessary messages from your folder and start with your Trash folder.")
+);
+
+$aErrors['SQM_IMAP_APPEND_ERROR'] = array(
+    'level'    => E_USER_NOTICE,
+    'category' => SQM_ERROR_IMAP,
+    'message'  => _( "An error occured when SquirrelMail appended a message to the mailbox as listed in this message."),
+    'link'     => ''
+);
+
 $aErrors['SQM_IMAP_ERROR'] = array(
     'level'    => E_USER_ERROR,
     'category' => SQM_ERROR_IMAP,
@@ -56,6 +71,15 @@
                   _("Please contact your system administrator and report this error."),
     'link'     => ''
 );
+
+$aErrors['SQM_IMAP_BYE'] = array(
+    'level'    => E_USER_ERROR,
+    'category' => SQM_ERROR_IMAP,
+    'message'  => _( "IMAP server closed the connection.") . "\n" .
+                  _("Please contact your system administrator and report this error."),
+    'link'     => ''
+);
+
 //$aError['SQM_FS'] // Filesystem related errors
 
 ?>
\ No newline at end of file