X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=ff29eb11f954bb56b5aa2307647a9d54fed76882;hb=030dae845395b0b3d713d008253000bcddb7940a;hp=f625ac482da5a89600782ecbaf9a5247b0ce82ea;hpb=b7f83b61539e8952b9b337f167870aa99eb772f8;p=squirrelmail.git
diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index f625ac48..ff29eb11 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -3,33 +3,36 @@
/**
* folders_rename_do.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 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
*/
-/* Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
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 */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$delimiter = $_SESSION['delimiter'];
-$onetimepad = $_SESSION['onetimepad'];
-
-$orig = $_POST['orig'];
-$old_name = $_POST['old_name'];
-$new_name = $_POST['new_name'];
-
+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);
@@ -38,12 +41,16 @@ 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.").
- '
'._("Click here to go back").'.', $color);
+ plain_error_message(_("Illegal folder name. Please select a different name.").
+ '
'._("Click here to go back").'.', $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);
@@ -68,11 +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: ' . get_location() . '/folders.php?success=rename');
-?>
+?>
\ No newline at end of file