ADD euphorik_bd:print_users/0 et /1 pour afficher les utilisateurs

diff --git a/css/1/euphorik.css b/css/1/euphorik.css
index 09333a2..e73c696 100755 (executable)
--- a/css/1/euphorik.css
+++ b/css/1/euphorik.css
@@ -6,8 +6,8 @@
 \r
 \r
 * {\r
 \r
 \r
 * {\r

-       padding: 0;\r
-       margin: 0;\r
+       padding: 0px;\r
+       margin: 0px;\r

 }\r
 \r
 body {\r
 }\r
 \r
 body {\r

diff --git a/css/1/pageMinichat.css b/css/1/pageMinichat.css
index 3c978d4..35c7cde 100755 (executable)
--- a/css/1/pageMinichat.css
+++ b/css/1/pageMinichat.css
@@ -8,6 +8,7 @@
 }
 
 #smiles {
 }
 
 #smiles {

+       text-align: center;

        border: 1px solid;
        border-color: #253f18;
        background-color: #0c2003;
        border: 1px solid;
        border-color: #253f18;
        background-color: #0c2003;


@@ -68,6 +69,12 @@
    margin-bottom: 15px;
    padding-left: 10px;
 }
    margin-bottom: 15px;
    padding-left: 10px;
 }

+
+#page.minichat form p {
+   margin: 0px;
+   padding: 0px;
+}
+

 #page.minichat form .pseudo {
    margin-right: 5px;
    width: 12%
 #page.minichat form .pseudo {
    margin-right: 5px;
    width: 12%


@@ -83,7 +90,7 @@
        background-repeat: no-repeat;
        background-position: 5px 2px;
        vertical-align: top;
        background-repeat: no-repeat;
        background-position: 5px 2px;
        vertical-align: top;

-   margin-right: 5px;
+       margin-right: 5px;

 }
 #page.minichat form .smiles {
        height: 16px;
 }
 #page.minichat form .smiles {
        height: 16px;


@@ -92,6 +99,7 @@
        background-repeat: no-repeat;
        background-position: 2px 2px;
        vertical-align: top;
        background-repeat: no-repeat;
        background-position: 2px 2px;
        vertical-align: top;

+       margin-right: 5px;

 }
 
 /* voir pour l'astuce css "float left" des conversations : http://www.quirksmode.org/css/clearing.html */
 }
 
 /* voir pour l'astuce css "float left" des conversations : http://www.quirksmode.org/css/clearing.html */

diff --git a/js/pageAdmin.js b/js/pageAdmin.js
index db0a42c..a0b8d68 100644 (file)
--- a/js/pageAdmin.js
+++ b/js/pageAdmin.js
@@ -116,6 +116,8 @@ function Trolls(client, util, formateur)
 
 Trolls.prototype.modifier = function(id, content)
 {
 
 Trolls.prototype.modifier = function(id, content)
 {

+   var thisTrolls = this
+   

    var dataToSend =
       {
          "action" : "mod_troll",
    var dataToSend =
       {
          "action" : "mod_troll",


@@ -137,7 +139,7 @@ Trolls.prototype.modifier = function(id, content)
                ;;; dumpObj(data)
                if (data["reply"] == "error")
                {
                ;;; dumpObj(data)
                if (data["reply"] == "error")
                {

-                  thisPageAdmin.util.messageDialogue(data["error_message"])
+                  thisTrolls.util.messageDialogue(data["error_message"])

                }
             }
       }
                }
             }
       }


@@ -149,6 +151,8 @@ Trolls.prototype.modifier = function(id, content)
   */
 Trolls.prototype.supprimer = function(id) 
 {
   */
 Trolls.prototype.supprimer = function(id) 
 {

+   var thisTrolls = this
+

    var dataToSend =
       {
          "action" : "del_troll",
    var dataToSend =
       {
          "action" : "del_troll",


@@ -169,7 +173,7 @@ Trolls.prototype.supprimer = function(id)
                ;;; dumpObj(data)
                if (data["reply"] == "error")
                {
                ;;; dumpObj(data)
                if (data["reply"] == "error")
                {

-                  thisPageAdmin.util.messageDialogue(data["error_message"])
+                  thisTrolls.util.messageDialogue(data["error_message"])

                }
             }
       }
                }
             }
       }


@@ -275,6 +279,9 @@ Trolls.prototype.rafraichirTrolls = function()
             case "troll_deleted" :
                $("#trolls #troll"+data["troll_id"]).remove()
                break
             case "troll_deleted" :
                $("#trolls #troll"+data["troll_id"]).remove()
                break

+            case "error" :
+               thisTrolls.util.messageDialogue(data["error_message"])
+               break

          }
       }
    )
          }
       }
    )

diff --git a/js/pageMinichat.js b/js/pageMinichat.js
index 883d1da..d940421 100755 (executable)
--- a/js/pageMinichat.js
+++ b/js/pageMinichat.js
@@ -552,7 +552,7 @@ Conversation.prototype.flush = function(funClickOuvrirConv)
                function(e)
                {     
                   var userId =  parseInt($(this).attr("id").substr(4))
                function(e)
                {     
                   var userId =  parseInt($(this).attr("id").substr(4))

-                  var element = $(e.target)
+                  var element = $(this)

                   var h = element.height()
                   var offset = element.offset()
                   var outils = $("#outilsBan").css("top", offset.top - 2).css("left", offset.left - 2).height(h < 16 ? 16 : h).width(element.width() + 16 * 3 + 4 + 64).show()
                   var h = element.height()
                   var offset = element.offset()
                   var outils = $("#outilsBan").css("top", offset.top - 2).css("left", offset.left - 2).height(h < 16 ? 16 : h).width(element.width() + 16 * 3 + 4 + 64).show()

diff --git a/modules/erl/euphorik_bd.erl b/modules/erl/euphorik_bd.erl
index a6099fe..3f74689 100755 (executable)
--- a/modules/erl/euphorik_bd.erl
+++ b/modules/erl/euphorik_bd.erl
@@ -19,7 +19,8 @@
    update_date_derniere_connexion/1,
    update_ip/2,
    update_pseudo_user/2,
    update_date_derniere_connexion/1,
    update_ip/2,
    update_pseudo_user/2,

-   users/0,
+   print_users/0,
+   print_users/1,

    user_by_cookie/1,   
    user_by_id/1,   
    user_by_login/1,
    user_by_cookie/1,   
    user_by_id/1,   
    user_by_login/1,


@@ -240,12 +241,36 @@ update_pseudo_user(UserId, Pseudo) ->
       end
    ).
    
       end
    ).
    

-
-% Renvoie tous les users.
-users() ->
+   
+% Affiche N user trié par leur date de dernière connexion.
+% Attention : pas d'index sur ce champs (la date)   
+print_users(N) ->

    resultat_transaction(mnesia:transaction(fun() ->
    resultat_transaction(mnesia:transaction(fun() ->

-      e(q([E || E <- mnesia:table(user)]))
-   end)).   
+      C = cursor(q([E || E <- qlc:keysort(9, mnesia:table(user), [{order, descending}])])),
+      Users = qlc:next_answers(C, N),
+      lists:foreach(
+         fun(U) ->
+            #user{id = Id, pseudo = Pseudo, login = Login, ek_master = Ek_master, date_derniere_connexion = Date} = U,
+            {{Annee, Mois, Jour}, {Heure, Min, _}} = calendar:now_to_local_time(Date),
+            io:format(
+               "~4w : ~10.10..s~10.10..s ~2w.~2.2.0w.~w - ~2wh~2.2.0w~n",
+               [  
+                  Id,
+                  if Ek_master -> "*"; true -> "" end ++ Pseudo,
+                  "(" ++ Login ++ ")",
+                  Jour, Mois, Annee, Heure, Min
+               ]
+            )
+         end,
+         Users
+      ),
+      qlc:delete_cursor(C)
+   end)).
+   
+
+% Affiche tous les users.
+print_users() ->
+   print_users(all_remaining).

    
 
 % Est-ce qu'un utilisateur existe en fonction de son cookie ?
    
 
 % Est-ce qu'un utilisateur existe en fonction de son cookie ?


@@ -586,7 +611,7 @@ can_register(IP) ->
    )).
    
 
    )).
    
 

-% Renvoie tous les trolls.
+% Renvoie tous les trolls

 trolls() ->
    resultat_transaction(mnesia:transaction(
       fun() ->
 trolls() ->
    resultat_transaction(mnesia:transaction(
       fun() ->