X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fcommons.js;h=762b60075926cc88c1397e9c7b161a9a0fd1a789;hb=85d33c91dd06d280c8e5732874381975cd33e10d;hp=d3bfce6e31589bc2de6f9acc11e190ee0fe9ef10;hpb=e77392cc2a719cd0f3817e9092a3978cb5de23d3;p=brisk.git

diff --git a/web/commons.js b/web/commons.js
index d3bfce6..762b600 100644
--- a/web/commons.js
+++ b/web/commons.js
@@ -41,10 +41,8 @@ var mlang_commons = { 'imgload_a' : { 'it' : 'Immagini caricate ',
                                       'en' : 'Exit.' },
                       'tit_list'  : { '0'  : { 'it' : '',
                                                'en' : '' },
-                                      '1'  : { 'it' : '(solo aut.)',
-                                               'en' : '(only aut.)' },
-                                      '2'  : { 'it' : '(isolam.to)',
-                                               'en' : '(isolation)' } },
+                                      '1'  : { 'it' : '(autenticati)',
+                                               'en' : '(authenticated)' } },
                       'tos_refu'  : { 'it' : 'Rifiutando di sottoscrivere i nuovi termini del servizio non ti sarà più possibile accedere come utente registrato al sito, sei proprio sicuro di voler rifiutare le nuove condizioni d\'uso ?',
                                       'en' : 'EN Rifiutando di sottoscrivere i nuovi termini del servizio non ti sarà più possibile accedere come utente registrato al sito, sei proprio sicuro di voler rifiutare le nuove condizioni d\'uso ?'
                                     }
@@ -130,7 +128,7 @@ function getStyle(x,IEstyleProp, MozStyleProp)
 		var fo = function () {								
 		    fn.apply(window,param);
 		};			
-		return nativeSetTimeout(fo,ms); 
+		return nativeSetTimeout(fo,ms);
 	    })(fn,ms,param);
 	}
 	else if(typeof(fn)=='string')
@@ -264,35 +262,59 @@ function createXMLHttpRequest() {
     return null;
 }
 
-function send_mesg(mesg)
+function send_mesg(mesg, content)
 {
     var is_conn = (sess == "not_connected" ? false : true);
 
     if (is_conn && xstm && xstm.transp_type.startsWith('websocket')) {
-        var target = window.location.href.substring(
-            0, window.location.href.lastIndexOf('/') + 1) + 'index_wr.php'; 
-        var ws_msg = {target: target, mesg: mesg, stp:gst.st, sess:sess};
-        xstm.transp.ws.send(ws_msg);
+        if (typeof(content) != 'undefined') {
+            mesg = mesg + content;
+        }
+        var target = window.location.href.substring(0,
+            window.location.href.lastIndexOf('/') + 1) + 'index_wr.php';
+        var ws_msg = JSON.stringify({
+            target: target,
+            mesg: mesg,
+            stp:gst.st,
+            sess:sess,
+            table_idx: readCookie("table_idx"),
+            table_token: readCookie("table_token"),
+            lang: readCookie("lang")
+            });
+        // console.log(ws_msg);
+        xstm.send(ws_msg);
+        /*
+        if (xstm.transp.ws.readyState == 1) {
+            xstm.transp.ws.send(ws_msg);
+        }
+        else {
+            xstm.transp.out_queue.push(ws_msg);
+        }
+        */
+
     }
     else {
-        var xhr_wr = createXMLHttpRequest();
-        
-        // alert("xhr_wr: "+xhr_wr+"  is_conn: "+is_conn);
-        xhr_wr.open('GET', 'index_wr.php?&'+(is_conn ? 'sess='+sess : '')+'&stp='+gst.st+'&mesg='+mesg, (is_conn ? true : false));
-        xhr_wr.setRequestHeader("If-Modified-Since", new Date().toUTCString());
-        xhr_wr.onreadystatechange = function() { return; };
-        if (typeof(g_debug) == 'number' && g_debug > 0
-            && typeof(console) == 'object' && typeof(console.log) == 'function') {
+    var xhr_wr = createXMLHttpRequest();
+
+    if (typeof(content) != 'undefined') {
+        mesg = mesg + encodeURIComponent(content);
+    }
+    // alert("xhr_wr: "+xhr_wr+"  is_conn: "+is_conn);
+    xhr_wr.open('GET', 'index_wr.php?&'+(is_conn ? 'sess='+sess : '')+'&stp='+gst.st+'&mesg='+mesg, (is_conn ? true : false));
+    xhr_wr.setRequestHeader("If-Modified-Since", new Date().toUTCString());
+    xhr_wr.onreadystatechange = function() { return; };
+    if (typeof(g_debug) == 'number' && g_debug > 0
+        && typeof(console) == 'object' && typeof(console.log) == 'function') {
             var ldate = new Date();
             console.log(ldate.getTime()+':MESG:'+mesg);
+    }
+    xhr_wr.send(null);
+
+    if (!is_conn) {
+        if (xhr_wr.responseText != null) {
+            eval(xhr_wr.responseText);
         }
-        xhr_wr.send(null);
-        
-        if (!is_conn) {
-            if (xhr_wr.responseText != null) {
-                eval(xhr_wr.responseText);
-            }
-        }
+    }
     }
 }
 
@@ -340,7 +362,7 @@ function server_request()
     if (xhr_wr.responseText != null) {
         // console.log("server_request:resp: "+xhr_wr.responseText);
         return (xhr_wr.responseText);
-    } 
+    }
     else
         return (null);
 }
@@ -371,7 +393,7 @@ function act_chatt(value)
         info_show(value.substring(6));
     }
     else {
-        send_mesg("chatt|"+encodeURIComponent(value));
+        send_mesg("chatt|", value);
     }
     /*
     obj.disabled = true;
@@ -420,7 +442,7 @@ function act_mesgtoadm()
 
 function act_tav()
 {
-    act_chatt('/tav '+$('txt_in').value); 
+    act_chatt('/tav '+$('txt_in').value);
     $('txt_in').value = '';
 }
 
@@ -477,7 +499,7 @@ function act_shutdown()
 function postact_logout()
 {
     // alert("postact_logout");
-    try { 
+    try {
 	xstm.abort();
     } catch (e) {}
 
@@ -547,7 +569,7 @@ function sleep(st, delay)
 	       delay, st);
 }
 
-function slowimg(img,x1,y1,deltat,free,action,srcend) {
+function slowimg(img, x1, y1, deltat, free, action, card_id_end) {
     this.img = img;
 
     // this.x0  = parseInt(document.defaultView.getComputedStyle(this.img, "").getPropertyValue("left"));
@@ -560,11 +582,11 @@ function slowimg(img,x1,y1,deltat,free,action,srcend) {
     this.deltat = deltat;
     this.free = free;
     this.action = action;
-    this.srcend = srcend;
+    this.card_id_end = card_id_end;
 }
 
 slowimg.prototype = {
-    img: null, 
+    img: null,
     st: null,
     x0: 0,
     y0: 0,
@@ -580,7 +602,7 @@ slowimg.prototype = {
     deltat:   40,
     tout: 0,
     action: null,
-    srcend: null,
+    card_id_end: null,
 
     setstart: function(x0,y0)
     {
@@ -594,7 +616,7 @@ slowimg.prototype = {
     },
 
 
-    settime: function(time) 
+    settime: function(time)
     {
 	this.time = (time < this.deltat ? this.deltat : time);
 	this.step_n = parseInt(this.time / this.deltat);
@@ -654,8 +676,8 @@ slowimg.prototype = {
 		this.st.st_loc++;
 		this.st = null;
 	    }
-	    if (this.srcend != null) {
-		this.img.src = this.srcend;
+	    if (this.card_id_end != null) {
+		this.img.setAttribute('data-card-id', this.card_id_end);
 	    }
 	}
     }
@@ -909,7 +931,7 @@ notify_ex.prototype = {
     notitag: null,
     toutid: null,
     clo: null,
-    clodiv: null, 
+    clodiv: null,
     butt: null,
     tblkid: null,
 
@@ -1006,7 +1028,7 @@ function remark_off()
 function italizer(ga)
 {
     var pre, pos;
-    if (ga[0] & 2) 
+    if (ga[0] & 2)
         return "<i>"+ga[1]+"</i>";
     else
         return ga[1];
@@ -1155,12 +1177,12 @@ function onunload_cb () {
 function room_checkspace(emme,tables,inpe)
 {
     nome = "<b>";
-    for (i = 0 ; i < emme ; i++) 
+    for (i = 0 ; i < emme ; i++)
 	nome += "m";
     nome += "</b>";
 
     alta = "";
-    for (i = 0 ; i < 5 ; i++) 
+    for (i = 0 ; i < 5 ; i++)
 	alta += nome+"<br>";
 
     for (i = 0 ; i < tables ; i++) {