X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=8807f6456c2bd9a72a3937e7c142942e143dfabb;hp=cd6e399a17bdbbc47c996b90f2e995d6c0955b92;hb=e0dcff78e5469c8dc71cc603dff6326fc4f7b3c2;hpb=d3cdb279bd61b172926b51d41d09c8a691d6c347

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index cd6e399a..8807f645 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -1,14 +1,27 @@
-<?
-   include("../config/config.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/imap.php");
-   include("../functions/mailbox.php");
+<?php
+   /**
+    **  folders_rename_do.php
+    **
+    **  Copyright (c) 1999-2000 The SquirrelMail development 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$
+    **/
 
-   include("../src/load_prefs.php");
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
 
-   $imapConnection = loginToImapServer($username, $key, $imapServerAddress);
-   $dm = findMailboxDelimeter($imapConnection);
+   if($old_name == $new_name) {
+      $location = get_location();
+      header ("Location: $location/folders.php");
+      exit;
+   }
+
+   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+   $dm = sqimap_get_delimiter($imapConnection);
 
    if (strpos($orig, $dm))
       $old_dir = substr($orig, 0, strrpos($orig, $dm));
@@ -20,51 +33,38 @@
    else
       $newone = "$new_name";
 
-   fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\n");
-   $data = imapReadData($imapConnection, ".", true, $a, $b);
-
-/*   fputs ($imapConnection, ". RENAME \"$old_name\" \"$mailbox\"\n";
-
-   selectMailbox($imapConnection, $orig, $numMessages);
-   getFolderList($imapConnection, $boxesFormatted, $boxesUnformatted, $boxesRaw);
-
-   $mailbox = "$subfolder.$new_name";
-   $old_name = substr($orig, strrpos($orig, ".")+1, strlen($orig));
-   $old_parent = substr($orig, 0, strrpos($orig, "."));
+   $cmd = sqimap_session_id() . " RENAME \"" . quoteIMAP($orig) . "\" \"" .
+      quoteIMAP($newone) . "\"\r\n";
+   fputs ($imapConnection, $cmd);
+   $data = sqimap_read_data($imapConnection, sqimap_session_id(), true, $a, $b);
 
-   for ($i = 0; $i < count($boxesUnformatted); $i++) {
-      if (substr($boxesUnformatted[$i], 0, strlen($orig)) == $orig) {
-         $after = substr($boxesUnformatted[$i], strlen($orig)+1, strlen($boxesUnformatted[$i]));
-         selectMailbox($imapConnection, $boxesUnformatted[$i], $numMessages);
-         if (strlen($after) > 0) {
-            createFolder($imapConnection, "$mailbox.$after");
-            if ($numMessages > 0)
-               $success = copyMessages($imapConnection, 1, $numMessages, "$mailbox.$after");
-            else
-               $success = true;
+   // 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);
 
-            if ($success == true)
-               removeFolder($imapConnection, "$boxesUnformatted[$i]");
-         }
-         else {
-            createFolder($imapConnection, "$mailbox");
-            if ($numMessages > 0)
-               $success = copyMessages($imapConnection, 1, $numMessages, "$mailbox");
-            else
-               $success = true;
+   fputs ($imapConnection, sqimap_session_id() . " LIST \"\" \"" . quoteIMAP($newone) .
+      "*\"\r\n");
+   $data = sqimap_read_data($imapConnection, sqimap_session_id(), true, $a, $b);
+   for ($i=0; $i < count($data); $i++)
+   {
+      $name = find_mailbox_name($data[$i]);
 
-            if ($success == true)
-               removeFolder($imapConnection, "$boxesUnformatted[$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 **/
-   fputs($imapConnection, "1 logout");
-
-   echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
-   echo "<BR><BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>Return</A>";
-   echo "</BODY></HTML>";
-?>
-
 
+   /** Log out this session **/
+   sqimap_logout($imapConnection);
+   $location = get_location();
+   header ("Location: $location/folders.php?success=rename");
+?>
\ No newline at end of file