global $trash_folder, $sent_folder, $draft_folder,
$move_to_trash, $move_to_sent, $save_as_draft,
- $delimiter, $folder_prefix;
+ $delimiter, $folder_prefix, $imap_server_type;
if ( $move_to_sent ) {
- $i = strpos( $sent_folder, $delimiter, strlen( $folder_prefix ) );
- if ( $i === FALSE ) {
+ if ( $imap_server_type == 'uw' ) {
+ $i = strpos( $sent_folder, $delimiter, strlen( $folder_prefix ) );
+ if ( $i === FALSE ) {
+ $i = strlen( $box );
+ }
+ } else {
$i = strlen( $box );
}
-
}
-
+
$ret = ( (strtolower($box) == 'inbox') ||
($box == $trash_folder &&
$move_to_trash) ||
Multiple year holders with messages in it. level 1.
Multiple year folders with holders in it. level 2.
*/
+
+ if( $imap_server_type == 'uw' ) {
+ $cnd_delimiter = '';
+ } else {
+ $cnd_delimiter = $delimiter;
+ }
+
switch ($sent_subfolders_setting) {
case SMPREF_SENT_SUBFOLDERS_YEARLY:
$level = 1;
- $sent_subfolder = $sent_subfolders_base
+ $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
. $year;
- $year_folder = $sent_subfolder;
break;
case SMPREF_SENT_SUBFOLDERS_QUARTERLY:
$level = 2;
- $sent_subfolder = $sent_subfolders_base
+ $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
. $year
. $delimiter . $quarter;
$year_folder = $sent_subfolders_base
break;
case SMPREF_SENT_SUBFOLDERS_MONTHLY:
$level = 2;
- $sent_subfolder = $sent_subfolders_base
+ $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
. $year
. $delimiter . $month;
$year_folder = $sent_subfolders_base . $year;
$year_folder = $sent_folder;
}
- if( $sent_subfolders_setting <> SMPREF_SENT_SUBFOLDERS_DISABLED &&
- $imap_server_type <> 'uw' ) {
- $year_folder .= $delimiter;
- }
-
/* If this folder is NOT the current sent folder, update stuff. */
if ($sent_subfolder != $sent_folder) {
/* First, update the sent folder. */