Moved printing of HTML-header into page_header.php.

[squirrelmail.git] / src / folders_rename_do.php
diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php

index 0366c728edeee13052f22dde057ee6adf8a1ebae..52359c6cc7260c80730789370ec4d707b8fc5e7e 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -1,4 +1,6 @@
-<?
+<?php
+   session_start();
+
     if (!isset($config_php))
        include("../config/config.php");
     if (!isset($strings_php))
@@ -10,7 +12,7 @@
  
     include("../src/load_prefs.php");
  
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
+   $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
     $dm = sqimap_get_delimiter($imapConnection);
  
     if (strpos($orig, $dm))
@@ -23,21 +25,35 @@
     else
        $newone = "$new_name";
  
+   $orig = stripslashes($orig);
+   $newone = stripslashes($newone);
+
     fputs ($imapConnection, ". RENAME \"$orig\" \"$newone\"\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.
-   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;
+   }   
  
-   /** Log out this session **/
-   fputs($imapConnection, "1 logout");
+   sqimap_unsubscribe($imapConnection, $orig);
+   sqimap_subscribe($imapConnection, $newone);
  
-   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>";
-   echo _("Return");
-   echo "</A>";
-   echo "</BODY></HTML>";
+   /** Log out this session **/
+   sqimap_logout($imapConnection);
+
+   displayPageHeader($color, "None");
+   echo "<BR><BR><BR><CENTER><B>";
+   echo _("Folder Renamed!");
+   echo "</B><BR><BR>";
+   echo _("The folder has been successfully renamed.");
+   echo "<BR><A HREF=\"webmail.php?right_frame=folders.php\" TARGET=_top>";
+   echo _("Click here");
+   echo "</A> ";
+   echo _("to continue.");
+   echo "</CENTER>";
+   
+   echo "</BODY></HTML>"; 
  ?>