Imported Upstream version 0.5.4+dfsg

[roundcube.git] / bin / msgexport.sh

diff --git a/bin/msgexport.sh b/bin/msgexport.sh
index 7dd56e9ea6220e3f4d230e0c410e16507b3d35e1..0aa33b5a85482f7710bc3732f76e276fa73f804f 100755 (executable)
--- 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, $IMAP->mailbox, $i, null));
-               fwrite($out, iil_C_HandlePartBody($IMAP->conn, $IMAP->mailbox, $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