REPORT branche 1.1 528->528

diff --git a/VERSION b/VERSION
index a700546..9fb5261 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0a\r
+1.2.0a
\ No newline at end of file

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index aea8e2d..86c059e 100755 (executable)
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -260,7 +260,7 @@ euphorik.PageMinichat.prototype.envoyerMessage = function(message) {
    
    this.communication.requete(
       "put_message",
-      this.getJSONMessage(nick, message),
+      this.getJSONMessage(this.client.nick, message),
       function() {
          $("form#posterMessage input.message").val("");
          thisPageMinichat.conversations.enleverMessagesRepond(); 

diff --git a/modules/erl/euphorik_protocole.erl b/modules/erl/euphorik_protocole.erl
index a61d0c8..947a18b 100755 (executable)
--- a/modules/erl/euphorik_protocole.erl
+++ b/modules/erl/euphorik_protocole.erl
@@ -103,7 +103,7 @@ loginUser(User, IP) ->
 generer_cookie() ->\r
    {A1, A2, A3} = now(),\r
    random:seed(A1, A2, A3),\r
-   erlang:integer_to_list(random:uniform(math:pow(10, 32)), 36).\r
+   erlang:integer_to_list(random:uniform(trunc(math:pow(10, 32))), 36).\r
 \r
 \r
 % Modification du profile.\r