Some reworking of folders.php and friends.

[squirrelmail.git] / src / folders_rename_do.php

diff --git a/src/folders_rename_do.php b/src/folders_rename_do.php
index 79175d1b379224f1d83a15d5ec62c98f1ab9d088..f625ac482da5a89600782ecbaf9a5247b0ce82ea 100644 (file)
--- a/src/folders_rename_do.php
+++ b/src/folders_rename_do.php
@@ -12,13 +12,38 @@
  * $Id$
  */
 
-global $delimiter, $base_uri;
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
 
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
+/* 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'];
+
+$orig = $_POST['orig'];
+$old_name = $_POST['old_name'];
+$new_name = $_POST['new_name'];
+
+/* end globals */
 
 $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;
+}
+
 if ($old_name <> $new_name) {
 
     $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
@@ -35,7 +60,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;
@@ -47,5 +72,7 @@ if ($old_name <> $new_name) {
     sqimap_logout($imapConnection);
 
 }
-header ('Location: ' . $base_uri . 'src/folders.php');
+
+header ('Location: ' . get_location() . '/folders.php?success=rename');
+
 ?>