From d7a6b094063a89b8ecce9392a603cb3c3a967db2 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 28 Oct 2012 14:11:41 +0100
Subject: deny the usage of dots in database name

---
 core/templates/installation.php | 2 +-
 lib/setup.php                   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/templates/installation.php b/core/templates/installation.php
index c0b29ea909d..5a3bd2cc9f0 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -111,7 +111,7 @@
 			</p>
 			<p class="infield">
 				<label for="dbname" class="infield"><?php echo $l->t( 'Database name' ); ?></label>
-				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" />
+				<input type="text" name="dbname" id="dbname" value="<?php print OC_Helper::init_var('dbname'); ?>" autocomplete="off" pattern="[0-9a-zA-Z$_]+" />
 			</p>
 		</div>
 		<?php endif; ?>
diff --git a/lib/setup.php b/lib/setup.php
index a072e00f91e..9231845da51 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -70,6 +70,9 @@ class OC_Setup {
 			if(empty($options['dbname'])) {
 				$error[] = "$dbprettyname enter the database name.";
 			}
+			if(substr_count($options['dbname'], '.') >= 1){
+				$error[] = "$dbprettyname you may not use dots in the database name";
+			}
 			if($dbtype != 'oci' && empty($options['dbhost'])) {
 				$error[] = "$dbprettyname set the database host.";
 			}
-- 
cgit v1.2.3