diff options
| author | Thomas Pulzer <t.pulzer@kniel.de> | 2016-07-06 09:58:38 +0200 |
|---|---|---|
| committer | Thomas Pulzer <t.pulzer@kniel.de> | 2016-07-06 09:58:38 +0200 |
| commit | d367318088c2044427a574b1e42c48deade1bec3 (patch) | |
| tree | a3cc8b55540ab039eb07f5d2be180c545578bedb /lib/private/Setup/OCI.php | |
| parent | cf7afabf62d1e3f4c5856d7636e21496d7992257 (diff) | |
| download | nextcloud-server-d367318088c2044427a574b1e42c48deade1bec3.tar.gz nextcloud-server-d367318088c2044427a574b1e42c48deade1bec3.zip | |
Added occ install option for database-port.
Extended the database setup to store the database port.
Changed the PostgreSQL connection error message for clarification.
Diffstat (limited to 'lib/private/Setup/OCI.php')
| -rw-r--r-- | lib/private/Setup/OCI.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/Setup/OCI.php b/lib/private/Setup/OCI.php index 1da3656f9ab..7fddf0e58e5 100644 --- a/lib/private/Setup/OCI.php +++ b/lib/private/Setup/OCI.php @@ -63,12 +63,14 @@ class OCI extends AbstractDatabase { public function setupDatabase($username) { $e_host = addslashes($this->dbHost); + // adding slashes for security reasons + $e_port = addslashes($this->dbPort); $e_dbname = addslashes($this->dbName); //check if the database user has admin right if ($e_host == '') { $easy_connect_string = $e_dbname; // use dbname as easy connect name } else { - $easy_connect_string = '//'.$e_host.'/'.$e_dbname; + $easy_connect_string = '//'.$e_host.(!empty($e_port) ? ":{$e_port}" : "").'/'.$e_dbname; } $this->logger->debug('connect string: ' . $easy_connect_string, ['app' => 'setup.oci']); $connection = @oci_connect($this->dbUser, $this->dbPassword, $easy_connect_string); |