Mer ändringar från playerName till playerId

dbFiles/OnlineGames.php

@@ -15,9 +15,10 @@
 	$callFunction = $conn->real_escape_string(isset($_POST['f'])?$_POST['f']:"");
 	$gameId = $conn->real_escape_string(isset($_POST['gameId'])?$_POST['gameId']:"");
 	$userName = $conn->real_escape_string(isset($_POST['userName'])?$_POST['userName']:"");
+	$userId = $conn->query("SELECT id FROM users where username = '$userName'");
 	
 	if ($callFunction === "list"){	
-		$sql = "SELECT * FROM game WHERE id IN (SELECT gameId FROM gamePlayers WHERE playerId = $userId)";
+		$sql = "SELECT game.*, users.username FROM `game` LEFT JOIN users on currentPlayer = users.id WHERE id IN (SELECT gameId FROM gamePlayers WHERE playerId = $userId)"
 		$result = $conn->query($sql);
 
 		if ($result->num_rows > 0) {
@@ -53,7 +54,7 @@
 			}
 		}
 	} else if ($callFunction === "accept") {
-		$sql = "UPDATE gamePlayers SET status = 'ACCEPTED' WHERE gameId = $gameId AND playerId = (SELECT id from users WHERE username = '$userName')";
+		$sql = "UPDATE gamePlayers SET status = 'ACCEPTED' WHERE gameId = $gameId AND playerId = $userId";
 		$result = $conn->query($sql);
 		if (!$result) {
 			echo $conn->error;
@@ -82,10 +83,10 @@
 				$data = $questionIdResult->fetch_assoc();
 				$values = "";
 				foreach ($playerIds AS $playerId) {
-					$values .= "($gameId, (SELECT username FROM users WHERE id = $playerId), " . $data['id'] . "),";
+					$values .= "($gameId, $playerId, " . $data['id'] . "),";
 				}
 				$values = rtrim($values, ",");
-				$insertRandomStartQuestion = "INSERT INTO usersLockedQuestions (gameId, playerName, questionId) VALUES $values";
+				$insertRandomStartQuestion = "INSERT INTO usersLockedQuestions (gameId, playerId, questionId) VALUES $values";
 				$result = $conn->query($insertRandomStartQuestion);
 				if (!$result) {
 					echo "Something wrong with inserting starting question error: " . $conn->error;
@@ -100,7 +101,7 @@
 		}
 	} else if ($callFunction === "SetQuestionsLost") {
 		$questionsLost = $_POST['questionsLost'];
-		$sql = "UPDATE gamePlayers SET questionsLost = $questionsLost WHERE gameId = $gameId AND playerId = (SELECT id from users WHERE name = '$userName')";
+		$sql = "UPDATE gamePlayers SET questionsLost = $questionsLost WHERE gameId = $gameId AND playerId = $userId";
 		$result = $conn->query($sql);
 		if (!$result) {
 			echo "Updating questionsLost resulted in error: " . $conn->error;
@@ -141,7 +142,7 @@
 			echo "Failed to update current player for game with id $gameId - error: " . $conn->error;
 		}		
 	} else if ($callFunction === "GetPlayerPoints") {
-		$sql = "SELECT userLockedQuestions FROM game WHERE gameId = $gameId AND playerId = (SELECT id FROM users WHERE name = '$userName')";
+		$sql = "SELECT userLockedQuestions FROM game WHERE gameId = $gameId AND playerId = $userId";
 		$result = $conn->query($sql);
 		$data = $result->fetch_assoc();
 		
@@ -180,7 +181,7 @@
 		echo json_encode($returnArray);
 	} else if ($callFunction === "GetQuestionsLost") {
 		$userName = $conn->real_escape_string($_POST['userName']);
-		$sql = "SELECT questionsLost FROM gamePlayers WHERE gameId = $gameId AND playerId = (SELECT id from users WHERE username = '$userName')";
+		$sql = "SELECT questionsLost FROM gamePlayers WHERE gameId = $gameId AND playerId = $userId";
 		$result = $conn->query($sql);
 		$data = $result->fetch_assoc();