X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=373a7213fd70211993f93cfa8f5c8fa68d829ce2;hb=4e8dece98633187fad214fb847a189a3f460e4af;hp=cc4390146e0040a155114493539ffef4203bf73f;hpb=592e26ff713393b42690190ef9496acde56ccd9a;p=brisk.git

diff --git a/web/index.php b/web/index.php
index cc43901..373a721 100644
--- a/web/index.php
+++ b/web/index.php
@@ -126,22 +126,18 @@ $mlang_room = array( 'userpassuse'  => array('it' => 'Il tuo nickname è g
                                              'en' => 'guarantee for a friend'),
                      'tit_warr'     => array('it' => 'Garantisci per un tuo conoscente.',
                                              'en' => 'Guarantee for a friend.'),
-                     'itm_list'     => array('it' => 'ascolta',
-                                             'en' => 'listen'),
+                     'itm_list'     => array('it' => 'visualizza',
+                                             'en' => 'visualize'),
                      'list_desc'    => array('it' => 'imposta le regole di ascolto',
                                              'en' => 'set the listen rules'),
-                     'tit_listall'  => array('it' => 'tutti',
+                     'tit_listall'  => array('it' => 'tutti gli utenti',
                                              'en' => 'everybody'),
-                     'listall_desc' => array('it' => 'leggi tutti i messaggi di tutti gli utenti collegati',
-                                             'en' => 'listen all messages from each user connected'),
-                     'tit_listaut'  => array('it' => 'solo autenticati',
-                                             'en' => 'only authorized'),
-                     'tit_listisol'  => array('it' => 'isolamento',
-                                             'en' => 'isolation'),
-                     'listaut_desc' => array('it' => 'leggi soltanto i messaggi degli utenti con password',
-                                             'en' => 'listen messages only from authenticated users'),
-                     'listisol_desc'=> array('it' => 'visualizza Brisk come se fosse solo per utenti con password',
-                                            'en' => 'show Brisk like an authenticated user only site'),
+                     'listall_desc' => array('it' => 'visualizza tutti gli utenti collegati',
+                                             'en' => 'visualize all connected users'),
+                     'tit_listisol'  => array('it' => 'solo gli user autenticati',
+                                             'en' => 'authenticated users only'),
+                     'listisol_desc' => array('it' => 'visualizza solo gli user autenticati e i tavoli a loro riservati',
+                                             'en' => 'visualize authenticated users only and reserved tables to them'),
                      'suppcomp_tit' =>  array('it' => 'personalizza la tua S',
                                             'en' => 'customize your S'),
                      'suppcomp_r' =>  array('it' => 'rosso',
@@ -206,6 +202,10 @@ $mlang_room = array( 'userpassuse'  => array('it' => 'Il tuo nickname è g
                                               'en' => 'cookie policy'),
                      'itm_cook'      => array('it' => 'cookie',
                                               'en' => 'cookie'),
+                     'tit_dtmg'      => array('it' => 'trattamento dati personali',
+                                              'en' => 'personal data management'),
+                     'itm_dtmg'      => array('it' => 'dati personali',
+                                              'en' => 'personal data'),
                      'tit_cla'      => array('it' => 'classifiche degli utenti',
                                              'en' => 'user\'s placings'),
                      'itm_cla'      => array('it' => 'classifiche',
@@ -489,7 +489,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
                 }
             }
             else {
-                fprintf(STDERR, "POST CHECK QUI\n");
+                // fprintf(STDERR, "POST CHECK QUI\n");
                 /* Login Rendering */
                 switch($idx) {
                 case -4:
@@ -524,24 +524,33 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
     if ($ACTION == "room") {
         $tables .= '<div class="room_tab">';
         $tables .= '<table class="room_tab">';
+
+        $direct = ($user->is_auth() && !$user->is_appr());
         for ($ii = 0 ; $ii < TABLES_N ; $ii++) {
-            if ($user->is_auth() && !$user->is_appr())
+            if ($direct)
                 $i = $ii;
             else
                 $i = TABLES_N - $ii - 1;
 
             if ($ii % 4 == 0) {
-                $tables .= '<tr id = "tr_noauth'.$ii.'">';
-            }
-            if (TRUE || !($user->flags & USER_FLAG_ISOLAUTH) || $ii < TABLES_AUTH_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>';
-                $tables .= sprintf('<div class="proxhr" id="table%d"></div>', $i);
-                $tables .= sprintf('<div class="table_act" id="table_act%d"></div>', $i);
-                $tables .= '</div>';
-                $tables .= '</td>'."\n";
+                if ($direct) {
+                    $noauth_class = ($i + 3 < TABLES_APPR_N ? "" : "noauth");
+                }
+                else {
+                    $noauth_class = ($i < TABLES_APPR_N ? "" : "noauth");
+                }
+                $tables .= sprintf('<tr class="%s">', $noauth_class);
             }
+
+            $noauth_class = ($i < TABLES_APPR_N ? "" : "noauth");
+            $tables .= sprintf('<td class="%s">', $noauth_class);
+
+            $tables .= '<div class="room_div"><div class="room_tit"><b>'.$mlang_room['tit_tabl'][$G_lang].$i.'</b></div>';
+            $tables .= sprintf('<div class="proxhr" id="table%d"></div>', $i);
+            $tables .= sprintf('<div class="table_act" id="table_act%d"></div>', $i);
+            $tables .= '</div>';
+            $tables .= '</td>'."\n";
+
             if ($ii % 4 == 3) {
                 $tables .= '</tr>';
             }
@@ -682,19 +691,19 @@ google_color_url = "000000";
     $brisk_header_form = '<div class="container">
 <!-- =========== header ===========  -->
 <div id="header" class="header">
-<table width="100%%" border="0" cols="3"><tr>
-<td align="left"><div style="padding-left: 8px;">'.$banner_top_left.'</div></td>
-<td align="center">'.(($G_with_topbanner || $G_with_donors) ? '<table><tr><td>' : '').'<div style="text-align: center;">
+<table width="100%%" style="min-height: 84px;" border="0" cols="3"><tr>
+<td style="width: 33%%;" align="left"><div style="padding-left: 8px;">'.$banner_top_left.'</div></td>
+<td style="width: 34%%;" align="center">'.(($G_with_topbanner || $G_with_donors) ? '<table><tr><td>' : '').'<div style="text-align: center;">
  <img class="nobo" src="img/brisk_logo64.png">'
 /*    <img class="nobo" src="img/brisk_logo64_blackribbon.png" title="ciao Prof" alt="ciao Prof">' */
     .$mlang_room['headline'][$G_lang].'<br>
     </div>'.( ($G_with_topbanner || $G_with_donors) ? sprintf('</td><td>%s</td></tr></table>',
                                                                 ($G_with_topbanner ? $G_topbanner :
 "<div style='background-color: #ffd780; border: 1px solid black; text-align: center;'><img class='nobo' src=\"donometer.php?c=".$G_donors_cur."&a=".$G_donors_all."\"><div style='padding: 1px; background-color: white;'><b>donatori</b></div></div>") ) : '').'</td>
-<td align="right"><div style="padding-right: 8px;">
-'.$banner_top_right.'</div></td>
+<td style="width: 33%%;" align="right"><div style="padding-right: 8px;">'.$banner_top_right.'</div></td>
 </tr></table>
 </div>';
+// <td style="width: 33%%;" align="right">'.$banner_top_right.'</td>
 
     /* MLANG: ALL THE VERTICAL MENU */
     $brisk_vertical_menu = '
@@ -752,6 +761,11 @@ google_color_url = "000000";
    onmouseover="menu_hide(0,1);"
    title="'.$mlang_room['tit_cook'][$G_lang].'"
    alt="'.$mlang_room['tit_cook'][$G_lang].'">'.$mlang_room['itm_cook'][$G_lang].'</a><br>
+
+<a target="_blank" href="http://www.alternativeoutput.it/personal_data.php"
+   onmouseover="menu_hide(0,1);"
+   title="'.$mlang_room['tit_dtmg'][$G_lang].'"
+   alt="'.$mlang_room['tit_dtmg'][$G_lang].'">'.$mlang_room['itm_dtmg'][$G_lang].'</a><br>
 <hr>
 
 <a href="#"
@@ -1015,25 +1029,29 @@ 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 src="ajax.googleapis.com/ajax/libs/jquery/3.5.0/jquery.min.js"></script>
+<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 $$ = jQuery.noConflict();
+
+var myname = null;
 var g_debug = 0;
 var g_lang = "<? echo $G_lang; ?>";
 var g_lng = "<? echo $G_lng; ?>";
@@ -1042,7 +1060,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;
@@ -1185,24 +1202,27 @@ 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 src="ajax.googleapis.com/ajax/libs/jquery/3.5.0/jquery.min.js"></script>
+<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 $$ = jQuery.noConflict();
+
    var sess = "not_connected";
    var g_debug = 0;
    var g_lang = "<? echo $G_lang; ?>";
@@ -1212,7 +1232,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;
@@ -1507,12 +1526,7 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
 '"><span id="list_all">
 <?php echo $mlang_room['tit_listall'][$G_lang];?>
 </span></td></tr>
-<tr><td><input style="vertical-align: bottom;" id="ra_listen_auth" type="radio" name="listen" value="1" onclick="prefs_update('listen');" title="'
-<?php echo $mlang_room['listaut_desc'][$G_lang];?>
-'"><span id="list_auth">
-<?php echo $mlang_room['tit_listaut'][$G_lang];?>
-</span></td></tr>
-<tr><td><input style="vertical-align: bottom;" id="ra_listen_isol" type="radio" name="listen" value="2" onclick="prefs_update('listen');" title="'
+<tr><td><input style="vertical-align: bottom;" id="ra_listen_isol" type="radio" name="listen" value="1" onclick="prefs_update('listen');" title="'
 <?php echo $mlang_room['listisol_desc'][$G_lang];?>
 '"><span id="list_isol">
 <?php echo $mlang_room['tit_listisol'][$G_lang];?>