From 9ad9d7bfbb85b03bacf0ed1c12d16bae5c8bc6ac Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Mon, 26 Jan 2015 12:59:25 +0100 Subject: naming fixes while reviewing --- lib/private/setup/abstractdatabase.php | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'lib/private/setup/abstractdatabase.php') diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php index e421efe8028..08e295c3fff 100644 --- a/lib/private/setup/abstractdatabase.php +++ b/lib/private/setup/abstractdatabase.php @@ -35,22 +35,24 @@ abstract class AbstractDatabase { } public function initialize($config) { - $dbuser = $config['dbuser']; - $dbpass = $config['dbpass']; - $dbname = $config['dbname']; - $dbhost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost'; - $dbtableprefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_'; + $dbUser = $config['dbuser']; + $dbPass = $config['dbpass']; + $dbName = $config['dbname']; + $dbHost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost'; + $dbTablePrefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_'; \OC_Config::setValues([ - 'dbname' => $dbname, - 'dbhost' => $dbhost, - 'dbtableprefix' => $dbtableprefix, + 'dbname' => $dbName, + 'dbhost' => $dbHost, + 'dbtableprefix' => $dbTablePrefix, ]); - $this->dbuser = $dbuser; - $this->dbpassword = $dbpass; - $this->dbname = $dbname; - $this->dbhost = $dbhost; - $this->tableprefix = $dbtableprefix; + $this->dbuser = $dbUser; + $this->dbpassword = $dbPass; + $this->dbname = $dbName; + $this->dbhost = $dbHost; + $this->tableprefix = $dbTablePrefix; } + + abstract public function setupDatabase($userName); } -- cgit v1.2.3