REPORT de la branche 1.1 450->454

diff --git a/js/pageAdmin.js b/js/pageAdmin.js
index 0dfeb5b..fc1d51a 100644 (file)
--- a/js/pageAdmin.js
+++ b/js/pageAdmin.js
@@ -148,12 +148,12 @@ euphorik.PageAdmin.prototype.majIPs = function() {
          function(data) {               
             if (data.reply === "list_banned_ips") {
                var XHTML = "";
-               data.list.each(function(ip) {
+               data.list.each(function(i, ip) {
                   XHTML += '<div class="ban"><span class="ip">' + ip.ip + '</span>|' +
                      '<span class="temps">' +
                      ip.remaining_time +
                      '</span>|';
-                  ip.users.each(function(user) {
+                  ip.users.each(function(j, user) {
                      XHTML += (j > 0 ? ", " : "") +
                         '<span class="pseudo">' + thisPageAdmin.formateur.traitementComplet(user.nick) + '</span>' +
                         (user.login === "" ? "" : '<span class="login">(' + thisPageAdmin.formateur.traitementComplet(user.login) + ')</span>');

diff --git a/modules/erl/euphorik_bd.erl b/modules/erl/euphorik_bd.erl
index bef8b1f..e5afe74 100755 (executable)
--- a/modules/erl/euphorik_bd.erl
+++ b/modules/erl/euphorik_bd.erl
@@ -652,7 +652,7 @@ can_register(IP) ->
                if T#ip_table.nb_try_register =:= ?NB_MAX_FLOOD_REGISTER, Delta < ?TEMPS_BAN_FLOOD_REGISTER ->\r
                      false;\r
                   true ->\r
-                     mnesia:write(#ip_table{\r
+                     mnesia:write(T#ip_table{\r
                         ip = IP,\r
                         date_last_try_register = now(),\r
                         nb_try_register = T#ip_table.nb_try_register + if Delta < ?TEMPS_FLOOD_REGISTER -> 1; T#ip_table.nb_try_register > 0 -> -1; true -> 0 end\r

diff --git a/tools/start_tv.erl b/tools/start_tv.erl
index 67b6744..8307a0e 100755 (executable)
--- a/tools/start_tv.erl
+++ b/tools/start_tv.erl
@@ -3,7 +3,7 @@
 
 main(_) -> 
    net_kernel:start([tv, shortnames]),
-   Yaws = yaws@flynux,
+   Yaws = yaws_dev@flynux,
    io:format("Connexion à Yaws : ~p~n", [net_adm:ping(Yaws)]),
    mnesia:start(),
    mnesia:change_config(extra_db_nodes, nodes()),

diff --git a/tools/start_yaws.sh b/tools/start_yaws.sh
index fa65406..1a2a144 100755 (executable)
--- a/tools/start_yaws.sh
+++ b/tools/start_yaws.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-yaws --conf ./yaws.conf --sname yaws_dev --mnesiadir "../var/BD/" -I debian_yaws_dev
+screen -S yaws_preprod yaws --conf ./yaws.conf --sname yaws_dev --mnesiadir "../var/BD/" -I debian_yaws_dev

diff --git a/tools/tools.rb b/tools/tools.rb
index 401d318..11570dd 100644 (file)
--- a/tools/tools.rb
+++ b/tools/tools.rb
@@ -134,7 +134,8 @@ class MiseEnProd
       copie_modules_serveurs()
       set_droits_fichiers()
    end
-   
+  
+   # TODO 
    def copierVar
       #TODO
    end
@@ -280,7 +281,7 @@ class Commande
    def afficherUsage
       puts "Usage : tools.rb (prod | pre | js | version)\n" +
          "   prod : Mise en production\n" +
-         "   preprod : Mise en préproduction, copie les données en production\n" +
+         "   pre : Mise en préproduction, copie les données en production\n" +
          "   js : vérification des fichiers JavaScript\n" +
          "   version : met à jour la version à partir du fichier VERSION"
    end