fixed renaming problems
authorlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 9 Mar 2000 03:07:02 +0000 (03:07 +0000)
committerlkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Thu, 9 Mar 2000 03:07:02 +0000 (03:07 +0000)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@290 7612ce4b-ef26-0410-bec9-ea0150e637f0

src/folders.php
src/folders_rename_do.php
src/folders_rename_getname.php

index 1084ba334272f79f1c512bbcd96775433ad350f4..12da0c38d5eb9cec6c8e105c00ecaa919479ffa0 100644 (file)
             }
          }
          if ($use_folder == true) {
-            $box = $boxes[$i]["unformatted"];
+            $box = $boxes[$i]["unformatted-dm"];
             $box2 = replace_spaces($boxes[$i]["formatted"]);
             echo "         <OPTION VALUE=\"$box\">$box2\n";
          }
index 0366c728edeee13052f22dde057ee6adf8a1ebae..6d46ebfad9642292943d407e0bac9ea926e40bbe 100644 (file)
 
    // Renaming a folder doesn't renames the folder but leaves you unsubscribed
    //    at least on Cyrus IMAP servers.
-   fputs ($imapConnection, "sub UNSUBSCRIBE \"$orig\"\n");
-   fputs ($imapConnection, "sub SUBSCRIBE \"$newone\"\n");
-   $data = sqimap_read_data($imapConnection, "sub", true, $a, $b);
+   if ($isfolder) {
+      $newone = $newone.$dm;
+      $orig = $orig.$dm;
+   }   
+
+   sqimap_unsubscribe($imapConnection, $orig);
+   sqimap_subscribe($imapConnection, $newone);
 
    /** Log out this session **/
-   fputs($imapConnection, "1 logout");
+   sqimap_logout($imapConnection);
 
    echo "<HTML><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
    echo "<BR><BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
index ecf4368fa1dae3fba25a9d375949229e0e732526..17c0c7eab4b80d7cd8d9af09b9df7bdd450d19d3 100644 (file)
    include("../src/load_prefs.php");
 
    $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
-   sqimap_mailbox_select($imapConnection, $old);
 
    $dm = sqimap_get_delimiter($imapConnection);
+   if (substr($old, strlen($old) - strlen($dm)) == $dm) {
+      $isfolder = true;
+      $old = substr($old, 0, strlen($old) - 1);
+   }
+   
    if (strpos($old, $dm)) {
       $old_name = substr($old, strrpos($old, $dm)+1, strlen($old));
       $old_parent = substr($old, 0, strrpos($old, $dm));
@@ -32,6 +36,8 @@
    echo "<FORM ACTION=folders_rename_do.php METHOD=POST>\n";
    echo _("New name:");
    echo " &nbsp;&nbsp;<INPUT TYPE=TEXT SIZE=25 NAME=new_name VALUE=\"$old_name\"><BR>\n";
+   if ($isfolder)
+      echo "<INPUT TYPE=HIDDEN NAME=isfolder VALUE=\"true\">";
    echo "<INPUT TYPE=HIDDEN NAME=orig VALUE=\"$old\">";
    echo "<INPUT TYPE=SUBMIT VALUE=\"";
    echo _("Submit");