X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders.php;h=f34dc044639945a95e0ffdb98a2a0d910c200e98;hp=d99e96bef891ea570f630b88e58550e8be1b0a83;hb=32aa007421fc0e1b8620d091a804d61d15c74ba6;hpb=12ff1cab14f01a1918c7d3d40e6358c13c3833a7
diff --git a/src/folders.php b/src/folders.php
index d99e96be..f34dc044 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -3,42 +3,45 @@
/**
* folders.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 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$
+ * @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_utf7_decode_local.php');
require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'functions/array.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');
displayPageHeader($color, 'None');
/* get globals we may need */
-$username = $_SESSION['username'];
-$key = $_COOKIE['key'];
-$delimiter = $_SESSION['delimiter'];
-$onetimepad = $_SESSION['onetimepad'];
-if (isset($_GET['success'])) {
- $success = $_GET['success'];
-}
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+
+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") . '' .
@@ -46,37 +49,71 @@ echo '
' .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[4] );
-if ((isset($success) && $success) ||
- (isset($sent_create) && $sent_create == 'true') ||
- (isset($trash_create) && $trash_create == 'true')) {
- if ($success == "subscribe") {
- $td_str = "" . _("Subscribed successfully!") . "
";
- } else if ($success == "unsubscribe") {
- $td_str = "" . _("Unsubscribed successfully!") . "
";
- } else if ($success == "delete") {
- $td_str = "" . _("Deleted folder successfully!") . "
";
- } else if ($success == "create") {
- $td_str = "" . _("Created folder successfully!") . "
";
- } else if ($success == "rename") {
- $td_str = "" . _("Renamed successfully!") . "
";
- } else if ($success == "subscribe-doesnotexist") {
- $td_str = "" .
- _("Subscription Unsuccessful - Folder does not exist.") .
- "
";
- }
+$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
+
+/* switch to the right function based on what the user selected */
+if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) {
+
+ switch ($action)
+ {
+ 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 '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':
+ 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 'subscribe':
+ sqgetGlobalVar('folder_names', $folder_names, SQ_POST);
+ folders_subscribe($imapConnection, $folder_names);
+ $td_str = _("Subscribed successfully.");
+ break;
+ case 'unsubscribe':
+ sqgetGlobalVar('folder_names', $folder_names, SQ_POST);
+ folders_unsubscribe($imapConnection, $folder_names);
+ $td_str = _("Unsubscribed successfully.");
+ break;
+ }
echo html_tag( 'table',
html_tag( 'tr',
- html_tag( 'td', $td_str .
- "" . _("refresh folder list") . "" ,
+ html_tag( 'td', '' . $td_str . "
\n" .
+ '' .
+ _("refresh folder list") . '' ,
'center' )
) ,
- 'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' ) . "
\n";
-} else {
- echo "
";
+ 'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
}
-$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
-$boxes = sqimap_mailbox_list($imapConnection);
+
+echo "\n
";
+
+$boxes = sqimap_mailbox_list($imapConnection,true);
/** CREATING FOLDERS **/
echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) .
@@ -85,74 +122,92 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] ) .
+ 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 _("Let this folder contain subfolders");
- 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++;
+ $num_max++;
}
if ($move_to_sent) {
- $num_max++;
+ $num_max++;
}
if ($save_as_draft) {
- $num_max++;
+ $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++) {
- if (strtolower($boxes[$p]['unformatted']) == 'inbox')
- $count_special_folders++;
- else if (strtolower($imap_server_type) == 'courier' &&
- strtolower($boxes[$p]['unformatted']) == 'inbox.trash')
- $count_special_folders++;
- else if ($boxes[$p]['unformatted'] == $trash_folder && $trash_folder)
- $count_special_folders++;
- else if ($boxes[$p]['unformatted'] == $sent_folder && $sent_folder)
- $count_special_folders++;
- else if ($boxes[$p]['unformatted'] == $draft_folder && $draft_folder)
- $count_special_folders++;
+ 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;
+ }
}
@@ -163,35 +218,27 @@ echo html_tag( 'tr',
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] );
+/* show only if we have folders to rename */
if ($count_special_folders < count($boxes)) {
- echo "