diff options
| -rw-r--r-- | INSTALL | 5 | ||||
| -rw-r--r-- | installer/config.php | 2 | ||||
| -rw-r--r-- | program/include/rcube_mdb2.php | 4 |
3 files changed, 6 insertions, 5 deletions
@@ -70,9 +70,8 @@ RoundCube with utf-8 charset. * SQLite -------- -Sqlite requires specifically php5 (sqlite in php4 currently doesn't -work with roundcube), and you need sqlite 2 (preferably 2.8) to setup -the sqlite db (sqlite 3.x also doesn't work at the moment). Here is +You need sqlite 2 (preferably 2.8) to setup the sqlite db +(sqlite 3.x also doesn't work at the moment). Here is an example how you can setup the sqlite.db for roundcube: # sqlite -init SQL/sqlite.initial.sql sqlite.db diff --git a/installer/config.php b/installer/config.php index f72a0e820..d090312ed 100644 --- a/installer/config.php +++ b/installer/config.php @@ -269,7 +269,7 @@ echo '<label for="cfgdbtype">Database type</label><br />'; echo $input_dbhost->show($RCI->is_post ? $_POST['_dbhost'] : $dsnw['hostspec']); echo '<label for="cfgdbhost">Database server (omit for sqlite)</label><br />'; echo $input_dbname->show($RCI->is_post ? $_POST['_dbname'] : $dsnw['database']); -echo '<label for="cfgdbname">Database name</label><br />'; +echo '<label for="cfgdbname">Database name (use a path and filename for sqlite)</label><br />'; echo $input_dbuser->show($RCI->is_post ? $_POST['_dbuser'] : $dsnw['username']); echo '<label for="cfgdbuser">Database user name (needs write permissions)(omit for sqlite)</label><br />'; echo $input_dbpass->show($RCI->is_post ? $_POST['_dbpass'] : $dsnw['password']); diff --git a/program/include/rcube_mdb2.php b/program/include/rcube_mdb2.php index 1c491a874..713ff4255 100644 --- a/program/include/rcube_mdb2.php +++ b/program/include/rcube_mdb2.php @@ -585,7 +585,9 @@ class rcube_mdb2 $data = file_get_contents($file_name); if (strlen($data)) - sqlite_exec($dbh->connection, $data); + if (!sqlite_exec($dbh->connection, $data, $error) || MDB2::isError($dbh)) + raise_error(array('code' => 500, 'type' => 'db', + 'line' => __LINE__, 'file' => __FILE__, 'message' => $error), TRUE, FALSE); } |