From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Sat, 18 Apr 2020 09:35:24 +0000 (+0200)
Subject: Merge branch 'master' into post-bold2
X-Git-Tag: v5.10.0~55
X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=028592d3d195d45f0e19d324c7d7c029a06d0a0c;hp=-c

Merge branch 'master' into post-bold2
---

028592d3d195d45f0e19d324c7d7c029a06d0a0c
diff --combined web/Obj/brisk.phh
index 3dc4896,f5a3c6d..848b9f4
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@@ -89,6 -89,8 +89,8 @@@ define('BRISK_SINGLE_DEBUG',0)
  define('BRISK_SINGLE_SESS', "");
  define('DEBUGGING', "no-debugging");
  
+ define('BSK_BUSTING', "dev");
+ 
  require_once("$DOCUMENT_ROOT/Etc/".BRISK_CONF);
  require_once("${G_base}Obj/ipclass.phh");
  
@@@ -153,7 -155,7 +155,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.8.0";
+ $G_brisk_version = "5.9.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.',
@@@ -190,7 -192,7 +192,7 @@@ Dopo che &egrave; iniziata una partita 
  <dd><b>/info <i>&lt;login&gt;</i></b> - mostra lo stato corrente dell\'utente passato come argomento e in che relazione siete
  <dd><b>/authreq</b> - se si &egrave; autenticati permette di garantire per un utente fidato
  <dd><b>/mesgtoadm</b> - se si &egrave; autenticati permette di lasciare un messaggio all\'amministratore del sito
 -<dd><b>/listen &lt;all or auth&gt;</b> - se si &egrave; autenticati permette leggere solo i messaggi degli altri autenticati (auth) o di tutti (all)
 +<!-- <dd><b>/listen &lt;all or auth&gt;</b> - se si &egrave; autenticati permette leggere solo i messaggi degli altri autenticati (auth) o di tutti (all) -->
  </dl>
  </div>
  ',
@@@ -223,7 -225,7 +225,7 @@@ Dopo che &egrave; iniziata una partita 
  <dd><b>/info <i>&lt;login&gt;</i></b> - mostra lo stato corrente dell\'utente passato come argomento e in che relazione siete
  <dd><b>/authreq</b> - se si &egrave; autenticati permette di garantire per un utente fidato
  <dd><b>/mesgtoadm</b> - se si &egrave; autenticati permette di lasciare un messaggio all\'amministratore del sito
 -<dd><b>/listen &lt;all or auth&gt;</b> - se si &egrave; autenticati permette leggere solo i messaggi degli altri autenticati (auth) o di tutti (all)
 +<!-- <dd><b>/listen &lt;all or auth&gt;</b> - se si &egrave; autenticati permette leggere solo i messaggi degli altri autenticati (auth) o di tutti (all) -->
  </dl>
  </div>
  ');
@@@ -2028,7 -2030,7 +2030,7 @@@ class Bris
                $to_all = show_notify($msg, 0, $mlang_brisk['btn_close'][$G_lang], 400, 120);
            } while (0);
        } // /alarm chat command
 -      else if (strncmp($msg, "/listen ", 8) == 0) {
 +      else if (FALSE && strncmp($msg, "/listen ", 8) == 0) {
            $arg = substr($msg, 8);
  
            if (strcasecmp($arg, "isolation") == 0) {
@@@ -2698,6 -2700,10 +2700,6 @@@
            }
  
            if ($this->user[$i]->subst == "standup") {
 -              if ($user_cur_id == $i) {
 -                  $flags |= 1;
 -              }
 -
                $content .= sprintf('%s[ %d, "%s"%s ]',($ct > 0 ? ', ' : ''), $flags,
                xcape($this->user[$i]->name), $supp_comp_s);
                $ct++;
@@@ -2730,6 -2736,9 +2732,6 @@@
  
            $flags = $user_cur->flags;
  
 -          if ($user_cur_id == $table->player[$i])
 -              $flags |= 1;
 -
            log_main($user_cur->name. sprintf(" IN TABLE [%d]", $table_idx));
            if ($user_cur->is_supp_custom())
                $supp_comp_s = sprintf(', "%s"', $user_cur->rec->supp_comp_get());
diff --combined web/briskin5/index.php
index 6071c73,e48bf0b..d4159f1
--- a/web/briskin5/index.php
+++ b/web/briskin5/index.php
@@@ -67,19 -67,18 +67,19 @@@ function bin5_index_main($transp_type, 
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  <title>Brisk - Tavolo <?php echo "$table_idx";?></title>
  <link rel="shortcut icon" href="../img/brisk_ico.png">
- <script type="text/javascript" src="../commons.js"></script> 
- <script type="text/javascript" src="../heartbit.js"></script>
- <script type="text/javascript" src="../xynt-streaming.js"></script>
- <script type="text/javascript" src="dnd.js"></script>
- <script type="text/javascript" src="dom-drag.js"></script>
- <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
- <script type="text/javascript" src="briskin5.js"></script>
- <link rel="stylesheet" type="text/css" href="../brisk.css">
- <link rel="stylesheet" type="text/css" href="briskin5.css">
+ <script type="text/javascript" src="../commons.js?v=<? echo BSK_BUSTING; ?>"></script> 
+ <script type="text/javascript" src="../heartbit.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="../xynt-streaming.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="dnd.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="dom-drag.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="briskin5.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <link rel="stylesheet" type="text/css" href="../brisk.css?v=<? echo BSK_BUSTING; ?>">
+ <link rel="stylesheet" type="text/css" href="briskin5.css?v=<? echo BSK_BUSTING; ?>">
  </head>
  <body>
  <SCRIPT type="text/javascript">
 +   var myname = null;
     var sess = "not_connected";
     var xstm = null;
     var g_lang = "<?php echo "$G_lang"; ?>";
@@@ -107,7 -106,6 +107,7 @@@ var g_imgct= 0
  var g_imgtot = g_preload_img_arr.length;
  var g_exitlock = 0;
  
 +
  window.onload = function() {
    g_jukebox = new jukebox([{'name': 'cow', 'file': 'cow.mp3'},
                             {'name': 'rooster', 'file': 'rooster.mp3'},
diff --combined web/index.php
index 269b1fc,66a9780..3dcaf6b
--- a/web/index.php
+++ b/web/index.php
@@@ -537,7 -537,7 +537,7 @@@ function index_main(&$brisk, $transp_ty
              if ($ii % 4 == 0) {
                  $tables .= '<tr id = "tr_noauth'.$ii.'">';
              }
 -            if (TRUE || !($user->flags & USER_FLAG_ISOLAUTH) || $ii < TABLES_AUTH_N) {
 +            if (TRUE || !($user->flags & USER_FLAG_ISOLAUTH) || $i < TABLES_APPR_N) {
                  $tables .= '<td id = "td_noauth'.$ii.'">';
  
                  $tables .= '<div class="room_div"><div class="room_tit"><b>'.$mlang_room['tit_tabl'][$G_lang].$i.'</b></div>';
@@@ -1024,26 -1024,25 +1024,26 @@@ supported by:<br
  <title>Brisk</title>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  <link rel="shortcut icon" href="img/brisk_ico.png">
- <script type="text/javascript" src="commons.js"></script>
- <script type="text/javascript" src="fieldify.js"></script>
- <script type="text/javascript" src="prefs.js"></script>
- <script type="text/javascript" src="info.js"></script>
- <!-- <script type="text/javascript" src="myconsole.js"></script> -->
- <script type="text/javascript" src="menu.js"></script>
- <script type="text/javascript" src="heartbit.js"></script>
- <script type="text/javascript" src="xynt-streaming.js"></script>
- <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
- <script type="text/javascript" src="room.js"></script>
- <script type="text/javascript" src="md5.js"></script>
- <script type="text/javascript" src="probrowser.js"></script>
- <script type="text/javascript" src="json2.js"></script>
- <script type="text/javascript" src="/cookie_law.js"></script>
- <link rel="stylesheet" type="text/css" href="/cookie_law.css">
- <link rel="stylesheet" type="text/css" href="brisk.css">
- <link rel="stylesheet" type="text/css" href="room.css">
+ <script type="text/javascript" src="commons.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="fieldify.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="prefs.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="info.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <!-- <script type="text/javascript" src="myconsole.js?v=<? echo BSK_BUSTING; ?>"></script> -->
+ <script type="text/javascript" src="menu.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="heartbit.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="xynt-streaming.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="room.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="md5.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="probrowser.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="json2.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="/cookie_law.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <link rel="stylesheet" type="text/css" href="/cookie_law.css?v=<? echo BSK_BUSTING; ?>">
+ <link rel="stylesheet" type="text/css" href="brisk.css?v=<? echo BSK_BUSTING; ?>">
+ <link rel="stylesheet" type="text/css" href="room.css?v=<? echo BSK_BUSTING; ?>">
  
  <script type="text/javascript"><!--
 +var myname = null;
  var g_debug = 0;
  var g_lang = "<? echo $G_lang; ?>";
  var g_lng = "<? echo $G_lng; ?>";
@@@ -1052,6 -1051,7 +1052,6 @@@ var g_tables_appr_n = <? echo TABLES_AP
  var g_tables_auth_n = <? echo TABLES_AUTH_N; ?>;
  var g_tables_cert_n = <? echo TABLES_CERT_N; ?>;
  var g_prefs, g_prefs_new = null;
 -var g_listen;
  var g_jukebox = null;
  var g_is_spawn = 0;
  var g_nd = null;
@@@ -1194,23 -1194,23 +1194,23 @@@ cookie_law(null)
  <title>Brisk</title>
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
  <link rel="shortcut icon" href="img/brisk_ico.png">
- <script type="text/javascript" src="commons.js"></script>
- <script type="text/javascript" src="fieldify.js"></script>
- <script type="text/javascript" src="prefs.js"></script>
- <script type="text/javascript" src="info.js"></script>
- <!-- <script type="text/javascript" src="myconsole.js"></script> -->
- <script type="text/javascript" src="menu.js"></script>
- <script type="text/javascript" src="ticker.js"></script>
- <script type="text/javascript" src="heartbit.js"></script>
- <script type="text/javascript" src="xynt-streaming.js"></script>
- <script type="text/javascript" src="room.js"></script>
- <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js"></script>
- <script type="text/javascript" src="probrowser.js"></script>
- <script type="text/javascript" src="json2.js"></script>
- <script type="text/javascript" src="/cookie_law.js"></script>
- <link rel="stylesheet" type="text/css" href="/cookie_law.css">
- <link rel="stylesheet" type="text/css" href="brisk.css">
- <link rel="stylesheet" type="text/css" href="room.css">
+ <script type="text/javascript" src="commons.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="fieldify.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="prefs.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="info.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <!-- <script type="text/javascript" src="myconsole.js?v=<? echo BSK_BUSTING; ?>"></script> -->
+ <script type="text/javascript" src="menu.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="ticker.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="heartbit.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="xynt-streaming.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="room.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="preload_img<?php echo langtolng($G_lang); ?>.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="probrowser.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="json2.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <script type="text/javascript" src="/cookie_law.js?v=<? echo BSK_BUSTING; ?>"></script>
+ <link rel="stylesheet" type="text/css" href="/cookie_law.css?v=<? echo BSK_BUSTING; ?>">
+ <link rel="stylesheet" type="text/css" href="brisk.css?v=<? echo BSK_BUSTING; ?>">
+ <link rel="stylesheet" type="text/css" href="room.css?v=<? echo BSK_BUSTING; ?>">
  <script type="text/javascript"><!--
     var sess = "not_connected";
     var g_debug = 0;
@@@ -1221,6 -1221,7 +1221,6 @@@
     var g_tables_auth_n = <? echo TABLES_AUTH_N; ?>;
     var g_tables_cert_n = <? echo TABLES_CERT_N; ?>;
     var g_prefs, g_prefs_new = null;
 -   var g_listen;
     var g_is_spawn = 0;
     var g_jukebox = null;
     var g_imgct = 0;