From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 14 May 2006 17:36:16 +0000 (+0000)
Subject: documenting function changes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=5e5a1eed760059a2bcd5a03d6b6b2c39b25f6a96;p=squirrelmail.git

documenting function changes
sanitizing imap folder name in plain_error_message function.


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11136 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/functions/display_messages.php b/functions/display_messages.php
index f5300b38..07efba1c 100644
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -15,26 +15,29 @@
 
 /**
  * Displays error message and URL to message listing
+ *
+ * Fifth argument ($color array) is removed in 1.5.2.
  * @param string $message error message
  * @param string $mailbox mailbox name
  * @param integer $sort sort order
  * @param integer $startMessage first message
- * @param array $color color theme
  * @since 1.0
  */
 function error_message($message, $mailbox, $sort, $startMessage) {
     $urlMailbox = urlencode($mailbox);
-    $link = array   (
-                        'URL'   => sqm_baseuri()."src/right_main.php?sort=$sort&amp;startMessage=$startMessage&amp;mailbox=$urlMailbox",
-                        'TEXT'  => sprintf (_("Click here to return to %s"), strtoupper($mailbox) == 'INBOX' ? _("INBOX") : imap_utf7_decode_local($mailbox)) 
-                    );
+    $link = array (
+        'URL'   => sqm_baseuri()."src/right_main.php?sort=$sort&amp;startMessage=$startMessage&amp;mailbox=$urlMailbox",
+        'TEXT'  => sprintf (_("Click here to return to %s"),
+                            strtoupper($mailbox) == 'INBOX' ? _("INBOX") : htmlspecialchars(imap_utf7_decode_local($mailbox))) 
+                   );
     error_box($message, $link);
 }
 
 /**
  * Displays error message
+ * 
+ * Second argument ($color array) is removed in 1.5.2.
  * @param string $message error message
- * @param array $color color theme
  * @since 1.0
  */
 function plain_error_message($message) {