added patch from tcabot for a pure HTML method of selecting all messages

[squirrelmail.git] / src / folders_create.php
diff --git a/src/folders_create.php b/src/folders_create.php

index e7e55049c5bf5a3fc2cea15334e8fd7b5af736c5..1db6920970d851461f58d1445d201529344b116c 100644 (file)
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,4 +1,16 @@
-<?
+<?php
+   /**
+    **  folders_create.php
+    **
+    **  Copyright (c) 1999-2000 The SquirrelMail development team
+    **  Licensed under the GNU GPL. For full terms see the file COPYING.
+    **
+    **  Creates folders on the IMAP server. 
+    **  Called from folders.php
+    **/
+
+   session_start();
+
     if (!isset($config_php))
        include("../config/config.php");
     if (!isset($strings_php))
@@ -15,27 +27,38 @@
     $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
     $dm = sqimap_get_delimiter($imapConnection);
  
-   if (strpos($folder_name, "\"") || strpos($folder_name, ".") ||
-       strpos($folder_name, "/") || strpos($folder_name, "\\") ||
+   if (strpos($folder_name, "\"") || strpos($folder_name, "\\") ||
         strpos($folder_name, "'") || strpos($folder_name, "$dm")) {
-      plain_error_message(_("Illegal folder name.  Please select a different name.<BR><A HREF=\"../src/folders.php\">Click here to go back</A>."), $color);
+               print "<html><body bgcolor=$color[4]>";
+      plain_error_message(_("Illegal folder name.  Please select a different name.")."<BR><A HREF=\"../src/folders.php\">"._("Click here to go back")."</A>.", $color);
+      sqimap_logout($imapConnection);
        exit;
     }
  
     if ($contain_subs == true)
        $folder_name = "$folder_name$dm";
  
-   if (trim($subfolder) == "[ None ]") {
-      sqimap_mailbox_create ($imapConnection, $folder_name, "");
+   if ($folder_prefix && (substr($folder_prefix, -1) != $dm)) {
+      $folder_prefix = $folder_prefix . $dm;
+   }
+   if ($folder_prefix && (substr($subfolder, 0, strlen($folder_prefix)) != $folder_prefix)){
+      $subfolder_orig = $subfolder;
+      $subfolder = $folder_prefix . $subfolder;
+   } else {
+      $subfolder_orig = $subfolder;
+   }
+
+   if ((trim($subfolder_orig) == "[ None ]") || (trim(sqStripSlashes($subfolder_orig)) == "[ None ]")) {
+      sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
     } else {
        sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
     }
     fputs($imapConnection, "1 logout\n");
  
-//   if ($auto_forward == true) {
-//      header ("Location: webmail.php?right_frame=folders.php");
-//   } else {
-      echo "<html><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
+   $location = get_location();
+   header ("Location: $location/folders.php?success=create");
+   sqimap_logout($imapConnection);
+   /*   
        displayPageHeader($color, "None");
        echo "<BR><BR><BR><CENTER><B>";
        echo _("Folder Created!");
@@ -47,6 +70,6 @@
        echo _("to continue.");
        echo "</CENTER>";
        echo "</BODY></HTML>";
-//   }
+   */
  ?>