X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Froom.js;h=6d73e92d50f669eb9f3d6f15a45bf3e1c42b07b1;hb=89023025985f8c0b07bb4e4500c787bfe23d999e;hp=c7efc62fef1cc23e4a272b09260bc499cf5c6f9c;hpb=6d8db1ee47d3c0bb14133d3ab2e0a6bdc7ed60a0;p=brisk.git

diff --git a/web/room.js b/web/room.js
index c7efc62..6d73e92 100644
--- a/web/room.js
+++ b/web/room.js
@@ -426,7 +426,7 @@ function j_stand_cont(ddata)
 
     var usr = $("standup").getElementsByClassName("id_usr");
     for (i = 0 ; i < usr.length ; i++) {
-        addEvent(usr[i], "click", click_update_cb);
+        addEvent(usr[i], "click", info_show_cb);
     }
 }
 
@@ -437,28 +437,6 @@ function esco_cb() {
     act_logout(0);
  };
 
-var g_user_info_target = "";
-
-function info_show(username)
-{
-    // ret = server_request('mesg', 'prefs|save','__POST__', 'prefs', JSON.stringify(g_prefs));
-    var udata = server_request('mesg', 'chatt|/info ' + username);
-
-    // FIXME: just to be finished
-    console.log(udata);
-}
-
-function click_update_cb(e)
-{
-    if (g_user_info_target == e.target.innerHTML) {
-        g_user_info_target = "";
-        info_show(e.target.innerHTML);
-        }
-    else {
-        g_user_info_target = e.target.innerHTML;
-        }
-}
-
 function j_tab_cont(table_idx, data)
 {
     var i;
@@ -472,7 +450,7 @@ function j_tab_cont(table_idx, data)
     $("table"+table_idx).innerHTML = content;
     var usr = $("table"+table_idx).getElementsByClassName("id_usr");
     for (i = 0 ; i < usr.length ; i++) {
-        addEvent(usr[i], "click", click_update_cb);
+        addEvent(usr[i], "click", info_show_cb);
     }
 }
 
@@ -482,6 +460,10 @@ function j_tab_act_cont(idx, act)
         // MLANG 1
         $("table_act"+idx).innerHTML = '<input type="button" class="button" name="xhenter'+idx+'"  value="'+(g_lang == 'en' ? "Sit down." : "Mi siedo.")+'" onclick="act_sitdown('+idx+');">';
     }
+    else if (act == 'sitappr') {
+        // MLANG 1
+        $("table_act"+idx).innerHTML = '<input type="button" style="background-repeat: no-repeat; background-position: center; background-image: url(\'img/okappr.png\');" class="button" name="xhenter'+idx+'"  value="'+(g_lang == 'en' ? "Sit down." : "Mi siedo.")+'" onclick="act_sitdown('+idx+');" title="'+(g_lang == 'en' ? "reserved table for authenticated and apprentice users only" : "tavolo riservato agli utenti registrati e agli apprendisti")+'" alt="'+(g_lang == 'en' ? "reserved table for authenticated and apprentice users only" : "tavolo riservato agli utenti registrati e agli apprendisti")+'">';
+    }
     else if (act == 'sitreser') {
         // MLANG 1
         $("table_act"+idx).innerHTML = '<input type="button" style="background-repeat: no-repeat; background-position: center; background-image: url(\'img/okauth.png\');" class="button" name="xhenter'+idx+'"  value="'+(g_lang == 'en' ? "Sit down." : "Mi siedo.")+'" onclick="act_sitdown('+idx+');" title="'+(g_lang == 'en' ? "reserved table for authenticated users only" : "tavolo riservato agli utenti registrati")+'" alt="'+(g_lang == 'en' ? "reserved table for authenticated users only" : "tavolo riservato agli utenti registrati")+'">';
@@ -509,6 +491,8 @@ function j_tab_act_cont(idx, act)
 
 function j_check_login(login, ret)
 {
+    var cmp;
+
     if (login.length > 12) {
         // FIXME LANG
         ret.ret += (g_lang == 'en' ? "Nickname too long." : "Nickname troppo lungo.");
@@ -520,15 +504,24 @@ function j_check_login(login, ret)
         if ((login[i] >= '0' && login[i] <= '9') ||
             (login[i] >= 'a' && login[i] <= 'z') ||
             (login[i] >= 'A' && login[i] <= 'Z')) {
-            if (old_c != login[i]) {
-                old_c = login[i];
-                old_ct = 0;
+            if (login[i] >= '0' && login[i] <= '9')
+                cmp = '0';
+            else
+                cmp = login[i];
+
+            if (old_c != cmp) {
+                old_c = cmp;
+                old_ct = 1;
             }
             else {
-                if (old_ct > 3) {
+                if (old_ct > 2) {
                     // FIXME LANG
-                    ret.ret = (g_lang == 'en' ? "More than three contiguous '" + old_c + "' not allowed." :
-                               "Il nickname contiene più di tre caratteri '" + old_c + "' consecutivi.");
+                    if (old_c == '0')
+                        ret.ret = (g_lang == 'en' ? "More than two contiguous digits not allowed." :
+                                   "Il nickname contiene più di 2 cifre consecutive.");
+                    else
+                        ret.ret = (g_lang == 'en' ? "More than two contiguous '" + old_c + "' not allowed." :
+                                   "Il nickname contiene più di 2 caratteri '" + old_c + "' consecutivi.");
                     return (false);
                 }
             }
@@ -566,7 +559,7 @@ function j_new_apprentice(form)
             }
 
         // submit the request
-        token = server_request('mesg', 'apprentice',
+        token = server_request('index_wr.php', sess, 'mesg', 'apprentice',
                                'cli_name', encodeURIComponent(form.elements['nameid'].value),
                                'cli_email', encodeURIComponent(form.elements['emailid'].value),
                                'cli_lang', g_lang);
@@ -594,7 +587,7 @@ function j_login_manager(form)
     else {
         // console.log("richiesta token");
         /* richiede token */
-        token = server_request('mesg', 'getchallenge', 'cli_name', encodeURIComponent(form.elements['nameid'].value));
+        token = server_request('index_wr.php', sess, 'mesg', 'getchallenge', 'cli_name', encodeURIComponent(form.elements['nameid'].value));
         tokens = token.split('|');
 
         // console.log('XX token: '+token);
@@ -657,7 +650,7 @@ function mesgtoadm_formtext_hilite(form)
 
 function j_check_email(email, ret)
 {
-    if (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,10})+$/.test(email))
+    if (/^\w+([\.-]*\w+)*@\w+([\.-]*\w+)*(\.\w{2,10})+$/.test(email))
         return (true);
     ret.ret += (g_lang == 'en' ? "Invalid email address. " :
                 "Indirizzo e-mail non valido.");
@@ -685,7 +678,7 @@ function j_authbox(form)
         }
 
         // submit the request
-        token = server_request('mesg', 'warranty',
+        token = server_request('index_wr.php', sess, 'mesg', 'warranty',
                                'cli_name', encodeURIComponent(form.elements['name'].value),
                                'cli_email', encodeURIComponent(form.elements['email'].value) );
         if (token == "1") {
@@ -736,7 +729,7 @@ function j_mesgtoadmbox(form)
         }
 
         // submit the request
-        token = server_request('mesg', 'mesgtoadm',
+        token = server_request('index_wr.php', sess, 'mesg', 'mesgtoadm',
                                'cli_subj', encodeURIComponent(form.elements['subj'].value),
                                'cli_mesg', encodeURIComponent(form.elements['mesg'].value) );
         if (token == "1") {
@@ -789,7 +782,7 @@ function j_pollbox(form)
         else
             choose = form.elements[i].value;
 
-        token = server_request('mesg', 'poll',
+        token = server_request('index_wr.php', sess, 'mesg', 'poll',
                                'cli_choose', encodeURIComponent(choose) );
 
         if (token == "1") {