X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=ff29eb11f954bb56b5aa2307647a9d54fed76882;hp=ea45b2eb4766b5f83d539d1d88853a806e51d6ad;hb=b0b33df9e58751052d432b2d2df362649f14f999;hpb=036a8a9d47773d134f90e1f451ebc70b3836865a
diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index ea45b2eb..ff29eb11 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -1,72 +1,85 @@
- 0) {
- createFolder($imapConnection, "$mailbox.$after");
- if ($numMessages > 0)
- $success = copyMessages($imapConnection, 1, $numMessages, "$mailbox.$after");
- else
- $success = true;
-
- if ($success == true)
- removeFolder($imapConnection, "$boxesUnformatted[$i]");
- }
- else {
- createFolder($imapConnection, "$mailbox");
- if ($numMessages > 0)
- $success = copyMessages($imapConnection, 1, $numMessages, "$mailbox");
- else
- $success = true;
-
- if ($success == true)
- removeFolder($imapConnection, "$boxesUnformatted[$i]");
- }
- }
- }
-*/
- /** Log out this session **/
- fputs($imapConnection, "1 logout");
-
- echo "\n";
- echo "
";
- echo _("Return");
- echo "";
- echo "";
-?>
+'._("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');
+
+?>
\ No newline at end of file