phpDocumentor updates

[squirrelmail.git] / functions / folder_manip.php

diff --git a/functions/folder_manip.php b/functions/folder_manip.php
index 67625d347cc4846c9c316f135156ce6d00030c98..4fa4929c994be679203420044cb9cebc7addac0f 100644 (file)
--- a/functions/folder_manip.php
+++ b/functions/folder_manip.php
@@ -3,16 +3,15 @@
 /**
  * folder_manip.php
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Functions for IMAP folder manipulation:
  * (un)subscribe, create, rename, delete.
  *
+ * @author Thijs Kinkhorst <kink at squirrelmail.org>
+ * @copyright &copy; 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @see folders.php
- * @author Thijs Kinkhorst - kink@squirrelmail.org
  */
 
 
@@ -25,10 +24,14 @@ function folders_checkname($imapConnection, $folder_name, $delimiter)
 {
     if (substr_count($folder_name, '"') || substr_count($folder_name, "\\") ||
         substr_count($folder_name, $delimiter) || ($folder_name == '')) {
-        
+
         global $color;
-        plain_error_message(_("Illegal folder name. Please select a different name.").
-            '<br /><a href="../src/folders.php">'._("Click here to go back").'</a>.', $color);
+        error_box(_("Illegal folder name.") . "<br />\n" .
+                sprintf(_("The name may not contain any of the following: %s"), '<tt>" \\ '.$delimiter.'</tt>')
+                . "<br />\n" .
+                _("Please select a different name.").
+                '<br /><a href="folders.php">'.
+                _("Click here to go back") . '</a>.', $color);
 
         sqimap_logout($imapConnection);
         exit;
@@ -45,7 +48,7 @@ function folders_create ($imapConnection, $delimiter, $folder_name, $subfolder,
     global $folder_prefix;
 
     $folder_name = imap_utf7_encode_local($folder_name);
-   
+
     if ( ! empty($contain_subs) ) {
         $folder_name = $folder_name . $delimiter;
     }
@@ -79,7 +82,7 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
     if ( $old == '' ) {
         plain_error_message(_("You have not selected a folder to rename. Please do so.").
             '<br /><a href="../src/folders.php">'._("Click here to go back").'</a>.', $color);
-        sqimap_logout($imapConnection);    
+        sqimap_logout($imapConnection);
         exit;
     }
 
@@ -128,9 +131,9 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
              '<input type="submit" value="'._("Rename")."\" />\n".
              '<input type="submit" name="cancelbutton" value="'._("Cancel")."\" />\n".
              '</form><br /></td></tr></table>';
-    echo "\n\n</body></html>";
-    
-    sqimap_logout($imapConnection);    
+    echo "\n</td></tr></table>\n</td></tr></table>\n\n</body></html>";
+
+    sqimap_logout($imapConnection);
     exit;
 }
 
@@ -144,7 +147,7 @@ function folders_rename_do($imapConnection, $delimiter, $orig, $old_name, $new_n
     $orig = imap_utf7_encode_local($orig);
     $old_name = imap_utf7_encode_local($old_name);
     $new_name = imap_utf7_encode_local($new_name);
-    
+
     if ($old_name != $new_name) {
 
         if (strpos($orig, $delimiter)) {
@@ -208,9 +211,9 @@ function folders_delete_ask ($imapConnection, $folder_name)
         addSubmit(_("No"), 'cancelbutton').
         '</p></form><br /></td></tr></table>';
 
-    echo "\n\n</body></html>";
+    echo "\n</td></tr></table>\n</td></tr></table>\n\n</body></html>";
 
-    sqimap_logout($imapConnection);    
+    sqimap_logout($imapConnection);
     exit;
 }
 
@@ -220,7 +223,7 @@ function folders_delete_ask ($imapConnection, $folder_name)
 function folders_delete_do ($imapConnection, $delimiter, $folder_name)
 {
     require_once(SM_PATH . 'functions/tree.php');
-    
+
     $boxes = sqimap_mailbox_list ($imapConnection);
 
     global $delete_folder, $imap_server_type, $trash_folder, $move_to_trash;
@@ -306,7 +309,7 @@ function folders_subscribe($imapConnection, $folder_names)
                 '<br /><a href="../src/folders.php">'._("Click here to go back").'</a>.', $color);
             sqimap_logout($imapConnection);
             exit;
-            
+
         }
     }
     foreach ( $folder_names as $folder_name ) {
@@ -338,4 +341,4 @@ function folders_unsubscribe($imapConnection, $folder_names)
 }
 
 
-?>
+?>
\ No newline at end of file