removing trailing ?> from function scripts

[squirrelmail.git] / functions / folder_manip.php

diff --git a/functions/folder_manip.php b/functions/folder_manip.php
index a5e5c02c2345d8267f501ef2637a8e6f06ed0e11..b1032dc9f9b511ccd3cbbc52c2a886af6a839c20 100644 (file)
--- a/functions/folder_manip.php
+++ b/functions/folder_manip.php
@@ -25,15 +25,16 @@ 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);
+                _("Click here to go back") . '</a>.');
 
         sqimap_logout($imapConnection);
+        $oTemplate->display('footer.tpl');
         exit;
     }
 }
@@ -120,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 ) {
@@ -222,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');
+    include(SM_PATH . 'functions/tree.php');
 
     $boxes = sqimap_mailbox_list ($imapConnection);
 
@@ -339,6 +340,3 @@ function folders_unsubscribe($imapConnection, $folder_names)
 
     return;
 }
-
-
-?>
\ No newline at end of file