visual heartbit added and reload fixed in explorer transport

[brisk.git] / web / index.php

diff --git a/web/index.php b/web/index.php
index 563bb3a..e8b0cf1 100644 (file)
--- a/web/index.php
+++ b/web/index.php
@@ -20,13 +20,7 @@
  * not, write to the Free Software Foundation, Inc, 59 Temple Place -
  * Suite 330, Boston, MA 02111-1307, USA.
  *
-
-
-TODO:
-  - header
-  - setcookie
-  - gestire per intero la var globale di output
-*/
+ */
 
 require_once("Obj/brisk.phh");
 require_once("Obj/auth.phh");
@@ -213,7 +207,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, $addr, $get, $post, $cookie)
+function index_main(&$room, $transp_type, &$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;
@@ -233,8 +227,7 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
         unset ($table_idx);
     if (($table_token = gpcs_var('table_idx', $get, $post, $cookie)) === FALSE)
         unset ($table_token);
-    
-    
+
     // Use of proxies isn't allowed.
     if (!$G_is_local && is_proxy($addr)) {
         return FALSE;
@@ -260,8 +253,10 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
           if (($user = &$room->get_user($sess, &$idx)) != FALSE) {
               log_main("user stat: ".$user->stat);
               if ($user->stat == "table") {
-                  setcookie("table_token", $user->table_token, $curtime + 31536000);
-                  setcookie("table_idx", $user->table, $curtime + 31536000);
+                  $cookies = new Cookies();
+                  $cookies->add("table_token", $user->table_token, $curtime + 31536000);
+                  $cookies->add("table_idx", $user->table, $curtime + 31536000);
+                  $header_out['cookies'] = $cookies;
                   $header_out['Location'] = "briskin5/index.php";
                   return TRUE;
               }
@@ -291,9 +286,11 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
               
               // recovery lost game
               if ($user->stat == "table") {
-                  setcookie("table_token", $user->table_token, $curtime + 31536000);
-                  setcookie("table_idx", $user->table, $curtime + 31536000);
-                  $header_out['Location'] = "Location: briskin5/index.php";
+                  $cookies = new Cookies();
+                  $cookies->add("table_token", $user->table_token, $curtime + 31536000);
+                  $cookies->add("table_idx", $user->table, $curtime + 31536000);
+                  $header_out['cookies'] = $cookies;
+                  $header_out['Location'] = "briskin5/index.php";
                   return TRUE;
               }
               
@@ -846,7 +843,8 @@ supported by:<br>
 </div><br><br></div>
 %s
 %s
-<br></div>';
+<br>
+<img id="stm_stat" class="nobo" src="img/line-status_cb.png"></div>';
     
   /* Templates. */
   if ($ACTION == 'login') {
@@ -858,10 +856,10 @@ 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>
+<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="AC_OETags.js"></script>
 <script type="text/javascript" src="room.js"></script>
@@ -882,7 +880,7 @@ supported by:<br>
    var gst  = new globst();
    var topbanner_sfx, topbanner_dx;
    var g_brow = null;
-   var hstm = null;
+   var xstm = null;
    var sess = "not_connected";
    var spo_slide, sup_slide;
 
@@ -993,11 +991,11 @@ 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>
-<script type="text/javascript" src="xynt-http-streaming.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="AC_OETags.js"></script>
@@ -1053,8 +1051,8 @@ else {
 
 ?>
      sess = "<?php echo "$sess"; ?>";
-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);
+xstm = new xynt_streaming(window, "<?php echo "$transp_type"; ?>", null /* console */, gst, 'index_php', 'sess', sess, $('sandbox'), 'index_rd_ifra.php', function(com){eval(com);});
+     xstm.hbit_set(heartbit);
      tra = new train($('room_tit'));
      window.onunload = onunload_cb;
      window.onbeforeunload = onbeforeunload_cb;
@@ -1066,7 +1064,7 @@ hstm = new http_streaming(window, null /* console*/ , gst, 'index_php', 'sess',
        $("proflashext").innerHTML = "";
 
      // console.log("session from main: "+sess);
-     hstm.start();
+     xstm.start();
      // alert("ARR LENGTH "+g_preload_img_arr.length);
      // FIXME: preload image will be fired by stream instead here
      // setTimeout(preload_images, 0, g_preload_img_arr, g_imgct);