[Mapbender-commits] r9282 - trunk/mapbender/http/geoportal

[svn_mapbender at osgeo.org]

Author: armin11
Date: 2015-09-09 04:02:16 -0700 (Wed, 09 Sep 2015)
New Revision: 9282

Modified:
   trunk/mapbender/http/geoportal/deleteUserProfile.php
   trunk/mapbender/http/geoportal/insertUserDataIntoDb.php
Log:
Username should be unambigious

Modified: trunk/mapbender/http/geoportal/deleteUserProfile.php
===================================================================
--- trunk/mapbender/http/geoportal/deleteUserProfile.php	2015-09-08 13:21:30 UTC (rev 9281)
+++ trunk/mapbender/http/geoportal/deleteUserProfile.php	2015-09-09 11:02:16 UTC (rev 9282)
@@ -95,7 +95,7 @@
 }
 
 if ($message !=="") {
-	$message = "The current profile cannot be deleted for the following reasons: ".$message;
+	$message = _mb("The current profile cannot be deleted for the following reasons: ").$message;
 	abort($message);
 }
 

Modified: trunk/mapbender/http/geoportal/insertUserDataIntoDb.php
===================================================================
--- trunk/mapbender/http/geoportal/insertUserDataIntoDb.php	2015-09-08 13:21:30 UTC (rev 9281)
+++ trunk/mapbender/http/geoportal/insertUserDataIntoDb.php	2015-09-09 11:02:16 UTC (rev 9282)
@@ -39,8 +39,12 @@
 	if ($mb_user_name == 'guest') {
 		$registerAsGuest = true;
 	}
+	//Trimmen des Nutzernamens um Leerstellen - gibt sonst Probleme 
+	$mb_user_name = trim($mb_user_name);
 	//überprüfen ob User und oder Mail bereits existieren
-		$sql = "SELECT * FROM mb_user WHERE mb_user_name = $1 AND mb_user_email = $2";
+		//$sql = "SELECT * FROM mb_user WHERE mb_user_name = $1 AND mb_user_email = $2";
+		//Neu seit 2015-09-10 - Nutzernamen jetzt nur noch eindeutig möglich!
+		$sql = "SELECT * FROM mb_user WHERE mb_user_name = $1";
  		$v = array($mb_user_name,$mb_user_email); // wird in unserer Lösung immer md5 genutzt?
 		$t = array('s','s');
  		$res = db_prep_query($sql,$v,$t);