X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders_create.php;h=9af11417f13a25ec76be3d91c352f919503d37c4;hp=7b969c7ad04e600eb0fe41557479c548f2fee860;hb=d2523fba460000828abde942f000ecc4857a829d;hpb=e1749b4b5457dbcc93d447a56e756ab1dca85d7b
diff --git a/src/folders_create.php b/src/folders_create.php
index 7b969c7a..9af11417 100644
--- a/src/folders_create.php
+++ b/src/folders_create.php
@@ -1,47 +1,53 @@
";
+ strpos($folder_name, "'") || strpos($folder_name, "$delimiter")) {
+ echo "";
plain_error_message(_("Illegal folder name. Please select a different name.")."
"._("Click here to go back").".", $color);
sqimap_logout($imapConnection);
exit;
}
if (isset($contain_subs) && $contain_subs == true)
- $folder_name = "$folder_name$dm";
+ $folder_name = "$folder_name$delimiter";
- if ($folder_prefix && (substr($folder_prefix, -1) != $dm)) {
- $folder_prefix = $folder_prefix . $dm;
+ if ($folder_prefix && (substr($folder_prefix, -1) != $delimiter)) {
+ $folder_prefix = $folder_prefix . $delimiter;
}
if ($folder_prefix && (substr($subfolder, 0, strlen($folder_prefix)) != $folder_prefix)){
$subfolder_orig = $subfolder;
@@ -50,16 +56,13 @@
$subfolder_orig = $subfolder;
}
- if (trim($subfolder_orig) == '[ ' . _('None') . ' ]' ||
- trim($subfolder_orig) == '') {
+ if (trim($subfolder_orig) == '') {
sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, "");
} else {
- sqimap_mailbox_create ($imapConnection, $subfolder.$dm.$folder_name, "");
+ sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$folder_name, "");
}
- fputs($imapConnection, "1 logout\n");
$location = get_location();
header ("Location: $location/folders.php?success=create");
sqimap_logout($imapConnection);
?>
-