X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=84c3ce6342ea340911b5b7dc139f5eb661af10f2;hb=286da1eb1ec912c9d2c49a132f555b10e0084e53;hp=587acd820d7a36624df988611b2e708fa35779cc;hpb=c3ccbbd5bc7c8534127fa10b4f88b81cffc6029a;p=brisk.git

diff --git a/web/index.php b/web/index.php
index 587acd8..84c3ce6 100644
--- a/web/index.php
+++ b/web/index.php
@@ -220,7 +220,7 @@ function carousel_top()
     return (sprintf('<a target="_blank" href="http://shop.alternativeoutput.it"><img class="nobo" style="display: inline; border: 1px solid #808080;" src="img/briskshop%d.gif"></a>', $rn));
 }
 
-function index_main(&$room, &$header_out, $get, $post, $cookie)
+function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
 {
     GLOBAL $G_with_donors, $G_donors_cur, $G_donors_all;
     GLOBAL $G_with_topbanner, $G_topbanner, $G_is_local;
@@ -231,7 +231,7 @@ function index_main(&$room, &$header_out, $get, $post, $cookie)
     GLOBAL $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER;
 
     if (($sess = gpcs_var('sess', $get, $post, $cookie)) === FALSE) 
-        unset($sess);
+        $sess = "";
     if (($name = gpcs_var('name', $get, $post, $cookie)) === FALSE)
         unset($name);
     if (($pass_private = gpcs_var('pass_private', $get, $post, $cookie)) === FALSE)
@@ -243,7 +243,7 @@ function index_main(&$room, &$header_out, $get, $post, $cookie)
     
     
     // Use of proxies isn't allowed.
-    if (!$G_is_local && is_proxy()) {
+    if (!$G_is_local && is_proxy($addr)) {
         return FALSE;
     }
 
@@ -287,14 +287,14 @@ function index_main(&$room, &$header_out, $get, $post, $cookie)
           
           $room->garbage_manager(TRUE);
           /* try login */
-          if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $_SERVER['REMOTE_ADDR'])) != FALSE) {
+          if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $addr)) != FALSE) {
               $ACTION = "room";
               if ($idx < 0) {
                   $idx = -$idx - 1;
                   $is_login = TRUE;
               }
               
-              log_legal($curtime, $user, "STAT:LOGIN", '');
+              log_legal($curtime, $addr, $user, "STAT:LOGIN", '');
               
               // recovery lost game
               if ($user->stat == "table") {
@@ -865,7 +865,7 @@ supported by:<br>
 <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="myconsole.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-http-streaming.js"></script>
@@ -878,13 +878,14 @@ supported by:<br>
 <link rel="stylesheet" type="text/css" href="room.css">
 
 <SCRIPT type="text/javascript"><!--
+   var g_debug = 0;
    var g_lang = "<? echo $G_lang; ?>";
    var g_lng = "<? echo $G_lng; ?>";
    var g_tables_n = <? echo TABLES_N; ?>;
    var g_tables_auth_n = <? echo TABLES_AUTH_N; ?>;
    var g_listen;
    var g_withflash = false;
-   var g_is_spawn = 0; 
+   var g_is_spawn = 0;
    var gst  = new globst();
    var topbanner_sfx, topbanner_dx;
    var g_brow = null;
@@ -999,7 +1000,7 @@ echo "$body"; ?>
 <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="myconsole.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>
@@ -1012,6 +1013,7 @@ echo "$body"; ?>
 <link rel="stylesheet" type="text/css" href="room.css">
 <SCRIPT type="text/javascript"><!--
    var sess = "not_connected";
+   var g_debug = 0;
    var g_lang = "<? echo $G_lang; ?>";
    var g_lng = "<? echo $G_lng; ?>";
    var g_tables_n = <? echo TABLES_N; ?>;
@@ -1058,7 +1060,7 @@ else {
 
 ?>
      sess = "<?php echo "$sess"; ?>";
-     hstm = new http_streaming(window, console, gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd_ifra.php', function(com){eval(com);});
+hstm = new http_streaming(window, null /* console*/ , gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd_ifra.php', function(com){eval(com);});
      hstm.hbit_set(heartbit);
      tra = new train($('room_tit'));
      window.onunload = onunload_cb;