X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=4edacc2d79217102f9f3e5a7a7ecb167ca22cbdd;hp=e18a44cefbf3eb4365a5470260293d7690c0cf10;hb=174a32e0b5afca8b1bae89d7e1b81fba1bfbc339;hpb=f740c049d91feb836dd9633be9e8ff52c00d066f

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index e18a44ce..4edacc2d 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -11,13 +11,8 @@
     **  $Id$
     **/
 
-   include("../src/validate.php");
-   include("../functions/strings.php");
-   include("../config/config.php");
-   include("../functions/page_header.php");
-   include("../functions/imap.php");
-   include("../src/load_prefs.php");
-
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
 
    if($old_name == $new_name) {
       $location = get_location();
@@ -26,32 +21,35 @@
    }
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-   $dm = sqimap_get_delimiter($imapConnection);
+   global $delimiter;
 
-   if (strpos($orig, $dm))
-      $old_dir = substr($orig, 0, strrpos($orig, $dm));
+   if (strpos($orig, $delimiter))
+      $old_dir = substr($orig, 0, strrpos($orig, $delimiter));
    else
       $old_dir = "";
 
    if ($old_dir != "")
-      $newone = "$old_dir$dm$new_name";
+      $newone = "$old_dir$delimiter$new_name";
    else
       $newone = "$new_name";
 
-   fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\r\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 (isset($isfolder)) {
-      $newone = $newone.$dm;
-      $orig = $orig.$dm;
+      $newone = $newone.$delimiter;
+      $orig = $orig.$delimiter;
    }   
    sqimap_unsubscribe($imapConnection, $orig);
    sqimap_subscribe($imapConnection, $newone);
 
-	fputs ($imapConnection, "a001 LIST \"\" \"$newone*\"\r\n");
-   $data = sqimap_read_data($imapConnection, "a001", true, $a, $b);
+   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]);