* Forgot to catch an 'if' so I could get proper indentation

[squirrelmail.git] / src / folders_rename_do.php

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 07438e1007fff7706be2ea58c806e0959f049cea..7c8bb47ba8f53f664d1972588565f53d99b27267 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -7,14 +7,16 @@
     **
     **  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($config_php))
+      include("../config/config.php");
    if (!isset($page_header_php))
       include("../functions/page_header.php");
    if (!isset($imap_php))
@@ -22,6 +24,13 @@
 
    include("../src/load_prefs.php");
 
+
+   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);
 
@@ -35,15 +44,12 @@
    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);
 
    // 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;
    }   
@@ -56,7 +62,7 @@
    {
       $name = find_mailbox_name($data[$i]);
 
-      if ($name != $newone) # don't try to resubscribe when renaming ab to abc
+      if ($name != $newone) // don't try to resubscribe when renaming ab to abc
       {
         sqimap_unsubscribe($imapConnection, $name);
         $name = substr($name, strlen($orig));