From 1495ac7913095ae8284c3501b7d4e6dd31a484ec Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 14 Apr 2012 07:15:28 -0400
Subject: [PATCH] - More public methods, code cleanup
---
bin/msgexport.sh | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/bin/msgexport.sh b/bin/msgexport.sh
index 5f90619..e6c1801 100755
--- a/bin/msgexport.sh
+++ b/bin/msgexport.sh
@@ -31,10 +31,14 @@
{
global $IMAP;
- $IMAP->set_mailbox($mbox);
+ $IMAP->set_folder($mbox);
+
+ $index = $IMAP->index($mbox, null, 'ASC');
+ $count = $index->count();
+ $index = $index->get();
vputs("Getting message list of {$mbox}...");
- vputs($IMAP->messagecount()." messages\n");
+ vputs("$count messages\n");
if ($filename)
{
@@ -48,17 +52,16 @@
else
$out = STDOUT;
- for ($count = $IMAP->messagecount(), $i=1; $i <= $count; $i++)
+ for ($i = 0; $i < $count; $i++)
{
- $headers = $IMAP->get_headers($i, null, false);
+ $headers = $IMAP->get_message_headers($index[$i]);
$from = current(rcube_mime::decode_address_list($headers->from, 1, false));
fwrite($out, sprintf("From %s %s UID %d\n", $from['mailto'], $headers->date, $headers->uid));
- fwrite($out, $IMAP->conn->fetchPartHeader($mbox, $i));
- fwrite($out, $IMAP->conn->handlePartBody($mbox, $i));
+ fwrite($out, $IMAP->print_raw_body($headers->uid));
fwrite($out, "\n\n\n");
- progress_update($i, $count);
+ progress_update($i+1, $count);
}
vputs("\ncomplete.\n");
@@ -116,7 +119,7 @@
vputs("IMAP login successful.\n");
$filename = null;
- $mailboxes = $args['mbox'] == '*' ? $IMAP->list_mailboxes(null) : array($args['mbox']);
+ $mailboxes = $args['mbox'] == '*' ? $IMAP->list_folders(null) : array($args['mbox']);
foreach ($mailboxes as $mbox)
{
--
Gitblit v1.9.1