@@ -64,10 +64,10 @@ |
||
| 64 | 64 | public function setupDatabase($username) { |
| 65 | 65 | $datadir = $this->config->getValue( |
| 66 | 66 | 'datadirectory', |
| 67 | - \OC::$SERVERROOT . '/data' |
|
| 67 | + \OC::$SERVERROOT.'/data' |
|
| 68 | 68 | ); |
| 69 | 69 | |
| 70 | - $sqliteFile = $datadir . '/' . $this->dbName . 'db'; |
|
| 70 | + $sqliteFile = $datadir.'/'.$this->dbName.'db'; |
|
| 71 | 71 | if (file_exists($sqliteFile)) { |
| 72 | 72 | unlink($sqliteFile); |
| 73 | 73 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | if ($host === '') { |
| 141 | 141 | $additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name |
| 142 | 142 | } else { |
| 143 | - $additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName; |
|
| 143 | + $additionalConnectionParams['dbname'] = '//'.$host.(!empty($port) ? ":{$port}" : "").'/'.$dbName; |
|
| 144 | 144 | } |
| 145 | 145 | unset($additionalConnectionParams['host']); |
| 146 | 146 | break; |
@@ -195,8 +195,8 @@ discard block |
||
| 195 | 195 | $name = $this->config->getValue('dbname', self::DEFAULT_DBNAME); |
| 196 | 196 | |
| 197 | 197 | if ($this->normalizeType($type) === 'sqlite3') { |
| 198 | - $dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data'); |
|
| 199 | - $connectionParams['path'] = $dataDir . '/' . $name . '.db'; |
|
| 198 | + $dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT.'/data'); |
|
| 199 | + $connectionParams['path'] = $dataDir.'/'.$name.'.db'; |
|
| 200 | 200 | } else { |
| 201 | 201 | $host = $this->config->getValue('dbhost', ''); |
| 202 | 202 | $connectionParams = array_merge($connectionParams, $this->splitHostFromPortAndSocket($host)); |