X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=e3cc6127e6d20933348decd26d075b39a558a918;hb=e0c5664a5a25640de64801874df7ef6517d36a8d;hp=9ac8316ef5543d2a5adafa0bef7987ffda1439e1;hpb=c435f076fe6b5b58e09ae19a8e216f37b069d802;p=squirrelmail.git
diff --git a/src/folders.php b/src/folders.php
index 9ac8316e..e3cc6127 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -3,7 +3,7 @@
/**
* folders.php
*
- * Copyright (c) 1999-2004 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
@@ -23,6 +23,7 @@ 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');
@@ -36,7 +37,7 @@ 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 */
@@ -48,48 +49,73 @@ 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!");
- break;
- case 'create':
- $td_str .= _("Created 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 'rename':
- $td_str .= _("Renamed successfully!");
+ case 'subscribe':
+ sqgetGlobalVar('folder_names', $folder_names, SQ_POST);
+ folders_subscribe($imapConnection, $folder_names);
+ $td_str = _("Subscribed successfully.");
break;
- case 'subscribe-doesnotexist':
- $td_str .= _("Subscription Unsuccessful - Folder does not exist.");
+ case 'unsubscribe':
+ sqgetGlobalVar('folder_names', $folder_names, SQ_POST);
+ folders_unsubscribe($imapConnection, $folder_names);
+ $td_str = _("Unsubscribed successfully.");
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
";
-$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
$boxes = sqimap_mailbox_list($imapConnection,true);
/** CREATING FOLDERS **/
@@ -99,7 +125,8 @@ 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"). '
'.
"