phpdocumentor preparation and a few corrections to earlier phpdocumentor work

[squirrelmail.git] / src / folders.php

diff --git a/src/folders.php b/src/folders.php
index aeedc2d05a1bf23c3a4904234fab0719ba4d7395..7e4966eeba582d437c50f5c709e29b972a0eac4c 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -11,9 +11,10 @@
  * Folders.
  *
  * $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -265,7 +266,7 @@ if ($count_special_folders < count($boxes)) {
             ($boxes[$i]["unformatted"] != $draft_folder)) {
             $box = htmlspecialchars($boxes[$i]["unformatted-dm"]);
             $box2 = str_replace(' ', '&nbsp;',
-                                htmlentities(imap_utf7_decode_local($boxes[$i]["unformatted-disp"])));
+                                htmlspecialchars(imap_utf7_decode_local($boxes[$i]["unformatted-disp"])));
             echo "         <OPTION VALUE=\"$box\">$box2\n";
         }
     }
@@ -298,7 +299,7 @@ if(!$no_list_for_subscribe) {
     }
     if ($use_folder == true) {
         $box[$q] = htmlspecialchars($boxes_all[$i]['unformatted-dm']);
-        $box2[$q] = htmlentities(imap_utf7_decode_local($boxes_all[$i]['unformatted-disp']));
+        $box2[$q] = htmlspecialchars(imap_utf7_decode_local($boxes_all[$i]['unformatted-disp']));
         $q++;
     }
   }