X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffolders_rename_getname.php;h=6471f3923b8e910becb6800c598b3ad1491da827;hb=08188c2571fb2367bca3eb053bd694029f9e0f0f;hp=d1a66353dc271f201e904c1844f0fb8fafe9878a;hpb=a32985a59fe460e2bf5c2e9ea2dd6004d0f66b54;p=squirrelmail.git
diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index d1a66353..6471f392 100644
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -3,44 +3,42 @@
/**
* folders_rename_getname.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2003 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Gets folder names and enables renaming
* Called from folders.php
*
* $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
+/** 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/global.php');
+require_once(SM_PATH . 'functions/imap_mailbox.php');
require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/display_messages.php');
/* get globals we may need */
-
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$delimiter = $_SESSION['delimiter'];
-$onetimepad = $_SESSION['onetimepad'];
-
-$old = $_POST['old'];
-
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('old', $old, SQ_POST);
/* end of get globals */
if ($old == '') {
displayPageHeader($color, 'None');
- echo "";
- plain_error_message(_("You have not selected a folder to rename. Please do so.")."
"._("Click here to go back").".", $color);
+
+ plain_error_message(_("You have not selected a folder to rename. Please do so.").
+ '
'._("Click here to go back").'.', $color);
exit;
}
-
-$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-
if (substr($old, strlen($old) - strlen($delimiter)) == $delimiter) {
$isfolder = TRUE;
$old = substr($old, 0, strlen($old) - 1);
@@ -48,6 +46,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));
@@ -56,26 +56,25 @@ if (strpos($old, $delimiter)) {
$old_parent = '';
}
+
displayPageHeader($color, 'None');
echo '
' .
- html_tag( 'table', '', 'center', '', 'width="95%" cols="1" border="0"' ) .
+ html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) .
html_tag( 'tr',
html_tag( 'td', '' . _("Rename a folder") . '', 'center', $color[0] )
) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[4] ) .
- "
".
- "";
+printf("\n", htmlspecialchars($old));
+printf("\n", htmlspecialchars($old_name));
+echo '\n".
+ '
';
-/** Log out this session **/
-sqimap_logout($imapConnection);
?>