From a22cb65adbde7e7b101d2c950b617eaec6f5c790 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 07 Oct 2008 12:54:07 -0400
Subject: [PATCH] - Write username instead of id in sendmail log (#1485477)

---
 bin/msgexport.sh |   87 ++++++++++++++++++++++++++++---------------
 1 files changed, 56 insertions(+), 31 deletions(-)

diff --git a/bin/msgexport.sh b/bin/msgexport.sh
index 890d48a..b15da1f 100755
--- a/bin/msgexport.sh
+++ b/bin/msgexport.sh
@@ -1,7 +1,7 @@
-#!/usr/bin/php -qC 
+#!/usr/bin/php
 <?php
 
-define('INSTALL_PATH', preg_replace('/bin\/$/', '', getcwd()) . '/');
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
 ini_set('memory_limit', -1);
 
 require_once INSTALL_PATH.'program/include/iniset.php';
@@ -43,8 +43,8 @@
 	print "Usage:  msgexport -h imap-host -u user-name -m mailbox name\n";
 	print "--host   IMAP host\n";
 	print "--user   IMAP user name\n";
-	print "--mbox   Mailbox/folder name\n";
-	print "--file   Mailbox/folder name\n";
+	print "--mbox   Folder name, set to '*' for all\n";
+	print "--file   Output file\n";
 }
 
 function vputs($str)
@@ -57,6 +57,45 @@
 {
 	$percent = round(100 * $pos / $max);
 	vputs(sprintf("%3d%% [%-51s] %d/%d\033[K\r", $percent, @str_repeat('=', $percent / 2) . '>', $pos, $max));
+}
+
+function export_mailbox($mbox, $filename)
+{
+	global $IMAP;
+	
+	$IMAP->set_mailbox($mbox);
+	
+	vputs("Getting message list of {$mbox}...");
+	vputs($IMAP->messagecount()." messages\n");
+	
+	if ($filename)
+	{
+		if (!($out = fopen($filename, 'w')))
+		{
+			vputs("Cannot write to output file\n");
+			return;
+		}
+		vputs("Writing to $filename\n");
+	}
+	else
+		$out = STDOUT;
+	
+	for ($count = $IMAP->messagecount(), $i=1; $i <= $count; $i++)
+	{
+		$headers = $IMAP->get_headers($i, null, false);
+		$from = current($IMAP->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));
+		fwrite($out, "\n\n\n");
+		
+		progress_update($i, $count);
+	}
+	vputs("\ncomplete.\n");
+	
+	if ($filename)
+		fclose($out);
 }
 
 
@@ -109,35 +148,21 @@
 {
 	vputs("IMAP login successful.\n");
 	
-	$IMAP->set_mailbox($args['mbox']);
-	
-	vputs("Getting message list of {$args['mbox']}...");
-	vputs($IMAP->messagecount()." messages\n");
-	
-	if ($args['file'])
+	$filename = null;
+	$mailboxes = $args['mbox'] == '*' ? $IMAP->list_mailboxes(null) : array($args['mbox']);
+
+	foreach ($mailboxes as $mbox)
 	{
-		if (!($out = fopen($args['file'], 'w')))
-		{
-			vputs("Cannot write to output file\n");
-			exit;
-		}
+		if ($args['file'])
+			$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;
+
+		export_mailbox($mbox, $filename);
 	}
-	else
-		$out = STDOUT;
-	
-	for ($count = $IMAP->messagecount(), $i=1; $i <= $count; $i++)
-	{
-		$headers = $IMAP->get_headers($i, null, false);
-		$from = current($IMAP->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));
-		fwrite($out, "\n\n\n");
-		
-		progress_update($i, $count);
-	}
-	vputs("\ncomplete.\n");
 }
 else
 {

--
Gitblit v1.9.1