From 2371191c30edbbafa420882cd2f812b8ab03f2a9 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 02 Mar 2008 08:36:34 -0500
Subject: [PATCH] Fix sqlite dsn composing
---
installer/rcube_install.php | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 35054a1..efe139d 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -24,6 +24,7 @@
class rcube_install
{
var $step;
+ var $is_post = false;
var $failures = 0;
var $config = array();
var $configured = false;
@@ -37,6 +38,7 @@
function rcube_install()
{
$this->step = intval($_REQUEST['_step']);
+ $this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
}
/**
@@ -98,8 +100,7 @@
*/
function getprop($name, $default = '')
{
- $value = $_SERVER['REQUEST_METHOD'] == 'POST' &&
- (isset($_POST["_$name"]) || $this->config_props[$name]) ? $_POST["_$name"] : $this->config[$name];
+ $value = $this->is_post && (isset($_POST["_$name"]) || $this->config_props[$name]) ? $_POST["_$name"] : $this->config[$name];
if ($name == 'des_key' && !isset($_REQUEST["_$name"]))
$value = self::random_key(24);
@@ -133,7 +134,10 @@
$value = $val;
}
else if ($prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
- $value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'], $_POST['_dbuser'], $_POST['_dbpass'], $_POST['_dbhost'], $_POST['_dbname']);
+ if ($_POST['_dbtype'] == 'sqlite')
+ $value = sprintf('%s://%s?mode=0646', $_POST['_dbtype'], $_POST['_dbname']{0} == '/' ? '/' . $_POST['_dbname'] : $_POST['_dbname']);
+ else
+ $value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'], $_POST['_dbuser'], $_POST['_dbpass'], $_POST['_dbhost'], $_POST['_dbname']);
}
else if ($prop == 'smtp_auth_type' && $value == '0') {
$value = '';
--
Gitblit v1.9.1