New upstream version.

[roundcube.git] / bin / msgimport.sh

diff --git a/bin/msgimport.sh b/bin/msgimport.sh
index a5161e026e69e3d3f22516a30c23892487a0cf9c..845c585e19a7a7f9cba667308eb2bbd3a48b9064 100755 (executable)
--- a/bin/msgimport.sh
+++ b/bin/msgimport.sh
@@ -1,45 +1,10 @@
 #!/usr/bin/env php
 <?php
-if (php_sapi_name() != 'cli') {
-    die('Not on the "shell" (php-cli).');
-}
 
 define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
 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()
 {
@@ -82,11 +47,7 @@ if (empty($args['user']))
 // prompt for password
 if (empty($args['pass']))
 {
-       echo "Password: ";
-       $args['pass'] = trim(fgets(STDIN));
-
-       // clear password input
-       echo chr(8)."\rPassword: ".str_repeat("*", strlen($args['pass']))."\n";
+       $args['pass'] = prompt_silent("Password: ");
 }
 
 // parse $host URL
@@ -118,7 +79,7 @@ if ($IMAP->connect($host, $args['user'], $args['pass'], $imap_port, $imap_ssl))
        $fp = fopen($args['file'], 'r');
        while (($line = fgets($fp)) !== false)
        {
-               if (preg_match('/^From\s+/', $line) && $lastline == '')
+               if (preg_match('/^From\s+-/', $line) && $lastline == '')
                {
                        if (!empty($message))
                        {