Une partie du travail nécessaire à l'écran préférences.

code/serveur/dump2sqlite.sh

@@ -34,6 +34,7 @@ create table played_game_cloud(pgid, gid, type, num, relation, weight, score);
 create table colon_nodes(eid);
 create table random_cloud_node(eid,nbneighbors);
 create table random_center_node(eid);
+create table user_info(user, key, value, primary key (user, key));
 
 insert into user(login, mail, hash_passwd, score, ugroup) values('$(echo "$user" | sed -e "s/'/''/g")', 'foo@isp.com', '$(echo "$passwd" | dd bs=1 count="${#passwd}" | (if which md5sum >/dev/null 2>&1; then md5sum; else md5; fi) | cut -d ' ' -f 1)', 0, 1);
 EOF

code/serveur/php/jeu.html

@@ -5,41 +5,27 @@
 		<meta charset="utf-8" />
 		<style>
 html, body {
-	background-color: black;
 	overflow: hidden;
 }
 
 .screen {
-	background-color: #FFFFE0;
 	display: none;
 }
 
 #splash.screen {
-	background-color: black;
 	display: block;
 }
 
-#mc-caption {
-	color: #8b4;
-}
-
-#mn-caption {
-	color: #4a4;
-}
-
 #mn-caption-block {
-	border-top: medium solid #44AA44;
-	border-bottom: medium solid #44AA44;
-	background-color: #F0F8D0;
+	border-top-width: medium;
+	border-top-style: solid;
+	border-bottom-width: medium;
+	border-bottom-style: solid;
 }
 
 .relationBox {
-	background-color: #F0F8D0;
-	border: thin solid #44AA44;
-}
-
-.relations .hot {
-	background-color: yellow;
+	border-width: thin;
+	border-style: solid;
 }
 
 .clearboth {
@@ -50,6 +36,7 @@ html, body {
 	text-align: center;
 }
 		</style>
+		<link rel="stylesheet" href="ressources/green.css" />
 		<script src="ressources/jquery-1.5.1.min.js"></script>
 		<script src="ressources/jquery-ui-1.8.11.custom.min.js"></script>
 		<script src="ressources/jquery.ba-hashchange.min.js"></script>

code/serveur/php/ressources/backend.inc

@@ -766,4 +766,35 @@ function wordExist($node) {
 
 	return getNodeEid($node) === null ? "0" : "1";
 }
+
+function getUserInfo($user, $key) {
+	return getdb()->querySingle("SELECT value FROM user_info WHERE user = '".sqlite3::escapestring($user)."' AND key = '".SQLite3::escapeString($key)."';");
+}
+
+function setUserInfo($user, $key, $value) {
+	getDB()->exec("UPDATE user_info SET value = '".SQLite3::escapeString($value)
+				  ."' WHERE user = '".SQLite3::escapeString($user)
+				  ."' AND key = '".SQLite3::escapeString($key)."';");
+}
+
+function userPrefsDefaults() {
+	$prefs = Array(
+		"theme" => "green"
+	);
+}
+
+function userPrefs($user) {
+	$res = userPrefsDefaults();
+	foreach ($res as $k => &$v) {
+		$x = getUserInfo($user, $k);
+		if ($x !== null) $v = $x;
+	}
+	echo json_encode($res);
+}
+
+function setUserPref($user, $key, $value) {
+	if (array_key_exists($key, userPrefsDefaults()))
+		setUserInfo($user, $key, $value);
+}
+
 ?>

code/serveur/php/ressources/black.css

@@ -0,0 +1,36 @@
+/* Colors */
+
+html, body {
+	background-color: black;
+	color: white;
+}
+
+.screen {
+	background-color: black;
+}
+
+#splash.screen {
+	background-color: black;
+}
+
+#mc-caption {
+	color: white;
+}
+
+#mn-caption {
+	color: white;
+}
+
+#mn-caption-block {
+	border-color: #aaaaaa;
+	background-color: #222222;
+}
+
+.relationBox {
+	border-color: #cccccc;
+	background-color: #222222;
+}
+
+.relations .hot {
+	background-color: #cccccc;
+}

code/serveur/php/ressources/green.css

@@ -0,0 +1,36 @@
+/* Colors */
+
+html, body {
+	background-color: black;
+	color: black;
+}
+
+.screen {
+	background-color: #FFFFE0;
+}
+
+#splash.screen {
+	background-color: black;
+}
+
+#mc-caption {
+	color: #8b4;
+}
+
+#mn-caption {
+	color: #4a4;
+}
+
+#mn-caption-block {
+	border-color: #44AA44;
+	background-color: #F0F8D0;
+}
+
+.relationBox {
+	border-color: #44AA44;
+	background-color: #F0F8D0;
+}
+
+.relations .hot {
+	background-color: yellow;
+}

code/serveur/php/ressources/pticlic.js

@@ -1,4 +1,6 @@
 // ==== URL persistante
+var nullFunction = function(){};
+
 function State(init) {
 	try {
 	$.extend(this, init || {});
@@ -109,6 +111,7 @@ function UI () {
 					window.console && console.log(msg);
 				} catch(e) {alert("Error UI.log");alert(e);}
 			},
+			info: function(title, msg) { alert(msg); },
 			setScreen: function() {}
 		};
 	}
@@ -173,7 +176,7 @@ ajaj.bigError = function(x) {
 ajaj.error = function(msg) {
 	try {
 		UI().dismiss();
-		alert(msg);
+		UI().info("Erreur !", msg);
 		UI().exit();
 	} catch(e) {alert("Error ajaj.error");alert(e);}
 }
@@ -277,6 +280,7 @@ frontpage.jss = function(w, h, iconSize) {
 frontpage.enter = function () {
 	try {
 	if (location.hash != '') state.commit();
+		console.log("fubar");
 	$("#frontpage .frontpage-button.game").clickOnce(frontpage.click.goGame);
 	$("#frontpage .frontpage-button.connection").clickOnce(frontpage.click.goConnection);
 	$("#frontpage .frontpage-button.info").clickOnce(frontpage.click.goInfo);
@@ -288,6 +292,7 @@ frontpage.enter = function () {
 frontpage.click = {};
 frontpage.click.goGame = function(){
 	try {
+		console.log("goGame");
 	state.set('screen', 'game').validate();
 	} catch(e) {alert("Error frontpage.click.goGame");alert(e);}
 };
@@ -364,7 +369,7 @@ game.jss = function(w, h, iconSize) {
 game.enter = function () {
 	try {
 	if (!state.game) {
-		var notAlreadyFetching = !runstate.gameFetched;
+		var notAlreadyFetching = !runstate.gameFetched || runstate.gameFetched == nullFunction;
 		runstate.gameFetched = function(data) {
 			try {
 			state.game = data;
@@ -396,7 +401,7 @@ game.leave = function () {
 	try {
 	$("#game .relations").empty();
 	$('#game #mn-caption').stop().clearQueue();
-	if (runstate.gameFetched) runstate.gameFetched = function() {};
+	if (runstate.gameFetched) runstate.gameFetched = nullFunction;
 	} catch(e) {alert("Error game.leave");alert(e);}
 };
 
@@ -496,7 +501,7 @@ score.jss = function(w, h, iconSize) {
 score.enter = function () {
 	try {
 	if (!state.hasScore) {
-		var notAlreadyFetching = !runstate.scoreFetched;
+		var notAlreadyFetching = !runstate.scoreFetched || runstate.scoreFetched == nullFunction;
 		runstate.scoreFetched = function(data) {
 			try {
 			for (var i = 0; i < data.scores.length; ++i) {
@@ -534,7 +539,7 @@ score.enter = function () {
 
 score.leave = function () {
 	try {
-	if (runstate.scoreFetched) runstate.scoreFetched = function() {};
+	if (runstate.scoreFetched) runstate.scoreFetched = nullFunction;
 	$("#score .scores").empty();
 	$("#templates .scoreTotal").empty();
 	} catch(e) {alert("Error score.leave");alert(e);}
@@ -625,9 +630,9 @@ connection.connect = function() {
 connection.connectFetched = function(data) {
 	try {
 		if (data && data.loginOk) {
-			alert("Vous êtes connecté !");
+			UI().info("Connexion", "Vous êtes connecté !");
 		} else if (data && data.isError && data.error == 3) {
-			alert(data.msg);
+			UI().info("Connexion", data.msg);
 		} else {
 			ajaj.smallError(data);
 		}

code/serveur/php/server.php

@@ -104,10 +104,15 @@ function main()
 			throw new Exception("La requête est incomplète", 2);
 		
 		decodeAndInsertGame($user,$_GET['game']);
+	} elseif ($action == 7) {         // Get user prefs
+		userPrefs($user);
+	} elseif ($action == 8) {         // Set user pref
+		if (!isset($_GET['key']) || !isset($_GET['value']))
+			throw new Exception("La requête est incomplète", 2);
+		setUserPref($user, $_GET['key'], $_GET['value']);
 	} else {
 		throw new Exception("Commande inconnue", 2);
 	}
-	// Attention, il y a une $action == 7, mais plus haut.
 }
 
 function server() {