fixed delimiter presence when not connected to imap server

[squirrelmail.git] / src / folders_rename_do.php

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 9a35573808516f8d809c1b59e74a18476696bc62..8807f6456c2bd9a72a3937e7c142942e143dfabb 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -11,19 +11,8 @@
     **  $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");
-
-   include("../src/load_prefs.php");
-
+   require_once('../src/validate.php');
+   require_once('../functions/imap.php');
 
    if($old_name == $new_name) {
       $location = get_location();
@@ -44,23 +33,23 @@
    else
       $newone = "$new_name";
 
-   $orig = sqStripSlashes($orig);
-   $newone = sqStripSlashes($newone);
-
-   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 ($isfolder) {
+   if (isset($isfolder)) {
       $newone = $newone.$dm;
       $orig = $orig.$dm;
    }   
    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]);
@@ -78,4 +67,4 @@
    sqimap_logout($imapConnection);
    $location = get_location();
    header ("Location: $location/folders.php?success=rename");
-?>
+?>
\ No newline at end of file