From 2c3d81dddd8d931385022a065515d6ef42d7fb7d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 21 Jul 2009 08:31:59 -0400
Subject: [PATCH] - use simple rcube_smtp class - Installer: fix SMTP settings test
---
installer/utils.php | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/installer/utils.php b/installer/utils.php
index 54221dd..1c10105 100644
--- a/installer/utils.php
+++ b/installer/utils.php
@@ -29,28 +29,16 @@
/**
* Use PHP5 autoload for dynamic class loading
- * (copy from program/incllude/iniset.php)
+ * (copy from program/include/iniset.php)
*/
function __autoload($classname)
{
$filename = preg_replace(
- array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
- array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
+ array('/MDB2_(.+)/', '/Mail_(.+)/', '/Net_(.+)/', '/^html_.+/', '/^utf8$/'),
+ array('MDB2/\\1', 'Mail/\\1', 'Net/\\1', 'html', 'utf8.class'),
$classname
);
include_once $filename. '.php';
-}
-
-
-/**
- * Shortcut function for htmlentities()
- *
- * @param string String to quote
- * @return string The html-encoded string
- */
-function Q($string)
-{
- return htmlentities($string, ENT_COMPAT, 'UTF-8');
}
@@ -62,5 +50,4 @@
$rci = rcube_install::get_instance();
$rci->raise_error($p);
}
-
--
Gitblit v1.9.1