X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=680ca1e0a0a00863561446375534c23b2fe80817;hb=f965aa907a1ead127c5225a524bf86a496294675;hp=dc708a34a777522ac46566966b08e7418216b712;hpb=623662614b34b6f05a5ba6330bc5a624c8e9b731;p=squirrelmail.git
diff --git a/src/folders.php b/src/folders.php
index dc708a34..680ca1e0 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -3,23 +3,26 @@
/**
* folders.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* Handles all interaction between the user and the other folder
* scripts which do most of the work. Also handles the Special
* Folders.
*
- * $Id$
+ * @copyright © 1999-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
* @package squirrelmail
*/
-/** Path for SquirrelMail required files. */
+/**
+ * Path for SquirrelMail required files.
+ * @ignore
+ */
define('SM_PATH','../');
/* SquirrelMail required files. */
require_once(SM_PATH . 'include/validate.php');
require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/folder_manip.php');
require_once(SM_PATH . 'functions/plugin.php');
require_once(SM_PATH . 'functions/html.php');
require_once(SM_PATH . 'functions/forms.php');
@@ -33,11 +36,11 @@ sqgetGlobalVar('key', $key, SQ_COOKIE);
sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
-sqgetGlobalVar('success', $success, SQ_GET);
+sqgetGlobalVar('smaction', $action, SQ_POST);
/* end of get globals */
-echo '
' .
+echo '
' .
html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center' ) . '' . _("Folders") . '' .
@@ -45,49 +48,78 @@ echo '
' .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[4] );
-if ( isset($success) && $success ) {
+$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
- $td_str = '';
+/* switch to the right function based on what the user selected */
+if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) {
- switch ($success)
+ switch ($action)
{
- case 'subscribe':
- $td_str .= _("Subscribed successfully!");
+ case 'create':
+ 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 {
+ 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) ) {
+ 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':
+ 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':
+ 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: add hook for plugin action processing.
+ $td_str = '';
break;
}
- $td_str .= '
';
-
-
- echo html_tag( 'table',
+ // if there are any messages, output them.
+ if ( !empty($td_str) ) {
+ echo html_tag( 'table',
html_tag( 'tr',
- html_tag( 'td', $td_str .
- '' .
+ html_tag( 'td', '' . $td_str . "
\n" .
+ '' .
_("refresh folder list") . '' ,
'center' )
) ,
'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
+ }
}
-echo "\n
";
+echo "\n
";
-$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
-$boxes = sqimap_mailbox_list($imapConnection);
+$boxes = sqimap_mailbox_list($imapConnection,true);
/** CREATING FOLDERS **/
echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) .
@@ -96,94 +128,85 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] ) .
- addForm('folders_create.php', 'POST', 'cf').
+ addForm('folders.php', 'post', 'cf').
+ addHidden('smaction','create').
addInput('folder_name', '', 25).
- "
\n". _("as a subfolder of"). '
'.
- "\n";
if ($show_contain_subfolders_option) {
- echo '
'.
+ echo '
'.
addCheckBox('contain_subs', FALSE, '1') .' '
. _("Let this folder contain subfolders")
- . '
';
+ . '
';
}
-echo "\n";
-echo "\n";
+echo "\n";
+echo "\n";
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++;
-}
-
-// What if move_to_sent = false and $sent_folder is set? Should it still be skipped?
-
-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;
- }
+foreach ($boxes as $index => $aBoxData) {
+ if (isSpecialMailbox($aBoxData['unformatted']) &&
+ ! in_array($aBoxData['unformatted'],$skip_folders)) {
+ $skip_folders[] = $aBoxData['unformatted'];
+ }
}
+/**
+ * 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.
+ */
+$filtered_folders = sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
/** RENAMING FOLDERS **/
echo html_tag( 'tr',
@@ -192,26 +215,27 @@ echo html_tag( 'tr',
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] );
-if ($count_special_folders < count($boxes)) {
- echo addForm('folders_rename_getname.php')
- . "\n"
- . ' \n";
+/* show only if we have folders to rename */
+if (! empty($filtered_folders)) {
+ echo addForm('folders.php')
+ . addHidden('smaction', 'rename')
+ . "\n"
+ . ' \n";
- // use existing IMAP connection, we have no special values to show,
+ // use existing IMAP connection, we have no special values to show,
// but we do include values to skip. Use the pre-created $boxes to save an IMAP query.
// send NULL for the flag - ALL folders are eligible for rename!
// use long format to make sure folder names make sense when parents may be missing.
- echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
+ echo $filtered_folders;
- echo "\n".
- "\n".
+ '\n".
- "\n";
+ "\" />\n".
+ "\n";
} else {
- echo _("No folders found") . '
';
+ echo _("No folders found") . '
';
}
-$boxes_sub = $boxes;
echo html_tag( 'tr',
html_tag( 'td', ' ', 'left', $color[4] )
@@ -224,22 +248,24 @@ echo html_tag( 'tr',
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] );
-if ($count_special_folders < count($boxes)) {
- echo addForm('folders_delete.php')
- . "\n"
- . ' \n";
+/* show only if we have folders to delete */
+if (!empty($filtered_folders)) {
+ echo addForm('folders.php')
+ . addHidden('smaction', 'delete')
+ . "\n"
+ . ' \n";
// send NULL for the flag - ALL folders are eligible for delete (except what we've got in skiplist)
// use long format to make sure folder names make sense when parents may be missing.
- echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true);
+ echo $filtered_folders;
- echo "\n"
- . '\n"
+ . '\n"
+ . "\" />\n"
. "\n";
} else {
- echo _("No folders found") . "
";
+ echo _("No folders found") . "
";
}
echo html_tag( 'tr',
@@ -247,95 +273,89 @@ echo html_tag( 'tr',
) ."\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";
- for ($i = 0; $i < count($boxes); $i++) {
- $use_folder = true;
- if ((strtolower($boxes[$i]["unformatted"]) != "inbox") &&
- ($boxes[$i]["unformatted"] != $trash_folder) &&
- ($boxes[$i]["unformatted"] != $sent_folder) &&
- ($boxes[$i]["unformatted"] != $draft_folder)) {
- $box = htmlspecialchars($boxes[$i]["unformatted-dm"]);
- $box2 = str_replace(' ', ' ',
- htmlspecialchars(imap_utf7_decode_local($boxes[$i]["unformatted-disp"])));
- echo "
\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;
+
+ /** SUBSCRIBE TO FOLDERS **/
+ echo html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
+ if(!$no_list_for_subscribe) {
+ $boxes_all = sqimap_mailbox_list_all ($imapConnection);
+
+ $subboxes = array();
+ // 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 == true) {
+ $box_enc = htmlspecialchars($box_a['unformatted-dm']);
+ $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp']));
+ $subboxes[$box_enc] = $box_disp;
+ }
+ }
+
+ if ( count($subboxes) > 0 ) {
+ echo addForm('folders.php')
+ . addHidden('smaction', 'subscribe')
+ . '';
+
+ foreach($subboxes as $subbox_enc => $subbox_disp) {
+ echo ' \n";
+ }
+
+ echo '
'
+ . '\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.php')
+ . addHidden('smaction', 'subscribe')
+ . _("Subscribe to:") . '
'
+ . ''
+ . '\n"
+ . "
\n";
}
- }
- 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++;
- }
- }
- if ($box && $box2) {
- echo addForm('folders_subscribe.php?method=sub')
- . '';
-
- for ($q = 0; $q < count($box); $q++) {
- echo "
'
- . '\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');
-?>
+sqimap_logout($imapConnection);
+?>
-
-
-
-
-