From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names

---
 bin/msgexport.sh |   85 ++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 57 deletions(-)

diff --git a/bin/msgexport.sh b/bin/msgexport.sh
index b15da1f..f76aefe 100755
--- a/bin/msgexport.sh
+++ b/bin/msgexport.sh
@@ -1,42 +1,10 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
-define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
+define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
 ini_set('memory_limit', -1);
 
-require_once INSTALL_PATH.'program/include/iniset.php';
-
-/**
- * Parse commandline arguments into a hash array
- */
-function get_opt($aliases=array())
-{
-	$args = array();
-	for ($i=1; $i<count($_SERVER['argv']); $i++)
-	{
-		$arg = $_SERVER['argv'][$i];
-		if (substr($arg, 0, 2) == '--')
-		{
-			$sp = strpos($arg, '=');
-			$key = substr($arg, 2, $sp - 2);
-			$value = substr($arg, $sp+1);
-		}
-		else if ($arg{0} == '-')
-		{
-			$key = substr($arg, 1);
-			$value = $_SERVER['argv'][++$i];
-		}
-		else
-			continue;
-
-		$args[$key] = preg_replace(array('/^["\']/', '/["\']$/'), '', $value);
-		
-		if ($alias = $aliases[$key])
-			$args[$alias] = $args[$key];
-	}
-
-	return $args;
-}
+require_once INSTALL_PATH.'program/include/clisetup.php';
 
 function print_usage()
 {
@@ -62,12 +30,16 @@
 function export_mailbox($mbox, $filename)
 {
 	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)
 	{
 		if (!($out = fopen($filename, 'w')))
@@ -79,28 +51,28 @@
 	}
 	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);
-		$from = current($IMAP->decode_address_list($headers->from, 1, 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, iil_C_FetchPartHeader($IMAP->conn, $IMAP->mailbox, $i, null));
-		fwrite($out, iil_C_HandlePartBody($IMAP->conn, $IMAP->mailbox, $i, null, 1));
+		$IMAP->get_raw_body($headers->uid, $out);
 		fwrite($out, "\n\n\n");
-		
-		progress_update($i, $count);
+
+		progress_update($i+1, $count);
 	}
 	vputs("\ncomplete.\n");
-	
+
 	if ($filename)
 		fclose($out);
 }
 
 
 // get arguments
-$args = get_opt(array('h' => 'host', 'u' => 'user', 'p' => 'pass', 'm' => 'mbox', 'f' => 'file')) + array('host' => 'localhost', 'mbox' => 'INBOX');
+$opts = array('h' => 'host', 'u' => 'user', 'p' => 'pass', 'm' => 'mbox', 'f' => 'file');
+$args = rcube_utils::get_opt($opts) + array('host' => 'localhost', 'mbox' => 'INBOX');
 
 if ($_SERVER['argv'][1] == 'help')
 {
@@ -122,8 +94,7 @@
 }
 
 // prompt for password
-vputs("Password: ");
-$args['pass'] = trim(fgets(STDIN));
+$args['pass'] = rcube_utils::prompt_silent("Password: ");
 
 
 // parse $host URL
@@ -147,9 +118,9 @@
 if ($IMAP->connect($host, $args['user'], $args['pass'], $imap_port, $imap_ssl))
 {
 	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)
 	{
@@ -157,7 +128,7 @@
 			$filename = preg_replace('/\.[a-z0-9]{3,4}$/i', '', $args['file']) . asciiwords($mbox) . '.mbox';
 		else if ($args['mbox'] == '*')
 			$filename = asciiwords($mbox) . '.mbox';
-			
+
 		if ($args['mbox'] == '*' && in_array(strtolower($mbox), array('junk','spam','trash')))
 			continue;
 
@@ -169,4 +140,4 @@
 	vputs("IMAP login failed.\n");
 }
 
-?>
\ No newline at end of file
+?>

--
Gitblit v1.9.1