X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=884abd422a733f80a785b8278af66a454d34a614;hb=75d3419e4b2de9a888ce831df0104349dd7db657;hp=14ef7636c6ec2458757fe689c29222f2399d27c7;hpb=b235d62915dba943446744b725971bd2c47bc347;p=squirrelmail.git diff --git a/src/folders_create.php b/src/folders_create.php index 14ef7636..884abd42 100644 --- a/src/folders_create.php +++ b/src/folders_create.php @@ -1,39 +1,78 @@ - -\n"; - displayPageHeader($color, "None"); - - $imapConnection = loginToImapServer($username, $key, $imapServerAddress, 0); - $dm = findMailboxDelimeter($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.
Click here to go back."), $color); - exit; - } - - if ($contain_subs == true) - $folder_name = "$folder_name$dm"; - - if (trim($subfolder) == "[ None ]") { - createFolder($imapConnection, "$folder_name"); - } else { - createFolder($imapConnection, "$subfolder$dm$folder_name"); - } - fputs($imapConnection, "1 logout\n"); - - echo "

"; - echo _("Return"); - echo ""; -?> - +'._("Click here to go back").'.', $color); + exit; +} + +$folder_name = imap_utf7_encode_local($folder_name); + +if (isset($contain_subs) && $contain_subs ) { + $folder_name = $folder_name . $delimiter; +} + +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; + $subfolder = $folder_prefix . $subfolder; +} else { + $subfolder_orig = $subfolder; +} + +$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0); + +if (trim($subfolder_orig) == '') { + sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, ''); +} else { + sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$folder_name, ''); +} + +sqimap_logout($imapConnection); + +$location = get_location(); +header ("Location: $location/folders.php?success=create"); + +?>