partkeepr

commit 5aec91f3fd2e194b21f3e4f2cbc6d25044800b93
parent d153d73e520ff26f6d77de995fe2859c3e52d6d7
Author: Felicitus <felicitus@felicitus.org>
Date:   Thu,  6 Sep 2012 17:54:53 +0200

Merge branch 'master' of github.com:partkeepr/PartKeepr

Diffstat:
M
src/backend/PartKeepr/User/User.php
 | 
15
++-------------
R
src/setup/index.html -> src/setup/index.php
 | 
0

M
src/setup/js/SetupWizard.js
 | 
4
+++-

3 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/src/backend/PartKeepr/User/User.php b/src/backend/PartKeepr/User/User.php
@@ -39,23 +39,12 @@ class User extends BaseEntity implements Serializable, Deserializable {
 	
 	/**
 	 * Sets the username.
-	 * 
-	 * Forces the username to have
-	 * lowercase a-z characters. 
-	 * 
-	 * Replaces space with an underscore.
-	 * Replaces dot with nothing.
-	 * 
-	 * @param string $username	The username to set. Applies automatic username modification.
+	 *
+	 * @param string $username	The username to set.
 	 * @return nothing
 	 */
 	public function setUsername ($username) {
-		$username = strtolower($username);
-		$username = str_replace(" ", "_", $username);
-		$username = str_replace(".", "", $username);
-		
 		$this->username = $username;
-		
 	}
 	
 	/**
diff --git a/src/setup/index.html b/src/setup/index.php
diff --git a/src/setup/js/SetupWizard.js b/src/setup/js/SetupWizard.js
@@ -67,7 +67,9 @@ Ext.define('PartKeeprSetup.SetupWizard', {
             items: [{
                 border: false,
                 bodyStyle: 'background:none;',
-                html: 'This wizard guides you through the setup of <b>PartKeepr</b>.'
+                html: 'This wizard guides you through the setup of <b>PartKeepr</b>.<br/><br/>Note that you can '+
+                      're-start setup any time, even if you already have an existing database. No existing data will '+
+                      'be overwritten.'
             }]
         }));