fixed bugs in next/previous

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

index 3c95663b035ad921f056efc773dad2f6c0aa81a8..45b1a5dbf8d94e2530f9a3cd11c7ddb8af3a38ad 100644 (file)
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,27 +1,42 @@
-<?
-   include("../config/config.php");
-   include("../functions/strings.php");
-   include("../functions/page_header.php");
-   include("../functions/imap.php");
-   include("../functions/display_messages.php");
+<?php
+   session_start();
+
+   if (!isset($config_php))
+      include("../config/config.php");
+   if (!isset($strings_php))
+      include("../functions/strings.php");
+   if (!isset($page_header_php))
+      include("../functions/page_header.php");
+   if (!isset($imap_php))
+      include("../functions/imap.php");
+   if (!isset($display_messages_php))
+      include("../functions/display_messages.php");
  
     include("../src/load_prefs.php");
  
-   $imapConnection = sqimap_login($username, $key, $imapServerAddress, 0);
+   $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, "\\") ||
         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);
+      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 ($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;
+   }
+
+   if (trim($subfolder_orig) == "[ None ]") {
+      sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
     } else {
        sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
     }
@@ -32,7 +47,6 @@
  //   } else {
        echo "<html><BODY TEXT=\"$color[8]\" BGCOLOR=\"$color[4]\" LINK=\"$color[7]\" VLINK=\"$color[7]\" ALINK=\"$color[7]\">\n";
        displayPageHeader($color, "None");
-      echo "<FONT FACE=\"Arial,Helvetica\">";
        echo "<BR><BR><BR><CENTER><B>";
        echo _("Folder Created!");
        echo "</B><BR><BR>";
@@ -41,7 +55,7 @@
        echo _("Click here");
        echo "</A> ";
        echo _("to continue.");
-      echo "</CENTER></FONT>";
+      echo "</CENTER>";
        echo "</BODY></HTML>";
  //   }
  ?>