From 039397bd3104d92f7957263520eab0ccfb54f869 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 23 Jan 2015 11:13:47 +0100 Subject: Use setConfigs() instead of calling setConfig() multiple times --- lib/private/setup/abstractdatabase.php | 8 ++++-- lib/private/setup/mssql.php | 6 ++-- lib/private/setup/mysql.php | 6 ++-- lib/private/setup/oci.php | 52 ++++++++++++++++------------------ lib/private/setup/postgresql.php | 19 +++++-------- 5 files changed, 45 insertions(+), 46 deletions(-) (limited to 'lib/private/setup') diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php index 84625a217ee..e421efe8028 100644 --- a/lib/private/setup/abstractdatabase.php +++ b/lib/private/setup/abstractdatabase.php @@ -41,9 +41,11 @@ abstract class AbstractDatabase { $dbhost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost'; $dbtableprefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_'; - \OC_Config::setValue('dbname', $dbname); - \OC_Config::setValue('dbhost', $dbhost); - \OC_Config::setValue('dbtableprefix', $dbtableprefix); + \OC_Config::setValues([ + 'dbname' => $dbname, + 'dbhost' => $dbhost, + 'dbtableprefix' => $dbtableprefix, + ]); $this->dbuser = $dbuser; $this->dbpassword = $dbpass; diff --git a/lib/private/setup/mssql.php b/lib/private/setup/mssql.php index 5143545b76f..f1699c36f96 100644 --- a/lib/private/setup/mssql.php +++ b/lib/private/setup/mssql.php @@ -21,8 +21,10 @@ class MSSQL extends AbstractDatabase { $this->trans->t('You need to enter either an existing account or the administrator.')); } - \OC_Config::setValue('dbuser', $this->dbuser); - \OC_Config::setValue('dbpassword', $this->dbpassword); + \OC_Config::setValues([ + 'dbuser' => $this->dbuser, + 'dbpassword' => $this->dbpassword, + ]); $this->createDBLogin($masterConnection); diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php index 8f8d86d388c..97f75e2f676 100644 --- a/lib/private/setup/mysql.php +++ b/lib/private/setup/mysql.php @@ -51,8 +51,10 @@ class MySQL extends AbstractDatabase { } }; - \OC_Config::setValue('dbuser', $this->dbuser); - \OC_Config::setValue('dbpassword', $this->dbpassword); + \OC_Config::setValues([ + 'dbuser' => $this->dbuser, + 'dbpassword' => $this->dbpassword, + ]); } //create the database diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php index b75b658bae2..d4f71f18ab4 100644 --- a/lib/private/setup/oci.php +++ b/lib/private/setup/oci.php @@ -16,8 +16,11 @@ class OCI extends AbstractDatabase { } // allow empty hostname for oracle $this->dbhost = $config['dbhost']; - \OC_Config::setValue('dbhost', $this->dbhost); - \OC_Config::setValue('dbtablespace', $this->dbtablespace); + + \OC_Config::setValues([ + 'dbhost' => $this->dbhost, + 'dbtablespace' => $this->dbtablespace, + ]); } public function validate($config) { @@ -72,37 +75,32 @@ class OCI extends AbstractDatabase { $result = oci_execute($stmt); if($result) { $row = oci_fetch_row($stmt); - } - if($result and $row[0] > 0) { - //use the admin login data for the new database user - //add prefix to the oracle user name to prevent collisions - $this->dbuser='oc_'.$username; - //create a new password so we don't need to store the admin config in the config file - $this->dbpassword=\OC_Util::generateRandomBytes(30); + if ($row[0] > 0) { + //use the admin login data for the new database user - //oracle passwords are treated as identifiers: - // must start with alphanumeric char - // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length. - $this->dbpassword=substr($this->dbpassword, 0, 30); + //add prefix to the oracle user name to prevent collisions + $this->dbuser='oc_'.$username; + //create a new password so we don't need to store the admin config in the config file + $this->dbpassword=\OC_Util::generateRandomBytes(30); - $this->createDBUser($connection); + //oracle passwords are treated as identifiers: + // must start with alphanumeric char + // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length. + $this->dbpassword=substr($this->dbpassword, 0, 30); - \OC_Config::setValue('dbuser', $this->dbuser); - \OC_Config::setValue('dbname', $this->dbuser); - \OC_Config::setValue('dbpassword', $this->dbpassword); - - //create the database not necessary, oracle implies user = schema - //$this->createDatabase($this->dbname, $this->dbuser, $connection); - } else { + $this->createDBUser($connection); + } + } - \OC_Config::setValue('dbuser', $this->dbuser); - \OC_Config::setValue('dbname', $this->dbname); - \OC_Config::setValue('dbpassword', $this->dbpassword); + \OC_Config::setValues([ + 'dbuser' => $this->dbuser, + 'dbname' => $this->dbname, + 'dbpassword' => $this->dbpassword, + ]); - //create the database not necessary, oracle implies user = schema - //$this->createDatabase($this->dbname, $this->dbuser, $connection); - } + //create the database not necessary, oracle implies user = schema + //$this->createDatabase($this->dbname, $this->dbuser, $connection); //FIXME check tablespace exists: select * from user_tablespaces diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php index 3777d1620bc..5fb6b85fc89 100644 --- a/lib/private/setup/postgresql.php +++ b/lib/private/setup/postgresql.php @@ -43,20 +43,15 @@ class PostgreSQL extends AbstractDatabase { $this->dbpassword=\OC_Util::generateRandomBytes(30); $this->createDBUser($connection); - - \OC_Config::setValue('dbuser', $this->dbuser); - \OC_Config::setValue('dbpassword', $this->dbpassword); - - //create the database - $this->createDatabase($connection); } - else { - \OC_Config::setValue('dbuser', $this->dbuser); - \OC_Config::setValue('dbpassword', $this->dbpassword); - //create the database - $this->createDatabase($connection); - } + \OC_Config::setValues([ + 'dbuser' => $this->dbuser, + 'dbpassword' => $this->dbpassword, + ]); + + //create the database + $this->createDatabase($connection); // the connection to dbname=postgres is not needed anymore pg_close($connection); -- cgit v1.2.3