From bf19fe2d1aaa3ca390b9175d3e1d17070e166843 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 09 May 2016 03:23:31 -0400
Subject: [PATCH] Move commented mod_headers settings to the end of the file
---
installer/test.php | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/installer/test.php b/installer/test.php
index 988451e..237e8df 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -246,7 +246,7 @@
<h3>Test SMTP config</h3>
<p>
-Server: <?php echo rcube_parse_host($RCI->getprop('smtp_server', 'PHP mail()')); ?><br />
+Server: <?php echo rcube_utils::parse_host($RCI->getprop('smtp_server', 'PHP mail()')); ?><br />
Port: <?php echo $RCI->getprop('smtp_port'); ?><br />
<?php
@@ -310,7 +310,7 @@
$send_headers = $mail_object->headers($headers);
$SMTP = new rcube_smtp();
- $SMTP->connect(rcube_parse_host($RCI->getprop('smtp_server')),
+ $SMTP->connect(rcube_utils::parse_host($RCI->getprop('smtp_server')),
$RCI->getprop('smtp_port'), $CONFIG['smtp_user'], $CONFIG['smtp_pass']);
$status = $SMTP->send_mail($headers['From'], $headers['To'],
@@ -325,7 +325,7 @@
$status = mail($headers['To'], $headers['Subject'], $body, $header_str);
else
$status = mail($headers['To'], $headers['Subject'], $body, $header_str, '-f'.$headers['From']);
-
+
if (!$status)
$smtp_response[] = 'Mail delivery with mail() failed. Check your error logs for details';
}
@@ -340,7 +340,7 @@
else {
$RCI->fail('SMTP send', 'Invalid sender or recipient');
}
-
+
echo '</p>';
}
@@ -405,7 +405,7 @@
if (isset($_POST['imaptest']) && !empty($_POST['_host']) && !empty($_POST['_user'])) {
- echo '<p>Connecting to ' . Q($_POST['_host']) . '...<br />';
+ echo '<p>Connecting to ' . rcube::Q($_POST['_host']) . '...<br />';
$imap_host = trim($_POST['_host']);
$imap_port = $RCI->getprop('default_port');
@@ -427,6 +427,7 @@
$imap->set_options(array(
'auth_type' => $RCI->getprop('imap_auth_type'),
'debug' => $RCI->getprop('imap_debug'),
+ 'socket_options' => $RCI->getprop('imap_conn_options'),
));
if ($imap->connect($imap_host, $imap_user, $_POST['_pass'], $imap_port, $imap_ssl)) {
--
Gitblit v1.9.1