From 9787ca6063cb6da225532f9a4e99e89c9c805155 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Sep 2008 15:52:52 -0400
Subject: [PATCH] Don't ask for password if passed as argument
---
bin/msgimport.sh | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/bin/msgimport.sh b/bin/msgimport.sh
index a3ae4c3..9bd97c6 100755
--- a/bin/msgimport.sh
+++ b/bin/msgimport.sh
@@ -77,11 +77,14 @@
}
// prompt for password
-echo "Password: ";
-$args['pass'] = trim(fgets(STDIN));
+if (empty($args['pass']))
+{
+ echo "Password: ";
+ $args['pass'] = trim(fgets(STDIN));
-// clear password input
-echo chr(8)."\rPassword: ".str_repeat("*", strlen($args['pass']))."\n";
+ // clear password input
+ echo chr(8)."\rPassword: ".str_repeat("*", strlen($args['pass']))."\n";
+}
// parse $host URL
$a_host = parse_url($args['host']);
@@ -119,7 +122,7 @@
if ($IMAP->save_message($args['mbox'], rtrim($message)))
$count++;
else
- die("Failed to save message to $mailbox\n");
+ die("Failed to save message to {$args['mbox']}\n");
$message = '';
}
continue;
@@ -134,7 +137,7 @@
// upload message from file
if ($count)
- print "$count messages successfully added to $mailbox.\n";
+ print "$count messages successfully added to {$args['mbox']}.\n";
else
print "Adding messages failed!\n";
}
--
Gitblit v1.9.1