}
function sent_subfolders_check_handleAsSent() {
- global $handleAsSent_result, $sent_subfolders_base;
- global $use_sent_subfolders;
+ global $handleAsSent_result, $sent_subfolders_base,
+ $use_sent_subfolders, $delimiter;
$sent_subfolders_base = 'INBOX.Sent';
$args = func_get_arg(0);
}
function sent_subfolders_load_prefs() {
- global $use_sent_subfolders;
- global $sent_subfolders_setting, $sent_subfolders_base;
+ global $use_sent_subfolders, $data_dir, $username,
+ $sent_subfolders_setting, $sent_subfolders_base;
$use_sent_subfolders = getPref
($data_dir, $username, 'use_sent_subfolders', SMPREF_OFF);
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;
+ }
+*/
+ $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. */