- use simple rcube_smtp class

- Installer: fix SMTP settings test


git-svn-id: https://svn.roundcube.net/trunk@2776 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 16 deletions

diff --git a/roundcubemail/installer/utils.php b/roundcubemail/installer/utils.php
index 54221dd2d..1c101058f 100644
--- a/roundcubemail/installer/utils.php
+++ b/roundcubemail/installer/utils.php
@@ -29,13 +29,13 @@
 
 /**
  * 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';
@@ -43,18 +43,6 @@ function __autoload($classname)
 
 
 /**
- * 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
  */
 function raise_error($p)
@@ -63,4 +51,3 @@ function raise_error($p)
   $rci->raise_error($p);
 }
 
-