Changed codebase to PHP5 with autoloader + added some new classes from the devel-vnext branch

4 files changed, 10 insertions, 30 deletions

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.sh
index fd5afae8b..98a03891e 100755
--- a/bin/msgimport
+++ b/bin/msgimport.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