X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_rename_getname.php;h=1b8066d72218af09f99a5a052969173af9ea8815;hb=c3ccfa1912b4ca47279d259bb587ceb293ce5d83;hp=633c3ea50cbff748cd6f3baa631f0f7c509b8ef1;hpb=3530b83b1f8d5d7afe9508ab081e40ac9af8b599;p=squirrelmail.git
diff --git a/src/folders_rename_getname.php b/src/folders_rename_getname.php
index 633c3ea5..1b8066d7 100644
--- a/src/folders_rename_getname.php
+++ b/src/folders_rename_getname.php
@@ -3,7 +3,7 @@
/**
* 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
@@ -12,22 +12,32 @@
* $Id$
*/
-global $delimiter;
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/html.php');
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.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 */
+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);
@@ -35,6 +45,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));
@@ -43,26 +55,24 @@ 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", $old);
+printf("\n", $old_name);
+echo '\n".
+ '
';
-/** Log out this session **/
-sqimap_logout($imapConnection);
?>