Fix inconsequent use of utf7_encode which causes problems with creating/renaming

[squirrelmail.git] / src / folders_rename_getname.php

diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 6e494aa763ba35c29621e4623ac9d70be1b476f3..9c83612b8bf963a9a255a09c0ff404b4b3da0fcb 100644 (file)
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -17,6 +17,7 @@ define('SM_PATH','../');
 
 /* SquirrelMail required files. */
 require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap_mailbox.php');
 require_once(SM_PATH . 'functions/html.php');
 require_once(SM_PATH . 'functions/display_messages.php');
 
@@ -46,6 +47,8 @@ if (substr($old, strlen($old) - strlen($delimiter)) == $delimiter) {
     $isfolder = FALSE;
 }
 
+$old = imap_utf7_decode_local($old);
+
 if (strpos($old, $delimiter)) {
     $old_name = substr($old, strrpos($old, $delimiter)+1, strlen($old));
     $old_parent = substr($old, 0, strrpos($old, $delimiter));
@@ -54,6 +57,7 @@ if (strpos($old, $delimiter)) {
     $old_parent = '';
 }
 
+
 displayPageHeader($color, 'None');
 echo '<br>' .
     html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) .