*
* This is a standard SquirrelMail 1.2 API for plugins.
*
- * @copyright © 1999-2005 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
global $handleAsSent_result, $sent_subfolders_base,
$use_sent_subfolders;
+ // FIXME: hardcoded folder
$sent_subfolders_base = 'INBOX.Sent';
$args = func_get_arg(0);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
* Adds sent_subfolders options in folder preferences
*/
function sent_subfolders_optpage_loadhook_folders() {
- global $optpage_data, $imapServerAddress, $imapPort;
-
- sqgetGlobalVar('username', $username, SQ_SESSION);
- sqgetGlobalVar('key', $key, SQ_COOKIE);
+ global $username, $optpage_data, $imapServerAddress, $imapPort, $show_contain_subfolders_option;
/* Get some imap data we need later. */
- $imapConnection =
- sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0);
$boxes = sqimap_mailbox_list($imapConnection);
sqimap_logout($imapConnection);
'folder_filter' => 'noinferiors'
);
+ if ($show_contain_subfolders_option) {
+ $optvals[] = array(
+ 'name' => 'sent_subfolders_warning',
+ 'caption' => _("Warning"),
+ 'type' => SMOPT_TYPE_COMMENT,
+ 'comment' => _("There are some restrictions in Sent Subfolder options.")
+ );
+ }
+
/* Add our option data to the global array. */
$optpage_data['grps'][SMOPT_GRP_SENT_SUBFOLDERS] = $optgrp;
$optpage_data['vals'][SMOPT_GRP_SENT_SUBFOLDERS] = $optvals;
* 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;
global $use_sent_subfolders, $move_to_sent;
- sqgetGlobalVar('username', $username, SQ_SESSION);
- sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
if ($use_sent_subfolders || $move_to_sent) {
/* If this folder is NOT the current sent folder, update stuff. */
if ($sent_subfolder != $sent_folder) {
- /**
- * $sent_subfolder should not have \noselect flag or folder should
- * not exist.
- * if $level=2, $year_folder should not have \noinferiors or folder
- * should not exist.
- *
- * If some condition fails - sent_subfolders is misconfigured
- */
-
- /* Update sent_folder setting. */
- setPref($data_dir, $username, 'sent_folder', $sent_subfolder);
- setPref($data_dir, $username, 'move_to_sent', SMPREF_ON);
- $sent_folder = $sent_subfolder;
- $move_to_sent = SMPREF_ON;
-
/* Auto-create folders, if they do not yet exist. */
- if ($sent_folder != 'none') {
+ if ($sent_subfolder != 'none') {
/* Create the imap connection. */
- $ic = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
-
- if ($level==2) {
- /* Auto-create the year folder, if it does not yet exist. */
- if (!sqimap_mailbox_exists($ic, $year_folder)) {
- sqimap_mailbox_create($ic, $year_folder, 'noselect');
- } else if (!sqimap_mailbox_is_subscribed($ic, $year_folder)) {
- sqimap_subscribe($ic, $year_folder);
+ $ic = sqimap_login($username, false, $imapServerAddress, $imapPort, 10);
+
+ $boxes = false;
+ /**
+ * If sent_subfolder can't store messages (noselect) ||
+ * year_folder can't store subfolders (noinferiors) in level=2 setup ||
+ * subfolder_base can't store subfolders (noinferiors), setup is broken
+ */
+ if (sqimap_mailbox_is_noselect($ic,$sent_subfolder,$boxes) ||
+ ($level==2 && sqimap_mailbox_is_noinferiors($ic,$year_folder,$boxes)) ||
+ sqimap_mailbox_is_noinferiors($ic,$sent_subfolders_base,$boxes)) {
+ error_box(_("Sent Subfolders plugin is misconfigured."));
+ } else {
+ if ($level==2) {
+ /* Auto-create the year folder, if it does not yet exist. */
+ if (!sqimap_mailbox_exists($ic, $year_folder)) {
+ sqimap_mailbox_create($ic, $year_folder, 'noselect');
+ // TODO: safety check for imap servers that can't create subfolders
+
+ } else if (!sqimap_mailbox_is_subscribed($ic, $year_folder)) {
+ sqimap_subscribe($ic, $year_folder);
+ }
}
- }
- /* Auto-create the subfolder, if it does not yet exist. */
- if (!sqimap_mailbox_exists($ic, $sent_subfolder)) {
- sqimap_mailbox_create($ic, $sent_subfolder, '');
- } else if (!sqimap_mailbox_is_subscribed($ic, $sent_subfolder)) {
- sqimap_subscribe($ic, $sent_subfolder);
+ /* Auto-create the subfolder, if it does not yet exist. */
+ if (!sqimap_mailbox_exists($ic, $sent_subfolder)) {
+ sqimap_mailbox_create($ic, $sent_subfolder, '');
+ } else if (!sqimap_mailbox_is_subscribed($ic, $sent_subfolder)) {
+ sqimap_subscribe($ic, $sent_subfolder);
+ }
+ /* Update sent_folder setting. */
+ //setPref($data_dir, $username, 'sent_folder', $sent_subfolder);
+ //setPref($data_dir, $username, 'move_to_sent', SMPREF_ON);
+ $sent_folder = $sent_subfolder;
+ $move_to_sent = SMPREF_ON;
}
-
/* Close the imap connection. */
sqimap_logout($ic);
}
* @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;
+ global $data_dir, $username, $delimiter;
$use_sent_subfolders = getPref
($data_dir, $username, 'use_sent_subfolders', SMPREF_OFF);
$sent_subfolders_base = getPref($data_dir, $username, 'sent_subfolders_base', 'na');
+ /**
+ * If sent_subfolders are used and mailbox is equal to subfolder base
+ * or mailbox matches subfolder base + delimiter.
+ */
if ($use_sent_subfolders == SMPREF_ON &&
- ($mb == $sent_subfolders_base || stristr($mb,$sent_subfolders_base) ) ) {
+ ($mb == $sent_subfolders_base || stristr($mb,$sent_subfolders_base . $delimiter) ) ) {
return 1;
}
return 0;
}
-?>
\ No newline at end of file
projects / squirrelmail.git / blobdiff