diff options
author | thomascube <thomas@roundcube.net> | 2010-09-29 08:30:56 +0000 |
---|---|---|
committer | thomascube <thomas@roundcube.net> | 2010-09-29 08:30:56 +0000 |
commit | bd911ba8143f07fa4f14b682ddcd559a69a208e8 (patch) | |
tree | 26f5584eee7ca9be933cfafd0ff2e99599519b3a /bin | |
parent | 9d2a3a819a588f0fad2aaac0b330bafe594954ec (diff) |
Pool some code for command line tools; avoid displaying password on shell (#1486947); fix msgexport now using the new imap wrapper
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/msgexport.sh | 44 | ||||
-rwxr-xr-x | bin/msgimport.sh | 43 |
2 files changed, 6 insertions, 81 deletions
diff --git a/bin/msgexport.sh b/bin/msgexport.sh index 005e2cadf..0aa33b5a8 100755 --- a/bin/msgexport.sh +++ b/bin/msgexport.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() { @@ -89,8 +54,8 @@ function export_mailbox($mbox, $filename) $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, $mbox, $i, null)); - fwrite($out, iil_C_HandlePartBody($IMAP->conn, $mbox, $i, null, 1)); + fwrite($out, $IMAP->conn->fetchPartHeader($mbox, $i)); + fwrite($out, $IMAP->conn->handlePartBody($mbox, $i)); fwrite($out, "\n\n\n"); progress_update($i, $count); @@ -125,8 +90,7 @@ if (empty($args['user'])) } // prompt for password -vputs("Password: "); -$args['pass'] = trim(fgets(STDIN)); +$args['pass'] = prompt_silent("Password: "); // parse $host URL diff --git a/bin/msgimport.sh b/bin/msgimport.sh index a5161e026..74dc81617 100755 --- 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 |