X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffolders.php;h=cc1fc279b90176b81929929231230dcff095284c;hb=0d8a462c52d74cd93af7376ae5bbc994f4699054;hp=1d7e29dd6e8887e768b4f3f869a3f42713e38fba;hpb=82d304a0501324b276cabab1870755d5352bd21c;p=squirrelmail.git
diff --git a/src/folders.php b/src/folders.php
index 1d7e29dd..cc1fc279 100644
--- a/src/folders.php
+++ b/src/folders.php
@@ -10,11 +10,14 @@
* 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. */
@@ -22,6 +25,7 @@ require_once(SM_PATH . 'include/validate.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');
@@ -36,7 +40,7 @@ sqgetGlobalVar('success', $success, SQ_GET);
/* 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") . '' .
@@ -70,23 +74,23 @@ if ( isset($success) && $success ) {
break;
}
- $td_str .= '
';
+ $td_str .= '
';
echo html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', $td_str .
- '' .
+ '' .
_("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"' ) .
@@ -95,12 +99,10 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] ) .
-
- "
\n";
+echo "\n";
+echo "\n";
echo html_tag( 'tr',
html_tag( 'td', ' ', 'left', $color[4] )
@@ -156,32 +159,31 @@ if ($save_as_draft) {
// 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;
- }
+ 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;
+ }
}
@@ -193,9 +195,9 @@ echo html_tag( 'tr',
html_tag( 'td', '', 'center', $color[0] );
if ($count_special_folders < count($boxes)) {
- echo "\n";
+ "\" />\n".
+ "\n";
} else {
- echo _("No folders found") . '
';
+ echo _("No folders found") . '
';
}
$boxes_sub = $boxes;
@@ -225,21 +227,21 @@ echo html_tag( 'tr',
html_tag( 'td', '', 'center', $color[0] );
if ($count_special_folders < count($boxes)) {
- echo "\n";
} else {
- echo _("No folders found") . "
";
+ echo _("No folders found") . "
";
}
echo html_tag( 'tr',
@@ -256,8 +258,8 @@ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspaci
html_tag( 'td', '', 'center', $color[0], 'width="50%"' );
if ($count_special_folders < count($boxes)) {
- echo "\n";
+ . "\" />\n"
+ . "\n";
} else {
echo _("No folders were found to unsubscribe from!") . '';
}
@@ -304,38 +306,34 @@ if(!$no_list_for_subscribe) {
}
}
if ($box && $box2) {
- 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 "
\n";
+ echo addForm('folders_subscribe.php?method=sub')
+ . _("Subscribe to:") . '
'
+ . ''
+ . '\n"
+ . "
\n";
}
do_hook('folders_bottom');
?>
-
-
-
-