* (un)subscribe, create, rename, delete.
*
* @author Thijs Kinkhorst <kink at squirrelmail.org>
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright 1999-2009 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
/**
* Called from folders.php to create a new folder.
+ * @param stream $imapConnection imap connection resource
+ * @param string $delimiter delimiter
+ * @param string $folder_name new folder name
+ * @param string $subfolder folder that stores new folder
+ * @param string $contain_subs if not empty, creates folder that can store subfolders
+ * @since 1.5.1
*/
function folders_create ($imapConnection, $delimiter, $folder_name, $subfolder, $contain_subs)
{
$folder_name = imap_utf7_encode_local($folder_name);
if ( ! empty($contain_subs) ) {
- $folder_name = $folder_name . $delimiter;
+ $folder_type = 'noselect';
+ } else {
+ $folder_type = '';
}
if ($folder_prefix && (substr($folder_prefix, -1) != $delimiter)) {
}
if (trim($subfolder_orig) == '') {
- sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, '');
+ sqimap_mailbox_create ($imapConnection, $folder_prefix.$folder_name, $folder_type);
} else {
- sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$folder_name, '');
+ sqimap_mailbox_create ($imapConnection, $subfolder.$delimiter.$folder_name, $folder_type);
}
return;
$old = imap_utf7_decode_local($old);
if (strpos($old, $delimiter)) {
- $old_name = substr($old, strrpos($old, $delimiter)+1, strlen($old));
+ $old_name = substr($old, strrpos($old, $delimiter)+1);
// hide default prefix (INBOX., mail/ or other)
$quoted_prefix=preg_quote($default_folder_prefix,'/');
$prefix_length=(preg_match("/^$quoted_prefix/",$old) ? strlen($default_folder_prefix) : 0);
sqimap_logout($imapConnection);
$oTemplate->assign('dialog_type', 'rename');
- $oTemplate->assign('color', $color);
- $oTemplate->assign('old_parent', htmlspecialchars($old_parent));
- $oTemplate->assign('old', htmlspecialchars($old));
- $oTemplate->assign('old_name', htmlspecialchars($old_name));
- $oTemplate->assign('isfolder', $isfolder);
+ $oTemplate->assign('parent_folder', htmlspecialchars($old_parent));
+ $oTemplate->assign('current_full_name', htmlspecialchars($old));
+ $oTemplate->assign('current_folder_name', htmlspecialchars($old_name));
+ $oTemplate->assign('is_folder', $isfolder);
$oTemplate->display('folder_manip_dialog.tpl');
$oTemplate->display('footer.tpl');
sqimap_logout($imapConnection);
$oTemplate->assign('dialog_type', 'delete');
- $oTemplate->assign('color', $color);
$oTemplate->assign('folder_name', htmlspecialchars($folder_name));
$oTemplate->assign('visible_folder_name', htmlspecialchars($visible_folder_name));
/** lets see if we CAN move folders to the trash.. otherwise,
** just delete them **/
- if ($delete_folder || eregi('^'.$trash_folder.'.+', $folder_name) ) {
+ if ($delete_folder || preg_match('/^' . $trash_folder . '.+/i', $folder_name) ) {
$can_move_to_trash = FALSE;
} else {
/* Otherwise, check if trash folder exits and support sub-folders */