From bf2f39ea6d2b49c7495a43cca19ab18f27f8292e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 29 Sep 2008 09:02:02 -0400
Subject: [PATCH] - #1485290: Fix unread counter when displaying cached massage in preview panel - remove some empty lines in app.js
---
installer/test.php | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/installer/test.php b/installer/test.php
index bdaf3ee..ca7c7ad 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -3,8 +3,8 @@
<h3>Check config files</h3>
<?php
-$read_main = is_readable(INSTALL_PATH.'config/main.inc.php');
-$read_db = is_readable(INSTALL_PATH.'config/db.inc.php');
+$read_main = is_readable(RCMAIL_CONFIG_DIR.'/main.inc.php');
+$read_db = is_readable(RCMAIL_CONFIG_DIR.'/db.inc.php');
if ($read_main && !empty($RCI->config)) {
$RCI->pass('main.inc.php');
@@ -35,7 +35,12 @@
if ($RCI->configured) {
$pass = false;
- foreach (array($RCI->config['temp_dir'],$RCI->config['log_dir']) as $dir) {
+
+ $dirs[] = $RCI->config['temp_dir'];
+ if($RCI->config['log_driver'] != 'syslog')
+ $dirs[] = $RCI->config['log_dir'];
+
+ foreach ($dirs as $dir) {
$dirpath = $dir{0} == '/' ? $dir : INSTALL_PATH . $dir;
if (is_writable(realpath($dirpath))) {
$RCI->pass($dir);
@@ -61,14 +66,9 @@
$db_working = false;
if ($RCI->configured) {
- if (!empty($RCI->config['db_backend']) && !empty($RCI->config['db_dsnw'])) {
+ if (!empty($RCI->config['db_dsnw'])) {
- echo 'Backend: ';
- echo 'PEAR::' . strtoupper($RCI->config['db_backend']) . '<br />';
-
- $dbclass = 'rcube_' . strtolower($RCI->config['db_backend']);
-
- $DB = new $dbclass($RCI->config['db_dsnw'], '', false);
+ $DB = new rcube_mdb2($RCI->config['db_dsnw'], '', false);
$DB->db_connect('w');
if (!($db_error_msg = $DB->is_error())) {
$RCI->pass('DSN (write)');
@@ -79,8 +79,6 @@
$RCI->fail('DSN (write)', $db_error_msg);
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>';
}
}
else {
--
Gitblit v1.9.1