X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=installer%2Ftest.php;h=713edfbb63187800ffe7ae59772aefffa70d6a09;hb=07e1de2dcd3f3ff8910a3680493f035b3c693cf0;hp=bdaf3ee525ef424df16ad4a44691bb26b45222af;hpb=48e8459231a1efa3e97284d07a328776a5b7485b;p=roundcube.git diff --git a/installer/test.php b/installer/test.php index bdaf3ee..713edfb 100644 --- a/installer/test.php +++ b/installer/test.php @@ -3,8 +3,8 @@
The following config options are not present in the current configuration.
';
+ echo 'Please check the default config files and add the missing properties to your local config files.
The following config options have been replaced or renamed. '; + echo 'Please update them accordingly in your config files.
'; + + echo 'You still have some obsolete or inexistent properties set. This isn\'t a problem but should be noticed.
'; + + echo 'OK, lazy people can download the updated config files here: '; + echo html::a(array('href' => './?_mergeconfig=main'), 'main.inc.php') . ' '; + echo html::a(array('href' => './?_mergeconfig=db'), 'db.inc.php'); + echo "
"; + + + if (is_array($messages['dependencies'])) { + echo 'Some of your configuration settings require other options to be configured or additional PHP modules to be installed
'; + + echo 'RoundCube may need to write/save files into these directories
+Roundcube may need to write/save files into these directories
configured) { $pass = false; - foreach (array($RCI->config['temp_dir'],$RCI->config['log_dir']) as $dir) { - $dirpath = $dir{0} == '/' ? $dir : INSTALL_PATH . $dir; + + $dirs[] = $RCI->config['temp_dir'] ? $RCI->config['temp_dir'] : 'temp'; + if($RCI->config['log_driver'] != 'syslog') + $dirs[] = $RCI->config['log_dir'] ? $RCI->config['log_dir'] : 'logs'; + + foreach ($dirs as $dir) { + $dirpath = $dir[0] == '/' ? $dir : INSTALL_PATH . $dir; if (is_writable(realpath($dirpath))) { $RCI->pass($dir); $pass = true; @@ -56,19 +119,14 @@ else { ?> -Make sure that the configured database exists and that the user has write privileges
';
echo 'DSN: ' . $RCI->config['db_dsnw'] . '
There are known problems with MDB2 running on PHP 4. Try setting db_backend to \'db\' instead
'; } } else { @@ -103,15 +159,23 @@ if ($db_working && $_POST['initdb']) { // test database if ($db_working) { $db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}"); - if (!$db_read) { + if ($DB->db_error) { $RCI->fail('DB Schema', "Database not initialized"); - $db_working = false; echo ''; + $db_working = false; + } + else if ($RCI->db_schema_check($DB, $update = !empty($_POST['updatedb']))) { + $RCI->fail('DB Schema', "Database schema differs"); + $db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql', 'sqlsrv' => 'mssql'); + $updatefile = INSTALL_PATH . 'SQL/' . (isset($db_map[$DB->db_provider]) ? $db_map[$DB->db_provider] : $DB->db_provider) . '.update.sql'; + echo 'Please manually execute the SQL statements from '.$updatefile.' on your database.
';
+ echo 'See comments in the file and execute queries that are superscribed with the currently installed version number.
-Server: getprop('smtp_server', 'PHP mail()'); ?>
+Server: getprop('smtp_server', 'PHP mail()')); ?>
Port: getprop('smtp_port'); ?>
'_to', 'id' => 'sendmailto'));
Trying to send email...
';
-
- if (preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_from'])) &&
- preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_to']))) {
-
+
+ $from = idn_to_ascii(trim($_POST['_from']));
+ $to = idn_to_ascii(trim($_POST['_to']));
+
+ if (preg_match('/^' . $RCI->email_pattern . '$/i', $from) &&
+ preg_match('/^' . $RCI->email_pattern . '$/i', $to)
+ ) {
$headers = array(
- 'From' => trim($_POST['_from']),
- 'To' => trim($_POST['_to']),
- 'Subject' => 'Test message from RoundCube',
+ 'From' => $from,
+ 'To' => $to,
+ 'Subject' => 'Test message from Roundcube',
);
- $body = 'This is a test to confirm that RoundCube can send email.';
+ $body = 'This is a test to confirm that Roundcube can send email.';
$smtp_response = array();
-
+
// 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'];
}
@@ -210,12 +275,17 @@ if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to']
$CONFIG['smtp_pass'] = $_POST['_smtp_pass'];
}
- $mail_object = new rcube_mail_mime();
+ $mail_object = new 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(rcube_parse_host($RCI->getprop('smtp_server')),
+ $RCI->getprop('smtp_port'), $CONFIG['smtp_user'], $CONFIG['smtp_pass']);
+
+ $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'];
@@ -239,10 +309,10 @@ if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to']
else {
$RCI->fail('SMTP send', 'Invalid sender or recipient');
}
+
+ echo '