X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_create.php;h=08bc1928b581c670faeb10856c9bcb3b64870823;hb=426e0b72ec139e19279f0d1e45213a3707027d3a;hp=e668ac2da3c2017a1201349090355d8d9a46b030;hpb=91f999f6777c170dfa84465f1ccfec69ff06b3a5;p=squirrelmail.git diff --git a/src/folders_create.php b/src/folders_create.php index e668ac2d..08bc1928 100644 --- a/src/folders_create.php +++ b/src/folders_create.php @@ -1,41 +1,75 @@ - -\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$folder_name"); - } - fputs($imapConnection, "1 logout\n"); - - echo ""; - echo "

" . _("Folder Created!") . "

"; - echo _("You will be automatically forwarded.") . "
" . _("If not,") . " " . _("click here") . "."; - 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"); + +?>