Merge branch 'sac-a-push' into sap-fix01

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 0f6f1b0..0d28447 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -140,10 +140,10 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
 $G_lng = langtolng($G_lang);
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "4.4.1";
+$G_brisk_version = "4.4.2";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: nuovo stream dati xhr, prima versione completa.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: nuovo stream dati xhr, prima versione completa, chiusi alcuni bug.',
                                        'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
                        'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: usage of reader/writer locking instead of generic exclusive locking.',
                                        'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );

diff --git a/web/briskin5/index.php b/web/briskin5/index.php
index 181b9e9..ca57254 100644 (file)
--- a/web/briskin5/index.php
+++ b/web/briskin5/index.php
@@ -32,14 +32,8 @@ require_once("Obj/briskin5.phh");
 
 $mlang_bin5_index = array( 'aucwin' => array( 'it' => 'Hai vinto l\'asta.<br> Scegli il seme:',
                                               'en' => 'You win the auction.<br> Choose the seed:' ),
-                           'tit_info'    => array( 'it' => 'Info',
-                                                   'en' => 'Info'),
-                           'tit_relo'    => array( 'it' => 'Reload',
-                                                   'en' => 'Reload'),
-                           'tit_out'     => array( 'it' => 'Fuori',
-                                                   'en' => 'Out'),
-                           'tit_pref'    => array( 'it' => 'Prefs',
-                                                   'en' => 'Prefs'),
+                           'tit_pref'=>array( 'it' => 'Preferenze.',
+                                              'en' => 'Preferences.'),
                            'itm_ringauc' => array('it' => 'riproduci un suono di notifica alla fine dell\' asta',
                                                   'en' => 'play a sound at the end of the auction'),
                            'btn_update'  => array('it' => 'Aggiorna.',
@@ -253,13 +247,11 @@ window.onload = function() {
 <div class="table_commands">
 <table>
 <tr>
-<td style="text-align: center;"><input type="button" class="button" name="xinfo"  value="<?php echo $mlang_bin5_index['tit_info'][$G_lang]; ?>" onclick="act_tableinfo();"></td>
-<td style="text-align: center;"><input type="button" class="button" name="xreload"  value="<?php echo $mlang_bin5_index['tit_relo'][$G_lang]; ?>" onclick="act_reload();"></td>
-<td style="text-align: center;"><input type="button" class="button" name="xout"  value="<?php echo $mlang_bin5_index['tit_out'][$G_lang]; ?>" onclick="safelogout();"></td>
+<td style="text-align: center;"><input type="button" class="button" name="xinfo"  value="Info." onclick="act_tableinfo();"></td>
+<td style="text-align: center;"><input type="button" class="button" name="xreload"  value="Reload." onclick="act_reload();"></td>
+<td style="text-align: center;"><input type="button" class="button" name="xout"  value="Out." onclick="safelogout();"></td>
 </tr><tr>
-<td style="text-align: center;"><img id="stm_stat" class="nobo" src="img/line-status_cb.png"></td>
-<td style="text-align: center;"><input type="button" class="button" name="xpref"  value="<?php echo $mlang_bin5_index['tit_pref'][$G_lang]; ?>" onclick="preferences_showhide();"></td>
-</td>
+<td style="text-align: center;" colspan="2"><input type="button" class="button" name="xpref"  value="<?php echo $mlang_bin5_index['tit_pref'][$G_lang]; ?>" onclick="preferences_showhide();"></td>
 <td style="text-align: center;"><img id="exitlock" class="button" style="visibility: hidden; border: 0px; display: inline; position: relative;" onclick="act_exitlock();"></td>
 </tr>
 </table>

diff --git a/web/heartbit.js b/web/heartbit.js
index c1d0180..d408775 100644 (file)
--- a/web/heartbit.js
+++ b/web/heartbit.js
@@ -1,4 +1,4 @@
-function heartbit_old(symb)
+function heartbit(symb)
 {
     if ($("heartbit").innerHTML.length >= 120) {
         $("heartbit").innerHTML = $("heartbit").innerHTML.substring(10);
@@ -9,13 +9,3 @@ function heartbit_old(symb)
     }
 }
 
-function heartbit(s_stat, w_stat)
-{
-    if (w_stat == "r") {
-        $("stm_stat").src = "img/line-status_cb.png";
-    }
-    else {
-        $("stm_stat").src = "img/line-status_o"+s_stat+".png";
-    }
-}
-

diff --git a/web/index.php b/web/index.php
index 80ed791..d380c15 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -20,7 +20,13 @@
  * not, write to the Free Software Foundation, Inc, 59 Temple Place -
  * Suite 330, Boston, MA 02111-1307, USA.
  *
- */
+
+
+TODO:
+  - header
+  - setcookie
+  - gestire per intero la var globale di output
+*/
 
 require_once("Obj/brisk.phh");
 require_once("Obj/auth.phh");
@@ -847,8 +853,7 @@ supported by:<br>
 </div><br><br></div>
 %s
 %s
-<br>
-<img id="stm_stat" class="nobo" src="img/line-status_cb.png"></div>';
+<br></div>';
     
   /* Templates. */
   if ($ACTION == 'login') {

diff --git a/web/index_wr.php b/web/index_wr.php
index 310e4f2..56e2579 100644 (file)
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -81,7 +81,7 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
 
 function index_wr_main(&$room, $remote_addr, $get, $post, $cookie)
 {
-    GLOBAL $G_shutdown, $G_black_list, $G_lang, $G_room_help, $G_room_about, $mlang_indwr;
+    GLOBAL $G_shutdown, $G_black_list, $G_lang, $G_room_help, $G_room_about, $G_room_passwdhowto, $mlang_indwr;
 
     log_load("index_wr.php");
 

diff --git a/web/xynt-streaming.js b/web/xynt-streaming.js
index dc0043e..50cea6d 100644 (file)
--- a/web/xynt-streaming.js
+++ b/web/xynt-streaming.js
@@ -198,8 +198,6 @@ transport_htmlfile.prototype = {
     },
 
     ctx_new_getchar: function(idx) { /* public */
-       return (this.ifra.contentWindow.ctx_new.charAt(idx));
-
     },
 
     ctx_old_len_is_set: function () { /* public */
@@ -311,7 +309,6 @@ transport_iframe.prototype = {
     },
 
     ctx_new_getchar: function(idx) { /* public */
-       return (this.ifra.contentWindow.ctx_new.charAt(idx));
     },
 
     ctx_old_len_is_set: function () { /* public */
@@ -382,7 +379,7 @@ xynt_streaming.prototype = {
     doc:               null,
     cookiepath: "/brisk/",
     watchdog_hdl:      null,
-    hbit:              function () {},
+    hbit:              null,
     keepalive_old:    -1,
     keepalive_new:    -1,
     keepalives_equal:  0,
@@ -399,9 +396,6 @@ xynt_streaming.prototype = {
     stream:            "",
     the_end:           false,
 
-    w_stat_old:        "",
-    s_stat_old:        "",
-
     start: function() { /* public */
         if (this.the_end) 
             return;
@@ -453,44 +447,12 @@ xynt_streaming.prototype = {
         this.hbit = hbit;
     },
 
-    hbit_status: function () {
-        if (this.watchdog_hdl)
-            w_stat = "g";
-        else
-            w_stat = "r";
-
-        if (this.transp.ctx_new_is_set() &&
-            this.transp.ctx_new_curlen_get() > 0) {
-            if (this.keepalives_equal == 0) {
-                s_stat = "g";
-            }
-            else if (this.keepalives_equal < this.keepalives_eq_max) {
-                s_stat = "y";
-            }
-            else {
-                s_stat = "r";
-            }
-        }
-        else {
-            s_stat = "r";
-        }
-
-        if (this.s_stat_old != s_stat ||
-            this.w_stat_old != w_stat)
-            this.hbit(s_stat, w_stat);
-        this.s_stat_old = s_stat;
-        this.w_stat_old = w_stat;
-    },
-
     watchdog: function () {
         // alert("watchdog");
         var i, again;
         var comm_newpart, comm_len, comm_arr;
         var ctx_new_len;
 
-        this.watchdog_hdl = null;
-
-        this.hbit_status();
         if (this.sandbox != null) {
             // from old: var zug = "POLL sess = "+sess+" stat = "+stat+" subst = "+subst+" step = "+this.gst.st+" step_loc = "+this.gst.st_loc+" step_loc_new = "+this.gst.st_loc_new+" STOP: "+this.stopped;
             var zug = "WATCHDOG  sess = ["+this.sess+"]  step = "+this.gst.st+" step_loc = "+this.gst.st_loc+" step_loc_new = "+this.gst.st_loc_new;          
@@ -529,8 +491,6 @@ xynt_streaming.prototype = {
         }
         if ( (this.watchdog_ct % this.watchdog_checktm) == 0) {
             this.log("hs::watchdog: this.keepalive_old: "+this.keepalive_old+" this.keepalive_new: "+this.keepalive_new);
-
-            // alert("qui "+this.transp.ctx_new_curlen_get()+" "+this.transp.ctx_old_len_get();
             if (this.keepalive_old == this.keepalive_new) {
                 this.keepalives_equal++;
             }
@@ -561,9 +521,9 @@ xynt_streaming.prototype = {
             catch(b) {
                break;
             }
+
             // ctx_new_len = this.ifra.contentWindow.ctx_new.length;
             ctx_new_len = this.transp.ctx_new_curlen_get();
-            this.log("new_len: "+ ctx_new_len);
             // if (ctx_new_len <= this.ifra.contentWindow.ctx_old_len) {
             if (ctx_new_len <= this.transp.ctx_old_len_get()) {
                 break;
@@ -572,8 +532,7 @@ xynt_streaming.prototype = {
             this.keepalive_new++;
             // alert("pre-loop 1");
             for (i = this.transp.ctx_old_len_get() ; i < ctx_new_len ; i++) {
-                // alert("ctx_new_getchar: "+this.transp.ctx_new_getchar(i));
-
+               // if (this.ifra.contentWindow.ctx_new.charAt(i) != '_') {
                if (this.transp.ctx_new_getchar(i) != '_') {
                     // this.log("ctx_new.char(i) != '_' ["+this.ifra.contentWindow.ctx_new.charAt(i)+"]");
                    break;
@@ -644,7 +603,6 @@ xynt_streaming.prototype = {
                 this.transp.postproc();
             }
             this.watchdog_hdl = setTimeout(function(obj) { /* obj.log("tout2"); */ obj.watchdog(); }, this.watchdog_timeout, this);
-            this.hbit_status();
         }
         // alert("watchdog return normal");