From 8b86df308bc4df0729126db55e5cde668074bd59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Thu, 28 Aug 2014 15:54:28 +0200 Subject: [PATCH] allow empty hostname and dots in service name for oracle autosetup --- lib/private/setup/oci.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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); -- 2.39.5