From 7be708ea1ea12e2a90df02a466d97adb2eff0ccc Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 28 Mar 2008 18:42:05 -0400
Subject: [PATCH] Update French translators and remove Pierre HAEGELI
---
installer/test.php | 53 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/installer/test.php b/installer/test.php
index 7e99039..04259dd 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -31,11 +31,38 @@
?>
+<h3>Check if directories are writable</h3>
+<p>RoundCube may need to write/save files into these directories</p>
+<?php
+
+if ($RCI->configured) {
+ $pass = false;
+ foreach (array($RCI->config['temp_dir'],$RCI->config['log_dir']) as $dir) {
+ $dirpath = $dir{0} == '/' ? $dir : $docroot . '/' . $dir;
+ if (is_writable(realpath($dirpath))) {
+ $RCI->pass($dir);
+ $pass = true;
+ }
+ else {
+ $RCI->fail($dir, 'not writeable for the webserver');
+ }
+ echo '<br />';
+ }
+
+ if (!$pass)
+ echo '<p class="hint">Use <tt>chmod</tt> or <tt>chown</tt> to grant write privileges to the webserver</p>';
+}
+else {
+ $RCI->fail('Config', 'Could not read config files');
+}
+
+?>
+
<h3>Check configured database settings</h3>
<?php
$db_working = false;
-if (!empty($RCI->config)) {
+if ($RCI->configured) {
if (!empty($RCI->config['db_backend']) && !empty($RCI->config['db_dsnw'])) {
echo 'Backend: ';
@@ -53,7 +80,7 @@
}
else {
$RCI->fail('DSN (write)', $db_error_msg);
- echo '<p class="hint">Make sure that the configured database extists and that the user as write privileges<br />';
+ echo '<p class="hint">Make sure that the configured database exists and that the user has write privileges<br />';
echo 'DSN: ' . $RCI->config['db_dsnw'] . '</p>';
if ($RCI->config['db_backend'] == 'mdb2')
echo '<p class="hint">There are known problems with MDB2 running on PHP 4. Try setting <tt>db_backend</tt> to \'db\' instead</p>';
@@ -137,11 +164,11 @@
$pass = $RCI->getprop('smtp_pass', '(none)');
if ($user == '%u') {
- $user_field = new textfield(array('name' => '_user'));
- $user = $user_field->show($_POST['_user']);
+ $user_field = new textfield(array('name' => '_smtp_user'));
+ $user = $user_field->show($_POST['_smtp_user']);
}
if ($pass == '%p') {
- $pass_field = new passwordfield(array('name' => '_pass'));
+ $pass_field = new passwordfield(array('name' => '_smtp_pass'));
$pass = $pass_field->show();
}
@@ -168,8 +195,8 @@
preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_to']))) {
$headers = array(
- 'From' => trim($_POST['_from']),
- 'To' => trim($_POST['_to']),
+ 'From' => trim($_POST['_from']),
+ 'To' => trim($_POST['_to']),
'Subject' => 'Test message from RoundCube',
);
@@ -180,11 +207,13 @@
if ($RCI->getprop('smtp_server')) {
$CONFIG = $RCI->config;
- if (!empty($_POST['_user']))
- $CONFIG['smtp_user'] = $_POST['_user'];
- if (!empty($_POST['_pass']))
- $CONFIG['smtp_pass'] = $_POST['_pass'];
-
+ if (!empty($_POST['_smtp_user'])) {
+ $CONFIG['smtp_user'] = $_POST['_smtp_user'];
+ }
+ if (!empty($_POST['_smtp_pass'])) {
+ $CONFIG['smtp_pass'] = $_POST['_smtp_pass'];
+ }
+
$mail_object = new rc_mail_mime();
$send_headers = $mail_object->headers($headers);
--
Gitblit v1.9.1