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/index.php         |  2 +-
 installer/rcube_install.php |  4 ++--
 installer/test.php          | 18 ++++++++++--------
 installer/utils.php         | 19 +++----------------
 4 files changed, 16 insertions(+), 27 deletions(-)

(limited to 'installer')

diff --git a/installer/index.php b/installer/index.php
index 9f4c0a35e..d1c55e4ec 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -13,8 +13,8 @@ $include_path .= ini_get('include_path');
 
 set_include_path($include_path);
 
-require_once 'rcube_shared.inc';
 require_once 'utils.php';
+require_once 'main.inc';
 
 session_start();
 
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 05046879e..1ad1ff267 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -136,10 +136,10 @@ class rcube_install
    */
   function create_config($which, $force = false)
   {
-    $out = file_get_contents(RCMAIL_CONFIG_DIR . "/{$which}.inc.php.dist");
+    $out = @file_get_contents(RCMAIL_CONFIG_DIR . "/{$which}.inc.php.dist");
     
     if (!$out)
-      return '[Warning: could not read the template file]';
+      return '[Warning: could not read the config template file]';
 
     foreach ($this->config as $prop => $default) {
       $value = (isset($_POST["_$prop"]) || $this->bool_config_props[$prop]) ? $_POST["_$prop"] : $default;
diff --git a/installer/test.php b/installer/test.php
index 5740a6489..90d089ffd 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -248,13 +248,11 @@ $to_field = new html_inputfield(array('name' => '_to', 'id' => 'sendmailto'));
 
 if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to'])) {
   
-  require_once 'rcube_smtp.inc';
-  
   echo '<p>Trying to send email...<br />';
   
   if (preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_from'])) &&
       preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_to']))) {
-  
+
     $headers = array(
       'From'    => trim($_POST['_from']),
       'To'      => trim($_POST['_to']),
@@ -267,7 +265,7 @@ if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to']
     // send mail using configured SMTP server
     if ($RCI->getprop('smtp_server')) {
       $CONFIG = $RCI->config;
-      
+
       if (!empty($_POST['_smtp_user'])) {
         $CONFIG['smtp_user'] = $_POST['_smtp_user'];
       }
@@ -277,10 +275,14 @@ if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to']
 
       $mail_object  = new rcube_mail_mime();
       $send_headers = $mail_object->headers($headers);
-      
-      $status = smtp_mail($headers['From'], $headers['To'],
-          ($foo = $mail_object->txtHeaders($send_headers)),
-          $body, $smtp_response);
+
+      $SMTP = new rcube_smtp();
+      $SMTP->connect();
+
+      $status = $SMTP->send_mail($headers['From'], $headers['To'],
+          ($foo = $mail_object->txtHeaders($send_headers)), $body);
+
+      $smtp_response = $SMTP->get_response();
     }
     else {    // use mail()
       $header_str = 'From: ' . $headers['From'];
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