*
* This is a standard SquirrelMail 1.2 API for plugins.
*
- * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @copyright © 1999-2007 The SquirrelMail Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package plugins
* Adds sent_subfolders options in folder preferences
*/
function sent_subfolders_optpage_loadhook_folders() {
- global $optpage_data, $imapServerAddress, $imapPort, $show_contain_subfolders_option;
-
- sqgetGlobalVar('username', $username, SQ_SESSION);
+ global $username, $optpage_data, $imapServerAddress, $imapPort, $show_contain_subfolders_option;
/* Get some imap data we need later. */
$imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
* creates required imap folders
*/
function sent_subfolders_update_sentfolder() {
- global $sent_folder;
+ global $sent_folder, $username;
global $sent_subfolders_base, $sent_subfolders_setting;
- global $data_dir, $imapServerAddress, $imapPort, $color;
+ global $data_dir, $imapServerAddress, $imapPort;
global $use_sent_subfolders, $move_to_sent;
- sqgetGlobalVar('username', $username, SQ_SESSION);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
if ($use_sent_subfolders || $move_to_sent) {
* Multiple year holders with messages in it. level 1.
* Multiple year folders with holders in it. level 2.
*/
- $cnd_delimiter = $delimiter;
switch ($sent_subfolders_setting) {
case SMPREF_SENT_SUBFOLDERS_YEARLY:
$level = 1;
- $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
+ $sent_subfolder = $sent_subfolders_base . $delimiter
. $year;
break;
case SMPREF_SENT_SUBFOLDERS_QUARTERLY:
$level = 2;
- $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
+ $sent_subfolder = $sent_subfolders_base . $delimiter
. $year
. $delimiter . $quarter;
- $year_folder = $sent_subfolders_base . $cnd_delimiter
+ $year_folder = $sent_subfolders_base . $delimiter
. $year;
break;
case SMPREF_SENT_SUBFOLDERS_MONTHLY:
$level = 2;
- $sent_subfolder = $sent_subfolders_base . $cnd_delimiter
+ $sent_subfolder = $sent_subfolders_base . $delimiter
. $year
. $delimiter . $month;
- $year_folder = $sent_subfolders_base. $cnd_delimiter . $year;
+ $year_folder = $sent_subfolders_base. $delimiter . $year;
break;
case SMPREF_SENT_SUBFOLDERS_DISABLED:
default:
* @return boolean 1 - is part of sent_subfolders, 0 - is not part of sent_subfolders
*/
function sent_subfolders_special_mailbox($mb) {
- global $data_dir, $username, $delimiter;
+ global $data_dir, $username;
+
+ sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
$use_sent_subfolders = getPref
($data_dir, $username, 'use_sent_subfolders', SMPREF_OFF);
}
return 0;
}
-?>
\ No newline at end of file