lastest modifies

[brisk.git] / web / room.js

diff --git a/web/room.js b/web/room.js
index 26d78e9..6d73e92 100644 (file)
--- a/web/room.js
+++ b/web/room.js
@@ -491,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.");
@@ -502,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];
+            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 > 2) {
                     // FIXME LANG
-                    ret.ret = (g_lang == 'en' ? "More than two contiguous '" + old_c + "' not allowed." :
-                               "Il nickname contiene più di 2 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);
                 }
             }
@@ -548,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);
@@ -576,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);
@@ -667,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") {
@@ -718,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") {
@@ -771,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") {