From b1057a2781fc977846760572ee48997c05ce8cd0 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 05 Jul 2011 06:08:52 -0400
Subject: [PATCH] - Remove debug code
---
bin/msgimport.sh | 55 +++++++++++--------------------------------------------
1 files changed, 11 insertions(+), 44 deletions(-)
diff --git a/bin/msgimport.sh b/bin/msgimport.sh
index a3ae4c3..845c585 100755
--- a/bin/msgimport.sh
+++ b/bin/msgimport.sh
@@ -1,42 +1,10 @@
-#!/usr/bin/php
+#!/usr/bin/env php
<?php
-define('INSTALL_PATH', preg_replace('/bin\/$/', '', getcwd()) . '/');
+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()
{
@@ -77,11 +45,10 @@
}
// prompt for password
-echo "Password: ";
-$args['pass'] = trim(fgets(STDIN));
-
-// clear password input
-echo chr(8)."\rPassword: ".str_repeat("*", strlen($args['pass']))."\n";
+if (empty($args['pass']))
+{
+ $args['pass'] = prompt_silent("Password: ");
+}
// parse $host URL
$a_host = parse_url($args['host']);
@@ -112,14 +79,14 @@
$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))
{
if ($IMAP->save_message($args['mbox'], rtrim($message)))
$count++;
else
- die("Failed to save message to $mailbox\n");
+ die("Failed to save message to {$args['mbox']}\n");
$message = '';
}
continue;
@@ -134,7 +101,7 @@
// upload message from file
if ($count)
- print "$count messages successfully added to $mailbox.\n";
+ print "$count messages successfully added to {$args['mbox']}.\n";
else
print "Adding messages failed!\n";
}
@@ -143,4 +110,4 @@
print "IMAP login failed.\n";
}
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1