X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_do.php;h=5c0c3937d6b0519297a4af7bd356f200858bc330;hb=0fa230016e399929e51d8e007b1509421424c7de;hp=8807f6456c2bd9a72a3937e7c142942e143dfabb;hpb=56a19f1e5e8a462a1374ae4cb4ecacf48c479da6;p=squirrelmail.git

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 8807f645..5c0c3937 100644
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -1,70 +1,80 @@
 <?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$
-    **/
-
-   require_once('../src/validate.php');
-   require_once('../functions/imap.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);
-
-   if (strpos($orig, $dm))
-      $old_dir = substr($orig, 0, strrpos($orig, $dm));
-   else
-      $old_dir = "";
-
-   if ($old_dir != "")
-      $newone = "$old_dir$dm$new_name";
-   else
-      $newone = "$new_name";
-
-   $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;
-   }   
-   sqimap_unsubscribe($imapConnection, $orig);
-   sqimap_subscribe($imapConnection, $newone);
-
-   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]);
-
-      if ($name != $newone) // don't try to resubscribe when renaming ab to abc
-      {
-        sqimap_unsubscribe($imapConnection, $name);
-        $name = substr($name, strlen($orig));
-        $name = $newone . $name;
-        sqimap_subscribe($imapConnection, $name);
-      }
-   }
-
-   /** Log out this session **/
-   sqimap_logout($imapConnection);
-   $location = get_location();
-   header ("Location: $location/folders.php?success=rename");
-?>
\ No newline at end of file
+
+/**
+ * folders_rename_do.php
+ *
+ * Copyright (c) 1999-2003 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$
+ */
+
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/display_messages.php');
+
+/* globals */
+sqgetGlobalVar('key',       $key,           SQ_COOKIE);
+sqgetGlobalVar('username',  $username,      SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter,     SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad,    SQ_SESSION);
+sqgetGlobalVar('orig',      $orig,          SQ_POST);
+sqgetGlobalVar('old_name',  $old_name,      SQ_POST);
+sqgetGlobalVar('new_name',  $new_name,      SQ_POST);
+/* end globals */
+
+$new_name = trim($new_name);
+
+if (substr_count($new_name, '"') || substr_count($new_name, "\\") ||
+    substr_count($new_name, $delimiter) || ($new_name == '')) {
+    displayPageHeader($color, 'None');
+
+    plain_error_message(_("Illegal folder name.  Please select a different name.").
+        '<BR><A HREF="../src/folders.php">'._("Click here to go back").'</A>.', $color);
+
+    exit;
+}
+
+$orig = imap_utf7_encode_local($orig);
+$old_name = imap_utf7_encode_local($old_name);
+$new_name = imap_utf7_encode_local($new_name);
+
+if ($old_name <> $new_name) {
+
+    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+
+    if (strpos($orig, $delimiter)) {
+        $old_dir = substr($orig, 0, strrpos($orig, $delimiter));
+    } else {
+        $old_dir = '';
+    }
+
+    if ($old_dir != '') {
+        $newone = $old_dir . $delimiter . $new_name;
+    } else {
+        $newone = $new_name;
+    }
+
+    // Renaming a folder doesn't rename the folder but leaves you unsubscribed
+    //    at least on Cyrus IMAP servers.
+    if (isset($isfolder)) {
+        $newone = $newone.$delimiter;
+        $orig = $orig.$delimiter;
+    }
+    sqimap_mailbox_rename( $imapConnection, $orig, $newone );
+
+    // Log out this session 
+    sqimap_logout($imapConnection);
+
+}
+
+header ('Location: ' . get_location() . '/folders.php?success=rename');
+
+?>