X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=c6eb206150270ed68f8536df47595d2e52633cbb;hb=4d30dc83a53e5c18f8efa8914d00e648d67e96a0;hp=79175d1b379224f1d83a15d5ec62c98f1ab9d088;hpb=c6ee68f5696d0e18245999ebe9189015f9add2da;p=squirrelmail.git
diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 79175d1b..c6eb2061 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -3,7 +3,7 @@
/**
* folders_rename_do.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 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.
@@ -12,13 +12,41 @@
* $Id$
*/
-global $delimiter, $base_uri;
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
+/* 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 */
+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.").
+ '
'._("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);
@@ -35,7 +63,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,5 +75,7 @@ if ($old_name <> $new_name) {
sqimap_logout($imapConnection);
}
-header ('Location: ' . $base_uri . 'src/folders.php');
+
+header ('Location: ' . get_location() . '/folders.php?success=rename');
+
?>