X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=89b0a117cbb68babf1b9497a7b5a34e55565db1d;hb=76911253eb850bacde3d86c8cb7b4af072e67ebe;hp=da76944a50bc8551e0af976208f2afcb028c6d7a;hpb=844d9c1adeaabe93653e51d57e2b942698b6514d;p=squirrelmail.git
diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index da76944a..89b0a117 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -1,72 +1,82 @@
\n";
- fputs ($imapConnection, $cmd);
- $data = sqimap_read_data($imapConnection, "a024", true, $a, $b);
-
- // Renaming a folder doesn't renames the folder but leaves you unsubscribed
- // at least on Cyrus IMAP servers.
- if (isset($isfolder)) {
- $newone = $newone.$dm;
- $orig = $orig.$dm;
- }
- sqimap_unsubscribe($imapConnection, $orig);
- sqimap_subscribe($imapConnection, $newone);
-
- fputs ($imapConnection, "a001 LIST \"\" \"" . quoteIMAP($newone) .
- "*\"\r\n");
- $data = sqimap_read_data($imapConnection, "a001", true, $a, $b);
- for ($i=0; $i < count($data); $i++)
- {
- $name = find_mailbox_name($data[$i]);
-
- if ($name != $newone) // don't try to resubscribe when renaming ab to abc
- {
- sqimap_unsubscribe($imapConnection, $name);
- $name = substr($name, strlen($orig));
- $name = $newone . $name;
- sqimap_subscribe($imapConnection, $name);
- }
- }
-
- /** Log out this session **/
- sqimap_logout($imapConnection);
- $location = get_location();
- header ("Location: $location/folders.php?success=rename");
+
+/**
+ * folders_rename_do.php
+ *
+ * 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.
+ * Called from the folders.php
+ *
+ * $Id$
+ */
+
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.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'];
+
+/* 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);
+
+ if (strpos($orig, $delimiter)) {
+ $old_dir = substr($orig, 0, strrpos($orig, $delimiter));
+ } else {
+ $old_dir = '';
+ }
+
+ if ($old_dir != '') {
+ $newone = $old_dir . $delimiter . $new_name;
+ } else {
+ $newone = $new_name;
+ }
+
+ // Renaming a folder doesn't rename the folder but leaves you unsubscribed
+ // at least on Cyrus IMAP servers.
+ if (isset($isfolder)) {
+ $newone = $newone.$delimiter;
+ $orig = $orig.$delimiter;
+ }
+ sqimap_mailbox_rename( $imapConnection, $orig, $newone );
+
+ // Log out this session
+ sqimap_logout($imapConnection);
+
+}
+
+header ('Location: ' . get_location() . '/folders.php?success=rename');
+
?>