Index: /trunk/roundcubemail/bin/msgimport
===================================================================
--- /trunk/roundcubemail/bin/msgimport	(revision 519)
+++ /trunk/roundcubemail/bin/msgimport	(revision 520)
@@ -43,15 +43,25 @@
 
 
+function print_usage()
+{
+	print "Usage:  msgimport -h imap-host -u user-name -f message-file\n";
+	print "-host   IMAP host\n";
+	print "-user   IMAP user name\n";
+	print "-file   Message file to upload\n";
+}
+
+
 // get arguments
-$args = get_args(array('h' => 'host', 'u' => 'user', 'p' => 'pass', 'f' => 'file'));
+$args = get_args(array('h' => 'host', 'u' => 'user', 'p' => 'pass', 'f' => 'file')) + array('host' => 'localhost');
 
-if (!($args['host'] && $args['user'] && $args['pass'] && $args['file']))
+if ($_SERVER['argv'][1] == 'help')
+{
+	print_usage();
+	exit;
+}
+else if (!($args['host'] && $args['file']))
 {
 	print "Missing required parameters.\n";
-	print "Usage:  msgimport -h imap-host -u user-name -p password -f message-file\n";
-	print "-host   IMAP host\n";
-	print "-user   IMAP user name\n";
-	print "-pass   IMAP password\n";
-	print "-file   Message file to upload\n";
+	print_usage();
 	exit;
 }
@@ -59,7 +69,18 @@
 {
 	print "Cannot read message file\n";
-	exit;	
+	exit;
 }
 
+// prompt for username if not set
+if (empty($args['user']))
+{
+	//fwrite(STDOUT, "Please enter your name\n");
+	echo "IMAP user: ";
+	$args['user'] = trim(fgets(STDIN));
+}
+
+// prompt for password
+echo "Password: ";
+$args['pass'] = trim(fgets(STDIN));
 
 // parse $host URL