From 47124c2279382714afd8dbe4a867a867ea179199 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 12 Apr 2008 13:54:45 +0000
Subject: Changed codebase to PHP5 with autoloader + added some new classes
 from the devel-vnext branch

---
 bin/html2text.php |  18 ++------
 bin/modcss.php    |   6 +--
 bin/msgexport.sh  |   8 +---
 bin/msgimport     | 124 ------------------------------------------------------
 bin/msgimport.sh  | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 128 insertions(+), 148 deletions(-)
 delete mode 100755 bin/msgimport
 create mode 100755 bin/msgimport.sh

(limited to 'bin')

diff --git a/bin/html2text.php b/bin/html2text.php
index 7f74ac622..0f0e6ae14 100644
--- a/bin/html2text.php
+++ b/bin/html2text.php
@@ -1,21 +1,11 @@
 <?php
 
-require_once('../program/lib/html2text.inc');
+define('INSTALL_PATH', realpath('./../') . '/');
+require INSTALL_PATH.'program/include/iniset.php';
 
-$htmlText = $HTTP_RAW_POST_DATA;
-$converter = new html2text($htmlText);
+$converter = new html2text($HTTP_RAW_POST_DATA);
 
 header('Content-Type: text/plain; charset=UTF-8');
-$plaintext = $converter->get_text();
-
-$phpver = explode('.', phpversion());
-$vernum = $phpver[0] . $phpver[1] . $phpver[2];
-
-# html_entity_decode doesn't handle UTF character sets in PHP 4.x
-
-if (($vernum >= 500) && function_exists('html_entity_decode'))
-	print html_entity_decode($plaintext, ENT_COMPAT, 'UTF-8');
-else
-	print $plaintext;
+print html_entity_decode($converter->get_text(), ENT_COMPAT, 'UTF-8');
 
 ?>
diff --git a/bin/modcss.php b/bin/modcss.php
index e482389a8..e97b8ec9c 100644
--- a/bin/modcss.php
+++ b/bin/modcss.php
@@ -19,10 +19,8 @@
 
 */
 
-$INSTALL_PATH = realpath("./../") . "/";
-ini_set('include_path', $INSTALL_PATH.PATH_SEPARATOR.$INSTALL_PATH.'program'.PATH_SEPARATOR.ini_get('include_path'));
-
-require 'include/main.inc';
+define('INSTALL_PATH', realpath('./../') . '/');
+require INSTALL_PATH.'program/include/iniset.php';
 
 $source = "";
 if ($url = preg_replace('/[^a-z0-9.-_\?\$&=%]/i', '', $_GET['u']))
diff --git a/bin/msgexport.sh b/bin/msgexport.sh
index 616895561..890d48a06 100755
--- a/bin/msgexport.sh
+++ b/bin/msgexport.sh
@@ -1,14 +1,10 @@
 #!/usr/bin/php -qC 
 <?php
 
-$CWD = $INSTALL_PATH = preg_replace('/bin\/$/', '', getcwd() . '/');
-ini_set('include_path',  ini_get('include_path') . PATH_SEPARATOR . $CWD.'program/');
+define('INSTALL_PATH', preg_replace('/bin\/$/', '', getcwd()) . '/');
 ini_set('memory_limit', -1);
 
-require_once('include/rcube_shared.inc');
-require_once('include/rcube_imap.inc');
-require_once('include/main.inc');
-require_once('include/bugs.inc');
+require_once INSTALL_PATH.'program/include/iniset.php';
 
 /**
  * Parse commandline arguments into a hash array
diff --git a/bin/msgimport b/bin/msgimport
deleted file mode 100755
index fd5afae8b..000000000
--- a/bin/msgimport
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/php -qC 
-<?php
-
-$CWD = $INSTALL_PATH = preg_replace('/bin\/$/', '', getcwd() . '/');
-ini_set('include_path',  ini_get('include_path') . PATH_SEPARATOR . $CWD.'program/');
-ini_set('memory_limit', -1);
-
-require_once('include/rcube_shared.inc');
-require_once('include/rcube_imap.inc');
-require_once('include/main.inc');
-require_once('include/bugs.inc');
-
-/**
- * Parse commandline arguments into a hash array
- */
-function get_args($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;
-}
-
-
-function print_usage()
-{
-	print "Usage:  msgimport -h imap-host -u user-name -f message-file\n";
-	print "--host   IMAP host\n";
-	print "--user   IMAP user name\n";
-	print "--file   Message file to upload\n";
-}
-
-
-// get arguments
-$args = get_args(array('h' => 'host', 'u' => 'user', 'p' => 'pass', 'f' => 'file')) + array('host' => 'localhost');
-
-if ($_SERVER['argv'][1] == 'help')
-{
-	print_usage();
-	exit;
-}
-else if (!($args['host'] && $args['file']))
-{
-	print "Missing required parameters.\n";
-	print_usage();
-	exit;
-}
-else if (!is_file($args['file']))
-{
-	print "Cannot read message file\n";
-	exit;
-}
-
-// prompt for username if not set
-if (empty($args['user']))
-{
-	//fwrite(STDOUT, "Please enter your name\n");
-	echo "IMAP user: ";
-	$args['user'] = trim(fgets(STDIN));
-}
-
-// prompt for password
-echo "Password: ";
-$args['pass'] = trim(fgets(STDIN));
-
-// clear password input
-echo chr(8)."\rPassword: ".str_repeat("*", strlen($args['pass']))."\n";
-
-// parse $host URL
-$a_host = parse_url($args['host']);
-if ($a_host['host'])
-{
-	$host = $a_host['host'];
-	$imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
-	$imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : 143);
-}
-else
-{
-	$host = $args['host'];
-	$imap_port = 143;
-}
-
-// instantiate IMAP class
-$IMAP = new rcube_imap(null);
-
-// try to connect to IMAP server
-if ($IMAP->connect($host, $args['user'], $args['pass'], $imap_port, $imap_ssl))
-{
-	print "IMAP login successful.\n";
-	print "Uploading message...\n";
-	
-	// upload message from file
-	if  ($IMAP->save_message('INBOX', file_get_contents($args['file'])))
-		print "Message successfully added to INBOX.\n";
-	else
-		print "Adding message failed!\n";
-}
-else
-{
-	print "IMAP login failed.\n";
-}
-
-?>
\ No newline at end of file
diff --git a/bin/msgimport.sh b/bin/msgimport.sh
new file mode 100755
index 000000000..98a03891e
--- /dev/null
+++ b/bin/msgimport.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/php -qC 
+<?php
+
+define('INSTALL_PATH', preg_replace('/bin\/$/', '', getcwd()) . '/');
+ini_set('memory_limit', -1);
+
+require_once INSTALL_PATH.'program/include/iniset.php';
+
+/**
+ * Parse commandline arguments into a hash array
+ */
+function get_args($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;
+}
+
+
+function print_usage()
+{
+	print "Usage:  msgimport -h imap-host -u user-name -f message-file\n";
+	print "--host   IMAP host\n";
+	print "--user   IMAP user name\n";
+	print "--file   Message file to upload\n";
+}
+
+
+// get arguments
+$args = get_args(array('h' => 'host', 'u' => 'user', 'p' => 'pass', 'f' => 'file')) + array('host' => 'localhost');
+
+if ($_SERVER['argv'][1] == 'help')
+{
+	print_usage();
+	exit;
+}
+else if (!($args['host'] && $args['file']))
+{
+	print "Missing required parameters.\n";
+	print_usage();
+	exit;
+}
+else if (!is_file($args['file']))
+{
+	print "Cannot read message file\n";
+	exit;
+}
+
+// prompt for username if not set
+if (empty($args['user']))
+{
+	//fwrite(STDOUT, "Please enter your name\n");
+	echo "IMAP user: ";
+	$args['user'] = trim(fgets(STDIN));
+}
+
+// prompt for password
+echo "Password: ";
+$args['pass'] = trim(fgets(STDIN));
+
+// clear password input
+echo chr(8)."\rPassword: ".str_repeat("*", strlen($args['pass']))."\n";
+
+// parse $host URL
+$a_host = parse_url($args['host']);
+if ($a_host['host'])
+{
+	$host = $a_host['host'];
+	$imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
+	$imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : 143);
+}
+else
+{
+	$host = $args['host'];
+	$imap_port = 143;
+}
+
+// instantiate IMAP class
+$IMAP = new rcube_imap(null);
+
+// try to connect to IMAP server
+if ($IMAP->connect($host, $args['user'], $args['pass'], $imap_port, $imap_ssl))
+{
+	print "IMAP login successful.\n";
+	print "Uploading message...\n";
+	
+	// upload message from file
+	if  ($IMAP->save_message('INBOX', file_get_contents($args['file'])))
+		print "Message successfully added to INBOX.\n";
+	else
+		print "Adding message failed!\n";
+}
+else
+{
+	print "IMAP login failed.\n";
+}
+
+?>
\ No newline at end of file
-- 
cgit v1.2.3