Changeset 1067 in subversion

Timestamp:

Feb 13, 2008 3:34:21 AM (5 years ago)

Author:

thomasb

Message:

Use our internal functions to send a test mail (PEAR::Mail is not bundeled with RoundCube)

File:

• trunk/roundcubemail/check.php-dist (modified) (2 diffs)

trunk/roundcubemail/check.php-dist

@@ -255 +255 @@
 
             $data = $_POST['smtp_test'];
-
-            require_once 'Mail.php';
+            $CONFIG = $rcmail_config;
+
+            require_once 'lib/rc_mail_mime.inc';
+            require_once 'include/rcube_smtp.inc';
 
             $recipients = $rctest_config['from'];
@@ -266 +268 @@
             $body = 'This is a test to confirm that RoundCube can send email.';
 
-            $params      = array();
-            $mail_driver = '';
-
-            if ($rcmail_config['smtp_server'] != '') {
-                $mail_driver = 'smtp';
-
-                if (isset($data['user'])) {
-                    $params['username'] = $data['user'];
-                    $params['password'] = $data['pass'];
-                    $params['auth']     = true;
-                }
-
-                $params['host'] = $rcmail_config['smtp_server'];
-                $params['port'] = $rcmail_config['smtp_port'];
-
-            } else {
-                $mail_driver = 'mail';
-            }
-
-            $mail_object =& Mail::factory($mail_driver, $params);
-            $status = $mail_object->send($recipients, $headers, $body);
-            if (!PEAR::isError($status)) {
+            $mail_object = new rc_mail_mime();
+            $mail_object->headers($headers);
+            
+            $smtp_response = array();
+            if (smtp_mail($rctest_config['from'], $recipients, ($foo = $mail_object->txtHeaders($send_headers)), $body, $smtp_response)) {
                 echo '<span class="success">OK</span><br />';
             } else {
                 echo '<span class="fail">NOT OK</span></span>';
-                echo '<br />' . $status->getMessage();
+                echo '<br />' . join('<br />', $smtp_response);
             }
         }