From e1dc8ba3d4f6e95cb0652f1346d70ee30fb4f95a Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Fri, 15 Feb 2008 12:03:17 -0500
Subject: [PATCH] * showing db error
---
check.php-dist | 240 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 155 insertions(+), 85 deletions(-)
diff --git a/check.php-dist b/check.php-dist
index 89a1587..81d63ae 100644
--- a/check.php-dist
+++ b/check.php-dist
@@ -56,20 +56,37 @@
********************************************
*/
+define('CHECK_OK', '<span class="success">OK</span>');
+define('CHECK_NOK', '<span class="fail">NOT OK</span>');
+define('CHECK_NA', '<span class="na">NOT AVAILABLE</span>');
+
error_reporting(E_ALL ^E_NOTICE);
-$include_path = dirname(__FILE__) . '/program/lib/';
+$include_path = dirname(__FILE__) . '/program/lib';
$include_path .= PATH_SEPARATOR;
-$include_path .= dirname(__FILE__) . '/program/';
+$include_path .= dirname(__FILE__) . '/program';
$include_path .= PATH_SEPARATOR;
$include_path .= get_include_path();
+@ini_set('display_errors', 1);
set_include_path($include_path);
-$writable_dirs = array('logs/', 'temp/');
-$create_files = array('config/db.inc.php', 'config/main.inc.php');
+$create_files = array('config/db.inc.php', 'config/main.inc.php');
-$path = dirname(__FILE__) . '/';
+$required_libs = array('PEAR' => 'PEAR.php', 'DB' => 'DB.php',
+ 'Net_SMTP' => 'Net/SMTP.php', 'Mail_mime' => 'Mail/mime.php',
+ 'MDB2' => 'MDB2.php', 'iilConnection' => 'lib/imap.inc');
+
+$supported_drivers = array('MDB2#mysql' => 'MDB2/Driver/mysql.php',
+ 'MDB2#pgsql' => 'MDB2/Driver/pgsql.php', 'MDB2#sqlite' => 'MDB2/Driver/sqlite.php');
+
+$supported_dbs = array('MySQL' => 'mysql', 'MySQLi' => 'mysqli',
+ 'PostgreSQL' => 'pgsql', 'SQLite (v2)' => 'sqlite');
+
+$path = dirname(__FILE__) . '/';
+$check = basename(__FILE__);
+
+include_once 'include/bugs.inc';
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/2002/REC-xhtml1-20020801/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -79,8 +96,11 @@
<style type="text/css">
/* <![CDATA[ */
label { display:block; }
+ th { text-align: left; }
+ h4 { margin-bottom: 0.2em; }
.success { color:#006400;font-weight:bold !important; }
.fail { color:#ff0000 !important;font-weight:bold !important; }
+ .na { color:#f60; font-weight:bold; }
/* ]]> */
</style>
<title>RoundCube :: check</title>
@@ -92,23 +112,43 @@
From correctly set:
<?php
if ($rctest_config['from'] == '_yourfrom_') {
- echo '<span class="fail">NOT OK</span>';
+ echo CHECK_NOK;
} else {
echo $rctest_config['from'] . '<br /><br />';
- echo '<i>We do not check if this is a <b>valid</b> email address. Since this serves as from & to, make sure it is correct!</i>';
+ echo '<i><b>Note:</b> We do not check if this is a <b>valid</b> email address.';
+ echo ' Because this settings serves as from & to, make sure it is correctly set!</i>';
}
-?>
-<br />
-<?php
-echo '<h3>Check if directories are writable</h3>';
-echo '<p>RoundCube may need to write/save files into these directories.</p>';
-foreach ($writable_dirs AS $dir) {
- echo "Directory $dir: ";
- if (!is_writable($path . $dir)) {
- echo '<span class="fail">NOT OK</span>';
+echo '<h3>Checking available databases</h3>';
+echo '<p>Checks if the extension is loaded.</p>';
+
+$prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
+foreach ($supported_dbs AS $database => $ext) {
+ echo "$database: ";
+ if (extension_loaded($ext)) {
+ echo CHECK_OK;
} else {
- echo '<span class="success">OK</span>';
+ $_ext = $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
+ echo CHECK_NA;
+ if (@dl($_ext)) {
+ echo ' (<i>Could</i> be loaded. Please add in php.ini, if you plan on using it.)';
+ } else {
+ echo ' (<b>Not</b> installed.)';
+ }
+ }
+ echo '<br />';
+}
+
+echo '<h3>Check for required 3rd party libs</h3>';
+echo '<p>This also checks if the include path is set correctly.</p>';
+
+foreach ($required_libs as $classname => $file) {
+ require_once $file;
+ echo "$classname: ";
+ if (class_exists($classname)) {
+ echo CHECK_OK;
+ } else {
+ echo CHECK_NOK . "; Failed to load $file";
}
echo "<br />";
}
@@ -119,29 +159,72 @@
foreach ($create_files AS $file) {
echo "File $file: ";
if (file_exists($path . $file) && is_readable($path . $file)) {
- echo '<span class="success">OK</span>';
+ echo CHECK_OK;
} else {
- echo '<span class="fail">NOT OK</span>';
+ echo CHECK_NOK;
}
echo '<br />';
+}
+
+echo '<h3>Check if directories are writable</h3>';
+echo '<p>RoundCube may need to write/save files into these directories.</p>';
+@include $path . 'config/main.inc.php';
+
+if (isset($rcmail_config)) {
+ foreach (array($rcmail_config['temp_dir'], $rcmail_config['log_dir']) AS $dir) {
+ $dir = $dir{0} == '/' ? $dir : $path . $dir;
+ echo "Directory $dir: ";
+ if (!is_writable($dir)) {
+ echo CHECK_NOK;
+ } else {
+ echo CHECK_OK;
+ }
+ echo "<br />";
+ }
+} else {
+ echo 'Could not open db.inc.php config file, or file is empty.<br />';
}
echo '<h3>Check supplied DB settings</h3>';
@include $path . 'config/db.inc.php';
$db_working = false;
-if (isset($rcmail_config)) {
- echo 'DB settings: ';
- include_once 'MDB2.php';
- $db = MDB2::connect($rcmail_config['db_dsnw']);
- if (!MDB2::IsError($db)) {
- echo '<span class="success">OK</span>';
- $db->disconnect();
- $db_working = true;
+if (isset($rcmail_config) && is_array($rcmail_config)) {
+ echo 'Selected backend: ';
+ if ($rcmail_config['db_backend'] != '') {
+
+ echo 'PEAR::' . strtoupper($rcmail_config['db_backend']) . '<br />';
+
+ $_class = 'rcube_' . strtolower($rcmail_config['db_backend']);
+
+ require_once 'include/' . $_class . '.inc';
+
+ echo 'DSN (standard): ';
+ $DB = new $_class($rcmail_config['db_dsnw'], '', false);
+ $DB->db_connect('w');
+ if (!($db_error_msg = $DB->is_error())) {
+ echo CHECK_OK;
+ $db_working = true;
+ } else {
+ echo CHECK_NOK . " (Error: $db_error_msg)";
+ }
+ echo '<br />';
+ echo 'DSN (read-only, optional): ';
+ if ($rcmail_config['db_dsnr'] != '') {
+ $DB_READ = new $_class($rcmail_config['db_dsnr'], '', false);
+ $DB_READ->db_connect('w');
+ if (!($db_error_msg = $DB_READ->is_error())) {
+ echo CHECK_OK;
+ } else {
+ echo CHECK_NOK . " (Error: $db_error_msg)";
+ }
+ } else {
+ echo CHECK_NA;
+ }
+ echo '<br />';
} else {
- echo '<span class="fail">NOT OK</span>';
+ echo CHECK_NOK . ' (not set)';
}
- echo '<br />';
} else {
echo 'Could not open db.inc.php config file, or file is empty.<br />';
}
@@ -150,10 +233,6 @@
echo 'Checks if web- and databaseserver are in the same timezone.<br /><br />';
echo 'Status: ';
if ($db_working === true) {
- require_once 'include/rcube_mdb2.inc';
- $DB = new rcube_mdb2($rcmail_config['db_dsnw'], '', false);
- $DB->db_connect('w');
-
$tz_db = "SELECT " . $DB->unixtimestamp($DB->now()) . " AS tz_db";
$tz_db = $DB->query($tz_db);
$tz_db = $DB->fetch_assoc($tz_db);
@@ -162,9 +241,9 @@
$tz_diff = $tz_local - $tz_db;
if ($tz_db != $tz_local) {
- echo '<span class="fail">NOT OK</span>';
+ echo CHECK_NOK;
} else {
- echo '<span class="success">OK</span>';
+ echo CHECK_OK;
}
} else {
echo 'Could not test (fix DB first).';
@@ -173,69 +252,60 @@
echo '<h3>Checking .ini settings</h3>';
-$auto_start = ini_get('session.auto_start');
-$file_uploads = ini_get('file_uploads');
+$ini_array = array('session.auto_start' => 0, 'file_uploads' => 1,
+ 'magic_quotes_sybase' => 0, 'magic_quotes_gpc' => 0);
-echo '<h4>session.auto_start = 0</h4>';
-echo 'status: ';
-if ($auto_start == 1) {
- echo '<span class="fail">NOT OK</span>';
-} else {
- echo '<span class="success">OK</span>';
-}
-echo '<br />';
+foreach ($ini_array AS $var => $val) {
+ $status = ini_get($var);
-echo '<h4>file_uploads = On</h4>';
-echo 'status: ';
-if ($file_uploads == 1) {
- echo '<span class="success">OK</span>';
-} else {
- echo '<span class="fail">NOT OK</span>';
-}
-
-/*
- * Probably not needed because we have a custom handler
-echo '<h4>session.save_path <i>is set</i></h4>';
-echo 'status: ';
-$save_path = ini_get('session.save_path');
-if (empty($save_path)) {
- echo '<span class="fail">NOT OK</span>';
-} else {
- echo "<span class="success">OK</span>: $save_path";
- if (!file_exists($save_path)) {
- echo ', but it does not exist';
+ echo "<h4>$var = $val</h4>";
+ echo 'status: ';
+ if ($status != $val) {
+ echo CHECK_NOK;
} else {
- if (!is_readable($save_path) || !is_writable($save_path)) {
- echo ', but permissions to read and/or write are missing';
- }
+ echo CHECK_OK;
}
+ echo '<br />';
}
-echo '<br />';
- */
-@include_once $path . '/config/main.inc.php';
+@include $path . 'config/main.inc.php';
?>
<h3>Check email settings</h3>
-<h4>SMTP Settings</h4>
<?php
-echo 'Fetch config from config/main.inc.php: ';
+echo 'Fetching config-settings from config/main.inc.php.<br /><br />';
if (is_array($rcmail_config) && count($rcmail_config)) {
- echo '<span class="success">OK</span><br />';
+?>
+<table border="0">
+<tr>
+ <th><h4>SMTP Settings</h4></th>
+ <th><h4>IMAP Settings</h4></th>
+</tr>
+<tr><td valign="top">
+<?php
+ echo 'SMTP: ' . CHECK_OK . '<br />';
echo 'server: ' . $rcmail_config['smtp_server'] . '<br />';
echo 'port: ' . $rcmail_config['smtp_port'] . '<br />';
echo 'user: ' . (($rcmail_config['smtp_user'] == '%u')?'<i>use current session</i>':$rcmail_config['smtp_user']) . '<br />';
echo 'pass: ' . (($rcmail_config['smtp_pass'] == '%p')?'<i>use current session</i>':$rcmail_config['smtp_pass']) . '<br />';
//var_dump($rcmail_config);
?>
+</td><td valign="top">
+<?php
+ echo 'IMAP: ' . CHECK_OK . '<br />';
+ echo 'server: ' . (is_array($rcmail_config['default_host']) ? var_export($rcmail_config['default_host'], true) : $rcmail_config['default_host']) . '<br />';
+ echo 'port: ' . $rcmail_config['default_port'] . '<br />';
+?>
+</td></tr>
+</table>
<h3>Test SMTP settings - send an email</h3>
<p>Don't abuse this!</p>
-<form action="check.php" method="post">
+<form action="<?php echo $check; ?>" method="post">
<?php
if ($rcmail_config['smtp_server'] != ''):
if ($rcmail_config['smtp_user'] == '%u'):
?>
<label>Username:</label><input type="text" name="smtp_test[user]" />
-<label>Password:</label><input type="text" name="smtp_test[pass]" /><br />
+<label>Password:</label><input type="password" name="smtp_test[pass]" /><br />
<?php
endif;
endif;
@@ -250,7 +320,7 @@
echo 'Trying to send email: ';
if ($rctest_config['from'] == '_yourfrom_') {
- echo '<span class="fail">NOT OK</span><br />';
+ echo CHECK_NOK . '<br />';
echo '<i>Please edit $rctest_config in ' . basename(__FILE__) . '</i><br />';
} else {
@@ -273,15 +343,15 @@
$smtp_response = array();
if (smtp_mail($rctest_config['from'], $recipients, ($foo = $mail_object->txtHeaders($send_headers)), $body, $smtp_response)) {
- echo '<span class="success">OK</span><br />';
+ echo CHECK_OK . '<br />';
} else {
- echo '<span class="fail">NOT OK</span>';
+ echo CHECK_NOK;
echo '<br />' . join('<br />', $smtp_response);
}
}
}
} else {
- echo '<span class="fail">NOT OK</span>';
+ echo CHECK_NOK;
}
?>
<h3>Test IMAP settings</h3>
@@ -290,9 +360,9 @@
echo '<span class="fail">We cannot test, default_host is not set in config/main.inc.php.</span>';
} else {
?>
-<form action="check.php" method="post">
+<form action="<?php echo $check; ?>" method="post">
<label>Username:</label><input type="text" name="imap_test[user]" />
-<label>Password:</label><input type="text" name="imap_test[pass]" /><br /><br />
+<label>Password:</label><input type="password" name="imap_test[pass]" /><br /><br />
<input type="hidden" name="action" value="imap" />
<input type="submit" value="check email" />
</form><br /><br />
@@ -311,14 +381,14 @@
$data['user'], $data['pass']);
if ($result != true) {
- echo '<span class="fail">NOT OK</span>';
- echo '<br />' . $iil_error;
+ echo CHECK_NOK;
+ echo '<br />Error return: ' . $iil_error;
} else {
- echo '<span class="success">OK</span>';
+ echo CHECK_OK;
}
echo '<br />';
}
}
?>
</body>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1