Insert notes about PHP 4.3.x into some documentation.

[squirrelmail.git] / src / folders_rename_do.php

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 8c596eaae740feb979dc2719713e6d81caafb7e2..89b0a117cbb68babf1b9497a7b5a34e55565db1d 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -3,7 +3,7 @@
 /**
  * folders_rename_do.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.
  *
  * Does the actual renaming of files on the IMAP server.
@@ -18,13 +18,13 @@ 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 */
 $username = $_SESSION['username'];
 $key = $_COOKIE['key'];
 $delimiter = $_SESSION['delimiter'];
 $onetimepad = $_SESSION['onetimepad'];
-$base_uri = $_SESSION['base_uri'];
 
 $orig = $_POST['orig'];
 $old_name = $_POST['old_name'];
@@ -34,6 +34,20 @@ $new_name = $_POST['new_name'];
 
 $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);
@@ -50,7 +64,7 @@ if ($old_name <> $new_name) {
         $newone = $new_name;
     }
 
-    // Renaming a folder doesn't renames the folder but leaves you unsubscribed
+    // Renaming a folder doesn't rename the folder but leaves you unsubscribed
     //    at least on Cyrus IMAP servers.
     if (isset($isfolder)) {
         $newone = $newone.$delimiter;
@@ -62,5 +76,7 @@ if ($old_name <> $new_name) {
     sqimap_logout($imapConnection);
 
 }
-header ('Location: ' . $base_uri . 'src/folders.php?success=rename');
+
+header ('Location: ' . get_location() . '/folders.php?success=rename');
+
 ?>