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

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 67de7ea5..8807f645 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -7,57 +7,18 @@
     **
     **  Does the actual renaming of files on the IMAP server. 
     **  Called from the folders.php
+    **
+    **  $Id$
     **/
 
-   session_start();
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-   if (!isset($display_messages_php))
-      include("../functions/display_messages.php");
-
-   include("../src/load_prefs.php");
-
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   $dm = sqimap_get_delimiter($imapConnection);
-
-   if ($method == "sub") {
-      $mailbox = trim($mailbox);
-      sqimap_subscribe ($imapConnection, $mailbox);
-   } else {
-      sqimap_unsubscribe ($imapConnection, $mailbox);
-   }
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
 
-   displayPageHeader($color, "None");
-   echo "<BR><BR><BR><CENTER><B>";
-   if ($method == "sub") {
-      echo _("Subscribed Successfully!");
-      echo "</B><BR><BR>";
-      echo _("You have been successfully subscribed.");
-   } else {
-      echo _("Unsubscribed Successfully!");
-      echo "</B><BR><BR>";
-      echo _("You have been successfully unsubscribed.");
+   if($old_name == $new_name) {
+      $location = get_location();
+      header ("Location: $location/folders.php");
+      exit;
    }
-   echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
-   session_start();
-
-   if (!isset($config_php))
-      include("../config/config.php");
-   if (!isset($strings_php))
-      include("../functions/strings.php");
-   if (!isset($page_header_php))
-      include("../functions/page_header.php");
-   if (!isset($imap_php))
-      include("../functions/imap.php");
-
-   include("../src/load_prefs.php");
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
    $dm = sqimap_get_delimiter($imapConnection);
@@ -72,35 +33,38 @@
    else
       $newone = "$new_name";
 
-   $orig = stripslashes($orig);
-   $newone = stripslashes($newone);
-
-   fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\n");
-   $data = sqimap_read_data($imapConnection, ".", true, $a, $b);
+   $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);
 
    // Renaming a folder doesn't renames the folder but leaves you unsubscribed
    //    at least on Cyrus IMAP servers.
-   if ($isfolder) {
+   if (isset($isfolder)) {
       $newone = $newone.$dm;
       $orig = $orig.$dm;
    }   
-
    sqimap_unsubscribe($imapConnection, $orig);
    sqimap_subscribe($imapConnection, $newone);
 
+   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 ($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);
-
-   displayPageHeader($color, "None");
-   echo "<BR><BR><BR><CENTER><B>";
-   echo _("Folder Renamed!");
-   echo "</B><BR><BR>";
-   echo _("The folder has been successfully renamed.");
-   echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
-   echo _("Click here");
-   echo "</A> ";
-   echo _("to continue.");
-   echo "</CENTER>";
-   
-   echo "</BODY></HTML>"; 
-?>
+   $location = get_location();
+   header ("Location: $location/folders.php?success=rename");
+?>
\ No newline at end of file