/**
* folders.php
*
- * Copyright (c) 1999-2002 The SquirrelMail Project Team
+ * 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$
+ * @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/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('success', $success, SQ_GET);
/* end of get globals */
-echo '<br>' .
+echo '<br />' .
html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center' ) . '<b>' . _("Folders") . '</b>' .
break;
}
- $td_str .= '</b><br>';
+ $td_str .= '</b><br />';
echo html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', $td_str .
- '<a href="../src/left_main.php" target=left>' .
+ '<a href="../src/left_main.php" target="left">' .
_("refresh folder list") . '</a>' ,
'center' )
) ,
'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' );
}
-echo "\n<br>";
+echo "\n<br />";
$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"' ) .
) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] ) .
-
- "<FORM NAME=cf ACTION=\"folders_create.php\" METHOD=\"POST\">\n".
- "<input type=TEXT SIZE=25 NAME=folder_name><BR>\n".
- _("as a subfolder of").
- '<BR>'.
- "<TT><SELECT NAME=subfolder>\n";
-if ($default_sub_of_inbox == false) {
- echo '<OPTION SELECTED VALUE="">[ '._("None")." ]\n";
-} else {
- echo '<OPTION VALUE="">[ '._("None")." ]\n";
+ addForm('folders_create.php', 'POST', 'cf').
+ addInput('folder_name', '', 25).
+ "<br />\n". _("as a subfolder of"). '<br />'.
+ "<tt><select name=\"subfolder\">\n";
+
+$show_selected = array();
+$skip_folders = array();
+$server_type = strtolower($imap_server_type);
+if ( $server_type == 'courier' ) {
+ array_push($skip_folders, 'inbox.trash');
+ if ( $default_folder_prefix == 'INBOX.' ) {
+ array_push($skip_folders, 'inbox');
+ }
}
-$show_selected = 0;
-if ( $default_sub_of_inbox ) {
+if ( $default_sub_of_inbox == false ) {
+ echo '<option selected="selected" value="">[ '._("None")." ]</option>\n";
+} else {
+ echo '<option value="">[ '._("None")." ]</option>\n";
$show_selected = array('inbox');
}
-$skip_folders = 0;
-if ( strtolower($imap_server_type) == 'courier' ) {
- $skip_folders = array('inbox.trash');
-}
-echo sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors');
+// Call sqimap_mailbox_option_list, using existing connection to IMAP server,
+// the arrays of folders to include or skip (assembled above),
+// use 'noinferiors' as a mailbox filter to leave out folders that can not contain other folders.
+// use the long format to show subfolders in an intelligible way if parent is missing (special folder)
+echo sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors', true);
-echo "</SELECT></TT>\n";
+echo "</select></tt>\n";
if ($show_contain_subfolders_option) {
- echo '<br><input type=CHECKBOX NAME="contain_subs"> '
+ echo '<br />'.
+ addCheckBox('contain_subs', FALSE, '1') .' '
. _("Let this folder contain subfolders")
- . '<BR>';
+ . '<br />';
}
-echo "<input type=SUBMIT VALUE=\""._("Create")."\">\n";
-echo "</FORM></td></tr>\n";
+echo "<input type=\"submit\" value=\""._("Create")."\" />\n";
+echo "</form></td></tr>\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;
+ }
}
html_tag( 'td', '', 'center', $color[0] );
if ($count_special_folders < count($boxes)) {
- echo "<FORM ACTION=\"folders_rename_getname.php\" METHOD=\"POST\">\n"
- . "<TT><SELECT NAME=old>\n"
- . ' <OPTION VALUE="">[ ' . _("Select a folder") . " ]</OPTION>\n";
-
- echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes);
-
- echo "</SELECT></TT>\n".
- "<input type=SUBMIT VALUE=\"".
+ echo addForm('folders_rename_getname.php')
+ . "<tt><select name=\"old\">\n"
+ . ' <option value="">[ ' . _("Select a folder") . " ]</option>\n";
+
+ // 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 "</select></tt>\n".
+ '<input type="submit" value="'.
_("Rename").
- "\">\n".
- "</FORM></td></tr>\n";
+ "\" />\n".
+ "</form></td></tr>\n";
} else {
- echo _("No folders found") . '<br><br></td></tr>';
+ echo _("No folders found") . '<br /><br /></td></tr>';
}
$boxes_sub = $boxes;
html_tag( 'td', '', 'center', $color[0] );
if ($count_special_folders < count($boxes)) {
- echo "<FORM ACTION=\"folders_delete.php\" METHOD=\"POST\">\n"
- . "<TT><SELECT NAME=mailbox>\n"
- . ' <OPTION VALUE="">[ ' . _("Select a folder") . " ]</OPTION>\n";
+ echo addForm('folders_delete.php')
+ . "<tt><select name=\"mailbox\">\n"
+ . ' <option value="">[ ' . _("Select a folder") . " ]</option>\n";
- echo sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes);
+ // 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 "</SELECT></TT>\n"
- . '<input type=SUBMIT VALUE="'
+ echo "</select></tt>\n"
+ . '<input type="submit" value="'
. _("Delete")
- . "\">\n"
+ . "\" />\n"
. "</form></td></tr>\n";
} else {
- echo _("No folders found") . "<br><br></td></tr>";
+ echo _("No folders found") . "<br /><br /></td></tr>";
}
echo html_tag( 'tr',
html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
if ($count_special_folders < count($boxes)) {
- echo "<FORM ACTION=\"folders_subscribe.php?method=unsub\" METHOD=\"POST\">\n"
- . "<TT><SELECT NAME=\"mailbox[]\" multiple size=8>\n";
+ echo addForm('folders_subscribe.php?method=unsub')
+ . "<tt><select name=\"mailbox[]\" multiple=\"multiple\" size=\"8\">\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 = $boxes[$i]["unformatted-dm"];
+ $box = htmlspecialchars($boxes[$i]["unformatted-dm"]);
$box2 = str_replace(' ', ' ',
- imap_utf7_decode_local($boxes[$i]["unformatted-disp"]));
- echo " <OPTION VALUE=\"$box\">$box2\n";
+ htmlspecialchars(imap_utf7_decode_local($boxes[$i]["unformatted-disp"])));
+ echo " <option value=\"$box\">$box2</option>\n";
}
}
- echo "</SELECT></TT><br><br>\n"
- . '<input type=SUBMIT VALUE="'
+ echo "</select></tt><br /><br />\n"
+ . '<input type="submit" value="'
. _("Unsubscribe")
- . "\">\n"
- . "</FORM></td>\n";
+ . "\" />\n"
+ . "</form></td>\n";
} else {
echo _("No folders were found to unsubscribe from!") . '</td>';
}
}
}
if ($use_folder == true) {
- $box[$q] = $boxes_all[$i]['unformatted-dm'];
- $box2[$q] = imap_utf7_decode_local($boxes_all[$i]['unformatted-disp']);
+ $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 "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n"
- . '<tt><select name="mailbox[]" multiple size=8>';
+ echo addForm('folders_subscribe.php?method=sub')
+ . '<tt><select name="mailbox[]" multiple="multiple" size="8">';
for ($q = 0; $q < count($box); $q++) {
- echo " <OPTION VALUE=\"$box[$q]\">".$box2[$q]."\n";
+ echo ' <option value="' . $box[$q] . '">'.$box2[$q]."</option>\n";
}
- echo '</select></tt><br><br>'
- . '<input type=SUBMIT VALUE="'. _("Subscribe") . "\">\n"
- . "</FORM></td></tr></table><BR>\n";
+ echo '</select></tt><br /><br />'
+ . '<input type="submit" value="'. _("Subscribe") . "\" />\n"
+ . "</form></td></tr></table><br />\n";
} else {
echo _("No folders were found to subscribe to!") . '</td></tr></table>';
}
} else {
/* don't perform the list action -- this is much faster */
- echo "<FORM ACTION=\"folders_subscribe.php?method=sub\" METHOD=\"POST\">\n"
- . _("Subscribe to:") . '<br>'
- . '<tt><input type="text" name="mailbox[]" size=35>'
- . '<INPUT TYPE=SUBMIT VALUE="'. _("Subscribe") . "\">\n"
- . "</FORM></TD></TR></TABLE><BR>\n";
+ echo addForm('folders_subscribe.php?method=sub')
+ . _("Subscribe to:") . '<br />'
+ . '<tt><input type="text" name="mailbox[]" size="35" />'
+ . '<input type="submit" value="'. _("Subscribe") . "\" />\n"
+ . "</form></td></tr></table><br />\n";
}
do_hook('folders_bottom');
?>
-
</td></tr>
</table>
-
</td></tr>
</table>
-
<?php
sqimap_logout($imapConnection);
?>
-
</body></html>
projects / squirrelmail.git / blobdiff