X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=510a184333ec7f751eab46b494eb988e5116963a;hb=f3b76ddf96b6efe09b15a3784c45753b97d0c0ec;hp=baad9b5c62d8924431051ae90c8199d44ed17ca4;hpb=bdc40b38c38e78e26d6f4a8a3a7a4be650eb7d2b;p=brisk.git

diff --git a/web/index.php b/web/index.php
index baad9b5..510a184 100644
--- a/web/index.php
+++ b/web/index.php
@@ -344,6 +344,9 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
     GLOBAL $G_lang, $G_lng, $mlang_room;
     GLOBAL $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER, $_COOKIE;
 
+    $transp_port = ((array_key_exists("X-Forwarded-Proto", $header) &&
+                     $header["X-Forwarded-Proto"] == "https") ? 443 : 80);
+
     if (($sess = gpcs_var('sess', $get, $post, $cookie)) === FALSE)
         $sess = "";
     if (($name = gpcs_var('name', $get, $post, $cookie)) === FALSE)
@@ -415,7 +418,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
             log_main("pre garbage_manager UNO");
             $brisk->garbage_manager(TRUE);
             log_main("post garbage_manager");
-            if (($user = &$brisk->get_user($sess, &$idx)) != FALSE) {
+            if (($user = $brisk->get_user($sess, $idx)) != FALSE) {
                 if ($user->the_end == FALSE) {
                     $brisk->sess_cur_set($user->sess);
                     log_main("user stat: ".$user->stat);
@@ -448,7 +451,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
             /* try login */
 
             if ($banned == FALSE &&
-                ($user = $brisk->add_user(&$sess, &$idx, $name, $pass_private,
+                ($user = $brisk->add_user($sess, $idx, $name, $pass_private,
                                           $remote_addr, $header, $cookie)) != FALSE) {
                 $brisk->sess_cur_set($user->sess);
                 $ACTION = "room";
@@ -506,7 +509,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f
         $tables .= '<div class="room_tab">';
         $tables .= '<table class="room_tab">';
         for ($ii = 0 ; $ii < TABLES_N ; $ii++) {
-            if ($user->is_auth())
+            if ($user->is_auth() && !$user->is_appr())
                 $i = $ii;
             else
                 $i = TABLES_N - $ii - 1;
@@ -1234,7 +1237,7 @@ cookie_law(null);
         sidebanners_init($G_sidebanner_idx);
 ?>
      sess = "<?php echo "$sess"; ?>";
-xstm = new xynt_streaming(window, "<?php echo "$transp_type"; ?>", 80, 2, null /* console */, gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd.php', function(com){eval(com);});
+xstm = new xynt_streaming(window, <?php printf("\"%s\", %d", $transp_type, $transp_port); ?>, 2, null /* console */, gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd.php', function(com){eval(com);});
      xstm.hbit_set(heartbit);
      tra = new train($('room_tit'));
      window.onunload = onunload_cb;
@@ -1379,9 +1382,9 @@ type="submit" class="button" onclick="this.form.elements['realsub'].value = 'chi
 <tr><td class="le"><b><?php echo $mlang_room['info_login'][$G_lang]; ?></b></td><td class="ri"><span class="login_id"></span></td></tr>
 <tr><td class="le"><b><?php echo $mlang_room['info_state'][$G_lang]; ?></b></td><td class="ri"><span class="state_id"></span></td></tr>
 <tr><td class="le"><b><?php echo $mlang_room['info_guar'][$G_lang]; ?></b></td><td class="ri"><span class="guar_id"></span></td></tr>
-<tr><td colspan="2" style="background-color: pink;">di seguito le opzioni che verranno attivate successivamente:</td></tr>
 <tr><td class="le"><b><?php echo $mlang_room['info_match'][$G_lang]; ?></b></td><td class="ri"><span class="match_id"></span></td></tr>
 <tr><td class="le"><b><?php echo $mlang_room['info_game'][$G_lang]; ?></b></td><td class="ri"><span class="game_id"></span></td></tr>
+<tr><td colspan="2" style="background-color: pink;">di seguito le opzioni che verranno attivate successivamente:</td></tr>
 <tr><td class="le ri" colspan="2"><b><?php echo $mlang_room['info_frie'][$G_lang]; ?></b></td></tr>
 <tr><td class="le info-opt"><input type="radio" name="friend" class="friend_id" value="black">Da evitare</td>
     <td class="ri info-opt"><input type="radio" name="friend" class="friend_id" value="friend">Amico</td></tr>