Handle incorrect upgrade from 0.3.1-6 when "changed" column already

[roundcube.git] / bin / msgimport.sh

diff --git a/bin/msgimport.sh b/bin/msgimport.sh
index fa5678cec235802bde6be804467179f75ca0f1b6..74dc816173c3483a1ca7f9fba96672f481824804 100755 (executable)
--- a/bin/msgimport.sh
+++ b/bin/msgimport.sh
@@ -1,42 +1,10 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 
 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()
 {
@@ -79,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
@@ -146,4 +110,4 @@ else
        print "IMAP login failed.\n";
 }
 
-?>
\ No newline at end of file
+?>