X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffolders.php;h=92c2d2ead1282a745f1c7278625b8ee53c8fa599;hb=5facc3fca35506c6d0cbcf0233b63d275c6ee2a6;hp=cc1fc279b90176b81929929231230dcff095284c;hpb=73af801f3a794a10a1ef44445d94b6c23120315b;p=squirrelmail.git
diff --git a/src/folders.php b/src/folders.php
index cc1fc279..92c2d2ea 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -1,339 +1,220 @@
' .
- html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'center' ) . '' . _("Folders") . '' .
- html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'center', $color[4] );
+global $imap_stream_options; // in case not defined in config
+$imapConnection = sqimap_login ($username, false, $imapServerAddress, $imapPort, 0, $imap_stream_options);
-if ( isset($success) && $success ) {
+/* switch to the right function based on what the user selected */
+if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) {
+ switch ($action)
+ {
+ case 'create':
- $td_str = '';
+ // first, validate security token
+ sm_validate_security_token($submitted_token, -1, TRUE);
- switch ($success)
- {
- case 'subscribe':
- $td_str .= _("Subscribed successfully!");
+ sqgetGlobalVar('folder_name', $folder_name, SQ_POST);
+ sqgetGlobalVar('subfolder', $subfolder, SQ_POST);
+ sqgetGlobalVar('contain_subs', $contain_subs, SQ_POST);
+ folders_create($imapConnection, $delimiter, $folder_name, $subfolder, $contain_subs);
+ $td_str = _("Created folder successfully.");
break;
- case 'unsubscribe':
- $td_str .= _("Unsubscribed successfully!");
+ case 'rename':
+ if ( sqgetGlobalVar('cancelbutton', $dummy, SQ_POST) ) {
+ break;
+ }
+ if ( ! sqgetGlobalVar('new_name', $new_name, SQ_POST) ) {
+ sqgetGlobalVar('old_name', $old_name, SQ_POST);
+ folders_rename_getname($imapConnection, $delimiter, $old_name);
+ } else {
+
+ // first, validate security token
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
+ sqgetGlobalVar('orig', $orig, SQ_POST);
+ sqgetGlobalVar('old_name', $old_name, SQ_POST);
+ folders_rename_do($imapConnection, $delimiter, $orig, $old_name, $new_name);
+ $td_str = _("Renamed successfully.");
+ }
break;
case 'delete':
- $td_str .= _("Deleted folder successfully!");
+ if ( sqgetGlobalVar('cancelbutton', $dummy, SQ_POST) ) {
+ break;
+ }
+ sqgetGlobalVar('folder_name', $folder_name, SQ_POST);
+ if ( sqgetGlobalVar('confirmed', $dummy, SQ_POST) ) {
+
+ // first, validate security token
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
+ folders_delete_do($imapConnection, $delimiter, $folder_name);
+ $td_str = _("Deleted folder successfully.");
+ } else {
+ folders_delete_ask($imapConnection, $folder_name);
+ }
break;
- case 'create':
- $td_str .= _("Created folder successfully!");
+ case 'subscribe':
+
+ // first, validate security token
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
+ sqgetGlobalVar('folder_names', $folder_names, SQ_POST);
+ folders_subscribe($imapConnection, $folder_names);
+ $td_str = _("Subscribed successfully.");
break;
- case 'rename':
- $td_str .= _("Renamed successfully!");
+ case 'unsubscribe':
+
+ // first, validate security token
+ sm_validate_security_token($submitted_token, -1, TRUE);
+
+ sqgetGlobalVar('folder_names', $folder_names, SQ_POST);
+ folders_unsubscribe($imapConnection, $folder_names);
+ $td_str = _("Unsubscribed successfully.");
break;
- case 'subscribe-doesnotexist':
- $td_str .= _("Subscription Unsuccessful - Folder does not exist.");
+ default:
+// TODO: this is a new hook for plugin action processing that has not been TESTED.
+ $td_str = do_hook('folder_action', $action);
break;
}
- $td_str .= '
';
-
-
- echo html_tag( 'table',
- html_tag( 'tr',
- html_tag( 'td', $td_str .
- '' .
- _("refresh folder list") . '' ,
- 'center' )
- ) ,
- 'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
}
-echo "\n
";
+if (isset($td_str)) {
+ $oTemplate->assign('note', sm_encode_html_special_chars($td_str));
+ $oTemplate->display('note.tpl');
+}
-$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
$boxes = sqimap_mailbox_list($imapConnection,true);
/** CREATING FOLDERS **/
-echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) .
- html_tag( 'tr',
- html_tag( 'td', '' . _("Create Folder") . '', 'center', $color[9] )
- ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'center', $color[0] ) .
- addForm('folders_create.php', 'POST', 'cf').
- addInput('folder_name', '', 25).
- "
\n". _("as a subfolder of"). '
'.
- "\n";
-if ($show_contain_subfolders_option) {
- echo '
'.
- addCheckBox('contain_subs', FALSE, '1') .' '
- . _("Let this folder contain subfolders")
- . '
';
-}
-echo "\n";
-echo "\n";
+$mbx_option_list .= sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors', true);
-echo html_tag( 'tr',
- html_tag( 'td', ' ', 'left', $color[4] )
- ) ."\n";
/** count special folders **/
-
-// FIX ME, why not check if the folders are defined IMHO move_to_sent, move_to_trash has nothing todo with it
-$count_special_folders = 0;
-$num_max = 1;
-if (strtolower($imap_server_type) == "courier" || $move_to_trash) {
- $num_max++;
-}
-if ($move_to_sent) {
- $num_max++;
-}
-if ($save_as_draft) {
- $num_max++;
+foreach ($boxes as $index => $aBoxData) {
+ if (isSpecialMailbox($aBoxData['unformatted'],false) &&
+ ! in_array($aBoxData['unformatted'],$skip_folders)) {
+ $skip_folders[] = $aBoxData['unformatted'];
+ }
}
-// What if move_to_sent = false and $sent_folder is set? Should it still be skipped?
+/**
+ * Retrieve list of folders when special folders are excluded. Special folders
+ * should be unavailable in rename/delete/unsubscribe. Theoretically user can
+ * modify form and perform these operations with special folders, but if user
+ * manages to delete/rename/unsubscribe special folder by hacking form...
+ *
+ * If script or program depends on special folder, they should not assume that
+ * folder is available.
+ *
+ * $filtered_folders contains empty string or html formated option list.
+ */
+$rendel_folder_list = sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
-for ($p = 0, $cnt = count($boxes); $p < $cnt && $count_special_folders < $num_max; $p++) {
- switch ($boxes[$p]['unformatted']) {
- case (strtoupper($boxes[$p]['unformatted']) == 'INBOX'):
- ++$count_special_folders;
- $skip_folders[] = $boxes[$p]['unformatted'];
- break;
- // FIX ME inbox.trash should be set in conf.pl
- case 'inbox.trash':
- if (strtolower($imap_server_type) == 'courier') {
- ++$count_special_folders;
- }
- break;
- case $trash_folder:
- ++$count_special_folders;
- $skip_folders[] = $trash_folder;
- break;
- case $sent_folder:
- ++$count_special_folders;
- $skip_folders[] = $sent_folder;
- break;
- case $draft_folder:
- ++$count_special_folders;
- $skip_folders[] = $draft_folder;
- break;
- default: break;
- }
-}
+$subbox_option_list = array();
-/** RENAMING FOLDERS **/
-echo html_tag( 'tr',
- html_tag( 'td', '' . _("Rename a Folder") . '', 'center', $color[9] )
- ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'center', $color[0] );
-
-if ($count_special_folders < count($boxes)) {
- echo addForm('folders_rename_getname.php')
- . "\n".
- '\n".
- "\n";
-} else {
- echo _("No folders found") . '
';
-}
-$boxes_sub = $boxes;
-
-echo html_tag( 'tr',
- html_tag( 'td', ' ', 'left', $color[4] )
- ) ."\n";
-
-/** DELETING FOLDERS **/
-echo html_tag( 'tr',
- html_tag( 'td', '' . _("Delete Folder") . '', 'center', $color[9] )
- ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'center', $color[0] );
-
-if ($count_special_folders < count($boxes)) {
- echo addForm('folders_delete.php')
- . "\n"
- . '\n"
- . "\n";
-} else {
- echo _("No folders found") . "
";
-}
+if ($show_only_subscribed_folders && !$no_list_for_subscribe) {
+ // FIXME: fix subscription options when top folder is not subscribed and sub folder is subscribed
-echo html_tag( 'tr',
- html_tag( 'td', ' ', 'left', $color[4] )
- ) ."\n";
-
-
-/** UNSUBSCRIBE FOLDERS **/
-echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) .
- html_tag( 'tr',
- html_tag( 'td', '' . _("Unsubscribe") . '/' . _("Subscribe") . '', 'center', $color[9], 'colspan="2"' )
- ) .
- html_tag( 'tr' ) .
- html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
-
-if ($count_special_folders < count($boxes)) {
- echo addForm('folders_subscribe.php?method=unsub')
- . "
\n"
- . '\n"
- . "\n";
-} else {
- echo _("No folders were found to unsubscribe from!") . '';
-}
-$boxes_sub = $boxes;
-
-/** SUBSCRIBE TO FOLDERS **/
-echo html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
-if(!$no_list_for_subscribe) {
- $boxes_all = sqimap_mailbox_list_all ($imapConnection);
-
- $box = '';
- $box2 = '';
- for ($i = 0, $q = 0; $i < count($boxes_all); $i++) {
- $use_folder = true;
- for ($p = 0; $p < count ($boxes); $p++) {
- if ($boxes_all[$i]['unformatted'] == $boxes[$p]['unformatted']) {
- $use_folder = false;
- continue;
- } else if ($boxes_all[$i]['unformatted-dm'] == $folder_prefix) {
- $use_folder = false;
- }
- }
- if ($use_folder == true) {
- $box[$q] = htmlspecialchars($boxes_all[$i]['unformatted-dm']);
- $box2[$q] = htmlspecialchars(imap_utf7_decode_local($boxes_all[$i]['unformatted-disp']));
- $q++;
+ // TODO: use checkboxes instead of select options.
+ // DONE Steve Brown 2006-08-08
+
+ /** SUBSCRIBE TO FOLDERS **/
+ $boxes_all = sqimap_mailbox_list_all ($imapConnection);
+
+ // here we filter out all boxes we're already subscribed to,
+ // so we keep only the unsubscribed ones.
+ foreach ($boxes_all as $box_a) {
+
+ $use_folder = true;
+ foreach ( $boxes as $box ) {
+ if ($box_a['unformatted'] == $box['unformatted'] ||
+ $box_a['unformatted-dm'] == $folder_prefix ) {
+ $use_folder = false;
+ }
+ }
+
+ if ($use_folder) {
+ $box_enc = sm_encode_html_special_chars($box_a['unformatted-dm']);
+ $box_disp = sm_encode_html_special_chars(imap_utf7_decode_local($box_a['unformatted-disp']));
+ $subbox_option_list[] = array( 'Value' => $box_enc, 'Display' => $box_disp);
+ }
}
- }
- if ($box && $box2) {
- echo addForm('folders_subscribe.php?method=sub')
- . '
'
- . '\n"
- . "
\n";
- } else {
- echo _("No folders were found to subscribe to!") . '';
- }
-} else {
- /* don't perform the list action -- this is much faster */
- echo addForm('folders_subscribe.php?method=sub')
- . _("Subscribe to:") . '
'
- . ''
- . '\n"
- . "
\n";
}
-do_hook('folders_bottom');
-?>
-
-
-
-
-
-