diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-08-28 15:54:28 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-08-29 17:09:17 +0200 |
| commit | 10382ef2f07d1e80dfd4920b98b6e33d6efef496 (patch) | |
| tree | 1dcce3f801c951e0afde911b761b1c40ddbb8858 /lib/private/setup | |
| parent | 033b0361edb206ac3c8303a0d8003fd6752d6f75 (diff) | |
| download | nextcloud-server-10382ef2f07d1e80dfd4920b98b6e33d6efef496.tar.gz nextcloud-server-10382ef2f07d1e80dfd4920b98b6e33d6efef496.zip | |
allow empty hostname and dots in service name for oracle autosetup
Diffstat (limited to 'lib/private/setup')
| -rw-r--r-- | lib/private/setup/oci.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php index 24863b9e38a..23b5232438a 100644 --- a/lib/private/setup/oci.php +++ b/lib/private/setup/oci.php @@ -14,9 +14,23 @@ class OCI extends AbstractDatabase { } else { $this->dbtablespace = 'USERS'; } + // allow empty hostname for oracle + $this->dbhost = $config['dbhost']; + \OC_Config::setValue('dbhost', $this->dbhost); \OC_Config::setValue('dbtablespace', $this->dbtablespace); } + public function validate($config) { + $errors = array(); + if(empty($config['dbuser'])) { + $errors[] = $this->trans->t("%s enter the database username.", array($this->dbprettyname)); + } + if(empty($config['dbname'])) { + $errors[] = $this->trans->t("%s enter the database name.", array($this->dbprettyname)); + } + return $errors; + } + public function setupDatabase($username) { $e_host = addslashes($this->dbhost); $e_dbname = addslashes($this->dbname); |