MOD séparation logique du profile des utilisateurs dans la BD

[euphorik.git] / js / client.js

diff --git a/js/client.js b/js/client.js
index 92009f5..9daa0f5 100644 (file)
--- a/js/client.js
+++ b/js/client.js
@@ -105,12 +105,12 @@ euphorik.Client.prototype.pagePrecedente = function(numConv) {
 euphorik.Client.prototype.goPremierePage = function(numConv)\r
 {\r
    if (numConv < 0) {\r
-      if (this.pagePrincipale == 1) {\r
+      if (this.pagePrincipale === 1) {\r
          return false;\r
       }\r
       this.pagePrincipale = 1;\r
    } else {\r
-      if (this.conversations[numConv].page == 1) {\r
+      if (this.conversations[numConv].page === 1) {\r
          return false;\r
       }\r
       this.conversations[numConv].page = 1;\r
@@ -180,13 +180,17 @@ euphorik.Client.prototype.getJSONLoginCookie = function() {
   * de s'autentifier avec (login, password).\r
   */\r
 euphorik.Client.prototype.getJSONEnregistrement = function(login, password) {\r
-   var mess = { "header" : { "action" : "register", "version" : euphorik.conf.versionProtocole } };\r
+   var mess = {\r
+      "header" : { "action" : "register","version" : euphorik.conf.versionProtocole }\r
+   };\r
    \r
    if (login && password) {\r
       mess.login = login;\r
       mess.password = password;\r
    }\r
    \r
+   mess.profile = this.getJSONProfileInfos();\r
+   \r
    return mess;\r
 };\r
 \r
@@ -204,6 +208,12 @@ euphorik.Client.prototype.getJSONProfile = function() {
       "cookie" : this.cookie,\r
       "login" : this.login,\r
       "password" : this.password,\r
+      "profile" : this.getJSONProfileInfos()\r
+   };\r
+};\r
+\r
+euphorik.Client.prototype.getJSONProfileInfos = function() {\r
+   return {\r
       "nick" : this.pseudo,\r
       "email" : this.email,\r
       "css" : this.css,\r
@@ -302,7 +312,7 @@ euphorik.Client.prototype.enregistrement = function(login, password) {
 };\r
 \r
 /**\r
-  * Connexion. Réalisé de manière synchrone.\r
+  * Connexion. Réalisée de manière synchrone.\r
   */\r
 euphorik.Client.prototype.connexion = function(messageJson) {\r
    var thisClient = this;\r
@@ -346,20 +356,20 @@ euphorik.Client.prototype.chargerDonnees = function(data) {
       \r
       this.id = data.id;\r
       this.login = data.login;\r
-      this.pseudo = data.nick;\r
-      this.email = data.email;\r
-      this.setCss(data.css);\r
-      this.chatOrder = data.chat_order;\r
-      this.nickFormat = data.nick_format;\r
-      this.viewTimes = data.view_times;\r
-      this.viewTooltips = data.view_tooltips;\r
-      this.ostentatiousMaster = data.ostentatious_master;\r
+      this.pseudo = data.profile.nick;\r
+      this.email = data.profile.email;\r
+      this.setCss(data.profile.css);\r
+      this.chatOrder = data.profile.chat_order;\r
+      this.nickFormat = data.profile.nick_format;\r
+      this.viewTimes = data.profile.view_times;\r
+      this.viewTooltips = data.profile.view_tooltips;\r
+      this.ostentatiousMaster = data.profile.ostentatious_master;\r
       \r
       // la page de la conversation principale\r
       this.pagePrincipale = 1;\r
       \r
       // les conversations\r
-      this.conversations = data.conversations;\r
+      this.conversations = data.profile.conversations;\r
       this.conversations.map(function(conv) {\r
          return { root : conv.root, page : 1, reduit : conv.minimized };\r
       });\r
@@ -409,11 +419,11 @@ euphorik.Client.prototype.majMenu = function() {
    $("#menu .admin").css("display", this.ekMaster ? displayType : "none");\r
   \r
    // met à jour le menu   \r
-   if (this.statut == euphorik.Client.statutType.auth_registered) {\r
+   if (this.statut === euphorik.Client.statutType.auth_registered) {\r
       $("#menu .profile").css("display", displayType).text("profile");\r
       $("#menu .logout").css("display", displayType);\r
       $("#menu .register").css("display", "none");\r
-   } else if (this.statut == euphorik.Client.statutType.auth_not_registered) {\r
+   } else if (this.statut === euphorik.Client.statutType.auth_not_registered) {\r
       $("#menu .profile").css("display", "none");\r
       $("#menu .logout").css("display", displayType);\r
       $("#menu .register").css("display", displayType);\r