X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=f3afc591c08885c6545d3bea5f9fb63ff7fd2636;hb=91e0dccca7b2452d8b450791cae3aa4125e8889e;hp=2918ea58f4017f8df8d03346aac727696dc5c319;hpb=8672576304f4da444b9b1e0e4ca81505af0267ec;p=squirrelmail.git

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 2918ea58..f3afc591 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -3,26 +3,54 @@
 /**
  * folders_rename_do.php
  *
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * Does the actual renaming of files on the IMAP server.
  * Called from the folders.php
  *
- * $Id$
+ * @version $Id$
+ * @package squirrelmail
  */
 
-global $delimiter, $base_uri;
-
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
-require_once(SM_PATH . 'src/validate.php');
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/global.php');
 require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+
+/* globals */
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('orig',      $orig,          SQ_POST);
+sqgetGlobalVar('old_name',  $old_name,      SQ_POST);
+sqgetGlobalVar('new_name',  $new_name,      SQ_POST);
+/* end globals */
 
 $new_name = trim($new_name);
 
+if (substr_count($new_name, '"') || substr_count($new_name, "\\") ||
+    substr_count($new_name, $delimiter) || ($new_name == '')) {
+    displayPageHeader($color, 'None');
+
+    plain_error_message(_("Illegal folder name. Please select a different name.").
+        '<br /><a href="../src/folders.php">'._("Click here to go back").'</a>.', $color);
+
+    exit;
+}
+
+$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) {
 
     $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -39,7 +67,7 @@ if ($old_name <> $new_name) {
         $newone = $new_name;
     }
 
-    // Renaming a folder doesn't renames the folder but leaves you unsubscribed
+    // Renaming a folder doesn't rename the folder but leaves you unsubscribed
     //    at least on Cyrus IMAP servers.
     if (isset($isfolder)) {
         $newone = $newone.$delimiter;
@@ -47,9 +75,11 @@ if ($old_name <> $new_name) {
     }
     sqimap_mailbox_rename( $imapConnection, $orig, $newone );
 
-    // Log out this session 
+    // Log out this session
     sqimap_logout($imapConnection);
 
 }
-header ('Location: ' . $base_uri . 'src/folders.php');
-?>
+
+header ('Location: ' . get_location() . '/folders.php?success=rename');
+
+?>
\ No newline at end of file