[Pkg-owncloud-commits] [owncloud] 14/50: allow empty hostname and dots in service name for oracle autosetup

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v6.0.6RC1
in repository owncloud.

commit 25524e03c4876b633448da6aad3147a830bb26ef
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Thu Aug 28 15:54:28 2014 +0200

    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 24863b9..23b5232 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git