upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-18 18:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

use USERS tablespace whn none is given, only needed when we need to create a user, does not need to be stored in config

Browse source
This commit is contained in:
Jörn Friedrich Dreyer 2013-06-14 12:09:49 +02:00
parent dcdabac04d
commit e5d3cd59ac
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/setup.php
View file

@ -133,12 +133,15 @@ class OC_Setup {
$dbuser = $options['dbuser'];
$dbpass = $options['dbpass'];
$dbname = $options['dbname'];
$dbtablespace = $options['dbtablespace'];
if (array_key_exists('dbtablespace', $options)) {
$dbtablespace = $options['dbtablespace'];
} else {
$dbtablespace = 'USERS';
}
$dbhost = isset($options['dbhost'])?$options['dbhost']:'';
$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
OC_Config::setValue('dbname', $dbname);
OC_Config::setValue('dbtablespace', $dbtablespace);
OC_Config::setValue('dbhost', $dbhost);
OC_Config::setValue('dbtableprefix', $dbtableprefix);
@ -439,8 +442,8 @@ class OC_Setup {
}
}
private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $dbtablespace,
$username) {
private static function setupOCIDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix,
$dbtablespace = 'USERS', $username) {
$l = self::getTrans();
$e_host = addslashes($dbhost);
$e_dbname = addslashes($dbname);
@ -552,7 +555,7 @@ class OC_Setup {
* @param String $tablespace
* @param resource $connection
*/
private static function oci_createDBUser($name, $password, $tablespace, $connection) {
private static function oci_createDBUser($name, $password, $tablespace = 'USERS', $connection) {
$l = self::getTrans();
$query = "SELECT * FROM all_users WHERE USERNAME = :un";
$stmt = oci_parse($connection, $query);