make a start with adding labels for html form elements. this aids disabled

[squirrelmail.git] / functions / folder_manip.php

diff --git a/functions/folder_manip.php b/functions/folder_manip.php
index 68ffbbd353f30c3e42dc1fe307ba45e307d3806e..75f64d6ffedc65a90dd26b4eccfeb002fa31dfbe 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-2006 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,16 +24,17 @@ 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;
+
+        global $color, $oTemplate;
         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);
+                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>.');
 
         sqimap_logout($imapConnection);
+        $oTemplate->display('footer.tpl');
         exit;
     }
 }
@@ -49,7 +49,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;
     }
@@ -83,7 +83,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;
     }
 
@@ -121,7 +121,7 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) {
             html_tag( 'td', '', 'center', $color[4] ) .
             addForm('folders.php').
             addHidden('smaction', 'rename').
-             _("New name:").
+             '<label for="new_name">' . _("New name:") . '</label>' .
              '<br /><b>' . htmlspecialchars($old_parent) . '</b>' .
              addInput('new_name', $old_name, 25) . '<br /><br />' . "\n";
              if ( $isfolder ) {
@@ -132,9 +132,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;
 }
 
@@ -148,7 +148,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)) {
@@ -212,9 +212,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;
 }
 
@@ -223,8 +223,8 @@ function folders_delete_ask ($imapConnection, $folder_name)
  */
 function folders_delete_do ($imapConnection, $delimiter, $folder_name)
 {
-    require_once(SM_PATH . 'functions/tree.php');
-    
+    include(SM_PATH . 'functions/tree.php');
+
     $boxes = sqimap_mailbox_list ($imapConnection);
 
     global $delete_folder, $imap_server_type, $trash_folder, $move_to_trash;
@@ -310,7 +310,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 ) {