diff --git a/check.php-dist b/check.php-dist
index 019b033be..ff9a6e71b 100644
--- a/check.php-dist
+++ b/check.php-dist
@@ -33,8 +33,6 @@
* @license http://www.opensource.org/licenses/bsd-license.php The BSD License
* @version CVS: $Id$
* @link https://svn.roundcube.net/trunk
- * @todo Check IMAP settings.
- * @todo Check SMTP settings.
* @todo HTML/CSS to make it pretty.
* @todo In devel-next, use bootstrap.
* @todo Refactor to use RoundCube classes.
@@ -58,6 +56,8 @@ $rctest_config['from'] = '_yourfrom_';
********************************************
*/
+error_reporting(E_ALL ^E_NOTICE);
+
$include_path = dirname(__FILE__) . '/program/lib/';
$include_path .= PATH_SEPARATOR;
$include_path .= dirname(__FILE__) . '/program/';
@@ -92,7 +92,7 @@ $path = dirname(__FILE__) . '/';
From correctly set:
NOT OK';
+ echo 'NOT OK';
} else {
echo $rctest_config['from'] . '
';
echo 'We do not check if this is a valid email address. Since this serves as from & to, make sure it is correct!';
@@ -106,7 +106,7 @@ echo '
RoundCube may need to write/save files into these directories.
';
foreach ($writable_dirs AS $dir) {
echo "Directory $dir: ";
if (!is_writable($path . $dir)) {
- echo 'NOT OK';
+ echo 'NOT OK';
} else {
echo 'OK';
}
@@ -121,7 +121,7 @@ foreach ($create_files AS $file) {
if (file_exists($path . $file) && is_readable($path . $file)) {
echo 'OK';
} else {
- echo 'NOT OK';
+ echo 'NOT OK';
}
echo '
';
}
@@ -139,7 +139,7 @@ if (isset($rcmail_config)) {
$db->disconnect();
$db_working = true;
} else {
- echo 'NOT OK';
+ echo 'NOT OK';
}
echo '
';
} else {
@@ -162,7 +162,7 @@ if ($db_working === true) {
$tz_diff = $tz_local - $tz_db;
if ($tz_db != $tz_local) {
- echo 'NOT OK';
+ echo 'NOT OK';
} else {
echo 'OK';
}
@@ -179,7 +179,7 @@ $file_uploads = ini_get('file_uploads');
echo 'session.auto_start = 0
';
echo 'status: ';
if ($auto_start == 1) {
- echo 'NOT OK';
+ echo 'NOT OK';
} else {
echo 'OK';
}
@@ -190,7 +190,7 @@ echo 'status: ';
if ($file_uploads == 1) {
echo 'OK';
} else {
- echo 'NOT OK';
+ echo 'NOT OK';
}
/*
@@ -199,7 +199,7 @@ echo 'session.save_path is set
';
echo 'status: ';
$save_path = ini_get('session.save_path');
if (empty($save_path)) {
- echo 'NOT OK';
+ echo 'NOT OK';
} else {
echo "OK: $save_path";
if (!file_exists($save_path)) {
@@ -242,18 +242,19 @@ endif;
?>
Recipient:
+
NOT OK
';
+ echo 'NOT OK
';
echo 'Please edit $rctest_config in ' . basename(__FILE__) . '
';
} else {
- $data = $_POST['smtp_test'];
+ $data = $_POST['smtp_test'];
$CONFIG = $rcmail_config;
require_once 'lib/rc_mail_mime.inc';
@@ -274,13 +275,49 @@ Recipient:
if (smtp_mail($rctest_config['from'], $recipients, ($foo = $mail_object->txtHeaders($send_headers)), $body, $smtp_response)) {
echo 'OK
';
} else {
- echo 'NOT OK';
+ echo 'NOT OK';
echo '
' . join('
', $smtp_response);
}
}
}
} else {
- echo 'NOT OK';
+ echo 'NOT OK';
+}
+?>
+Test IMAP settings
+We cannot test, default_host is not set in config/main.inc.php.';
+} else {
+?>
+
+NOT OK';
+ echo '
' . $iil_error;
+ } else {
+ echo 'OK';
+ }
+ echo '
';
+ }
}
?>