Merge remote-tracking branch 'origin/master' into wr-on-ws

Conflicts:
	web/Obj/brisk.phh

diff --combined web/Obj/brisk.phh
index dbe0eca,c8a5b00..83620aa
--- 1/web/Obj/brisk.phh
--- 2/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@@ -153,7 -153,7 +153,7 @@@ $mlang_brisk = array( 'btn_backstand'=
  $G_lng = langtolng($G_lang);
  
  $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
- $G_brisk_version = "5.6.1";
+ $G_brisk_version = "5.7.0";
  
  /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
  $root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: dati dai client via web-socket.',
@@@ -1373,7 -1373,7 +1373,7 @@@ class Bris
          if ($user_cur->is_active() == FALSE)
              continue;
  
 -        if ($user_cur->lacc + EXPIRE_TIME_RD < ($curtime - $delta)) {
 +        if ($user_cur->lacc + (($user_cur->ping_req ? 1.5 : 1.0) * EXPIRE_TIME_RD) < ($curtime - $delta)) {
              // Auto logout dell'utente
              log_rd2("AUTO LOGOUT.".($user_cur->lacc + EXPIRE_TIME_RD)." curtime - delta ".($curtime - $delta));