Use db setup class for option validation

1 files changed, 15 insertions, 2 deletions

diff --git a/lib/setup/abstractdatabase.php b/lib/setup/abstractdatabase.php
index cef64ee7ebb..07a679f2112 100644
--- a/lib/setup/abstractdatabase.php
+++ b/lib/setup/abstractdatabase.php
@@ -12,14 +12,27 @@ abstract class AbstractDatabase {
 
 	public function __construct($trans, $config) {
 		$this->trans = $trans;
-		$this->initialize($config);
+	}
+
+	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));
+		}
+		if(substr_count($config['dbname'], '.') >= 1) {
+			$errors[] = $this->trans->t("%s you may not use dots in the database name", array($this->dbprettyname));
+		}
+		return $errors;
 	}
 
 	public function initialize($config) {
 		$dbuser = $config['dbuser'];
 		$dbpass = $config['dbpass'];
 		$dbname = $config['dbname'];
-		$dbhost = isset($config['dbhost']) ? $config['dbhost'] : ''; // dbhost contents is checked earlier
+		$dbhost = !empty($config['dbhost']) ? $config['dbhost'] : 'localhost';
 		$dbtableprefix = isset($config['dbtableprefix']) ? $config['dbtableprefix'] : 'oc_';
 
 		\OC_Config::setValue('dbname', $dbname);