Getting ready for 1.2.0 release.

[squirrelmail.git] / src / folders_rename_do.php

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index e2db9ccbdf49afd2ed047ccc8f32aa49463cb159..9d69ba99c6d1ccbbca273730ab4fc86a436e765b 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -1,21 +1,35 @@
 <?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/validate.php");
-   include("../functions/page_header.php");
-   include("../functions/imap.php");
-   include("../src/load_prefs.php");
+/**
+ * folders_rename_do.php
+ *
+ * Copyright (c) 1999-2002 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$
+ */
 
+/*****************************************************************/
+/*** THIS FILE NEEDS TO HAVE ITS FORMATTING FIXED!!!           ***/
+/*** PLEASE DO SO AND REMOVE THIS COMMENT SECTION.             ***/
+/***    + Base level indent should begin at left margin, as    ***/
+/***      the require_once below looks.                        ***/
+/***    + All identation should consist of four space blocks   ***/
+/***    + Tab characters are evil.                             ***/
+/***    + all comments should use "slash-star ... star-slash"  ***/
+/***      style -- no pound characters, no slash-slash style   ***/
+/***    + FLOW CONTROL STATEMENTS (if, while, etc) SHOULD      ***/
+/***      ALWAYS USE { AND } CHARACTERS!!!                     ***/
+/***    + Please use ' instead of ", when possible. Note "     ***/
+/***      should always be used in _( ) function calls.        ***/
+/*** Thank you for your help making the SM code more readable. ***/
+/*****************************************************************/
+
+require_once('../src/validate.php');
+require_once('../functions/imap.php');
 
    if($old_name == $new_name) {
       $location = get_location();
@@ -24,32 +38,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]);