X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders.php;h=3ca3e869494597d70c31bba66b59601ca2d51ed3;hb=8f8188aeea5a72fac2005c5527edde67697ee2c4;hp=a6c8f63900ca53e74769938c52b488ebbca37910;hpb=b7f83b61539e8952b9b337f167870aa99eb772f8;p=squirrelmail.git
diff --git a/src/folders.php b/src/folders.php
index a6c8f639..3ca3e869 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -3,42 +3,40 @@
/**
* folders.php
*
- * Copyright (c) 1999-2002 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-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$
+ * @package squirrelmail
*/
-/* Path for SquirrelMail required files. */
-define('SM_PATH','../');
+/**
+ * Include the SquirrelMail initialization file.
+ */
+require('../include/init.php');
/* 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/plugin.php');
-require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/imap_general.php');
+require_once(SM_PATH . 'functions/folder_manip.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,49 +44,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"' ) .
@@ -97,76 +124,85 @@ 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 '
'.
+ 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 **/
-$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++;
-}
-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++;
+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',
@@ -175,35 +211,27 @@ echo html_tag( 'tr',
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] );
-if ($count_special_folders < count($boxes)) {
- echo "