From 4ca1e3cc0295203f2d1bdca083b73ed56b8fa978 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@owncloud.com>
Date: Thu, 12 Jun 2014 19:59:40 +0200
Subject: [PATCH] Move getValue() to where required. This actually is not
required "global data".
---
lib/private/db.php | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/lib/private/db.php b/lib/private/db.php
index df558dfce15..a35a4f53e80 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -57,27 +57,23 @@ class OC_DB {
return true;
}
- // The global data we need
- $name = OC_Config::getValue( "dbname", "owncloud" );
- $host = OC_Config::getValue( "dbhost", "" );
- $user = OC_Config::getValue( "dbuser", "" );
- $pass = OC_Config::getValue( "dbpassword", "" );
- $type = OC_Config::getValue( "dbtype", "sqlite" );
-
+ $type = OC_Config::getValue('dbtype', 'sqlite');
$factory = new \OC\DB\ConnectionFactory();
if (!$factory->isValidType($type)) {
return false;
}
$connectionParams = array(
- 'user' => $user,
- 'password' => $pass,
+ 'user' => OC_Config::getValue('dbuser', ''),
+ 'password' => OC_Config::getValue('dbpassword', ''),
);
+ $name = OC_Config::getValue('dbname', 'owncloud');
if ($factory->normalizeType($type) === 'sqlite3') {
$datadir = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data');
$connectionParams['path'] = $datadir.'/'.$name.'.db';
} else {
+ $host = OC_Config::getValue('dbhost', '');
if (strpos($host, ':')) {
// Host variable may carry a port or socket.
list($host, $socket) = explode(':', $host, 2);
--
GitLab