Merge branch 'master' into post-bold2

[brisk.git] / web / index.php

diff --git a/web/index.php b/web/index.php
index 6e6d50a..3dcaf6b 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -537,7 +537,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
             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,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; ?>";
@@ -1051,7 +1052,6 @@ var g_tables_appr_n = <? echo TABLES_APPR_N; ?>;
 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 @@ 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,7 +1221,6 @@ cookie_law(null);
    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;