From 2c3d81dddd8d931385022a065515d6ef42d7fb7d Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 21 Jul 2009 12:31:59 +0000
Subject: - use simple rcube_smtp class - Installer: fix SMTP settings test

---
 installer/utils.php | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'installer/utils.php')

diff --git a/installer/utils.php b/installer/utils.php
index 54221dd2d..1c101058f 100644
--- a/installer/utils.php
+++ b/installer/utils.php
@@ -29,31 +29,19 @@
 
 /**
  * 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');
-}
-
-
 /**
  * Fake internal error handler to catch errors
  */
@@ -63,4 +51,3 @@ function raise_error($p)
   $rci->raise_error($p);
 }
 
-
-- 
cgit v1.2.3