From 8ee776703607f597cfb1419fe3f0553f7c2ebf05 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 05 Mar 2010 08:11:35 -0500
Subject: [PATCH] - Fix directories checking when temp_dir/log_dir aren't set
---
installer/test.php | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/installer/test.php b/installer/test.php
index edf7732..daa8864 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -69,6 +69,20 @@
echo html::a(array('href' => './?_mergeconfig=main'), 'main.inc.php') . ' ';
echo html::a(array('href' => './?_mergeconfig=db'), 'db.inc.php');
echo "</p>";
+
+
+ if (is_array($messages['dependencies'])) {
+ echo '<h3 class="warning">Dependency check failed</h3>';
+ echo '<p class="hint">Some of your configuration settings require other options to be configured or additional PHP modules to be installed</p>';
+
+ echo '<ul class="configwarings">';
+ foreach ($messages['dependencies'] as $msg) {
+ echo html::tag('li', null, html::span('propname', $msg['prop']) . ': ' . $msg['explain']);
+ }
+ echo '</ul>';
+ }
+
+
}
?>
@@ -80,12 +94,12 @@
if ($RCI->configured) {
$pass = false;
- $dirs[] = $RCI->config['temp_dir'];
+ $dirs[] = $RCI->config['temp_dir'] ? $RCI->config['temp_dir'] : 'temp';
if($RCI->config['log_driver'] != 'syslog')
- $dirs[] = $RCI->config['log_dir'];
+ $dirs[] = $RCI->config['log_dir'] ? $RCI->config['log_dir'] : 'logs';
foreach ($dirs as $dir) {
- $dirpath = $dir{0} == '/' ? $dir : INSTALL_PATH . $dir;
+ $dirpath = $dir[0] == '/' ? $dir : INSTALL_PATH . $dir;
if (is_writable(realpath($dirpath))) {
$RCI->pass($dir);
$pass = true;
@@ -145,15 +159,24 @@
// 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 '<p><input type="submit" name="initdb" value="Initialize database" /></p>';
+ $db_working = false;
}
+ /*
+ else if (!$RCI->db_schema_check($update = !empty($_POST['updatedb']))) {
+ $RCI->fail('DB Schema', "Database schema differs");
+
+ echo $update ? '<p class="warning">Failed to update the database schema! Please manually execute the SQL statements from the SQL/*.update.sql file on your database</p>' :
+ '<p><input type="submit" name="updatedb" value="Update schema now" /></p>';
+ $db_working = false;
+ }
+ */
else {
$RCI->pass('DB Schema');
+ echo '<br />';
}
- echo '<br />';
}
// more database tests
@@ -169,7 +192,7 @@
else {
$RCI->fail('DB Write', $RCI->get_error());
}
- echo '<br />';
+ echo '<br />';
// check timezone settings
$tz_db = 'SELECT ' . $DB->unixtimestamp($DB->now()) . ' AS tz_db';
@@ -225,13 +248,11 @@
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']),
@@ -244,7 +265,7 @@
// 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'];
}
@@ -254,10 +275,14 @@
$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'];
--
Gitblit v1.9.1