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

diff --git a/web/index.php b/web/index.php
index 587acd8..80ed791 100644
--- a/web/index.php
+++ b/web/index.php
@@ -2,7 +2,7 @@
 /*
  *  brisk - index.php
  *
- *  Copyright (C) 2006-2011 Matteo Nastasi
+ *  Copyright (C) 2006-2012 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -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");
@@ -182,13 +176,6 @@ $mlang_room = array( 'userpasserr'  => array('it' => 'Utente e/o password errati
 
 
 require_once("briskin5/Obj/briskin5.phh");
-if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
-  echo "Debugging time!";
-  exit;
-}
-
-log_load("index.php");
-
 
 function poll_dom() {
   GLOBAL $G_with_poll, $G_poll_title, $G_poll_entries;
@@ -220,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, $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;
@@ -231,7 +218,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)
@@ -240,10 +227,9 @@ function index_main(&$room, &$header_out, $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()) {
+    if (!$G_is_local && is_proxy($addr)) {
         return FALSE;
     }
 
@@ -267,9 +253,11 @@ function index_main(&$room, &$header_out, $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);
-                  $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;
               }
               $ACTION = "room";
@@ -287,20 +275,22 @@ 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, $cookie)) != 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") {
-                  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;
               }
               
@@ -409,14 +399,18 @@ function index_main(&$room, &$header_out, $get, $post, $cookie)
                                array ( 'id' => 'btn_foroli',
                                        'url' => 'http://www.forumolimpia.it',
                                        'content' => 'img/forumolimpia.gif',
-                                       'content_big' => 'img/forumolimpia_big.png' ) );
+                                       'content_big' => 'img/forumolimpia_big.png' ),
+                               array ( 'id'=> 'btn_niini',
+                                       'url' => 'http://www.niinivirta.it',
+                                       'content' => 'img/niinivirta.png',
+                                       'content_big' => 'img/niinivirta_big.png') );
   
   
   
   $altout_support = "";
   $altout_support_big = "";
-  for ($i = 0 ; $i < 3 ; $i++) {
-      $ii = ($i < 2 ? $i : 0);
+  for ($i = 0 ; $i < 4 ; $i++) {
+      $ii = ($i < 3 ? $i : 0);
       
       $altout_support .= sprintf('<a style="position: absolute; top: %dpx; left: 7px;" target="_blank" href="%s"><img class="nobo" id="%s" src="%s" onMouseOver="show_bigpict(this, \'over\',100,10);" onMouseOut="show_bigpict(this, \'out\',0,0);"></a><br>',
                                  $i * 20, $altout_support_arr[$ii]['url'],
@@ -517,7 +511,7 @@ google_color_url = "000000";
 "<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></table>
+</tr></table>
 </div>';
 
 /* MLANG: ALL THE VERTICAL MENU */
@@ -853,7 +847,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') {
@@ -865,10 +860,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>
@@ -878,17 +873,18 @@ 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;
-   var hstm = null;
+   var xstm = null;
    var sess = "not_connected";
    var spo_slide, sup_slide;
 
@@ -896,7 +892,7 @@ supported by:<br>
      // alert(window.onbeforeunload);
      g_brow = get_browser_agent();
      spo_slide  = new sideslide($('spon_caro'), 80, 20);
-     sup_slide  = new sideslide($('supp_caro'), 60, 20);
+     sup_slide  = new sideslide($('supp_caro'), 80, 20);
 
      login_init();
 <?php
@@ -999,11 +995,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>
@@ -1012,6 +1008,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; ?>;
@@ -1033,7 +1030,7 @@ echo "$body"; ?>
    window.onload = function() {
      g_brow = get_browser_agent();
      spo_slide  = new sideslide($('spon_caro'), 80, 20);
-     sup_slide  = new sideslide($('supp_caro'), 60, 20);
+     sup_slide  = new sideslide($('supp_caro'), 80, 20);
 
 <?php
 if ($BRISK_SHOWHTML == "debugtable") {
@@ -1058,8 +1055,8 @@ 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.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;
@@ -1071,9 +1068,10 @@ else {
        $("proflashext").innerHTML = "";
 
      // console.log("session from main: "+sess);
-     hstm.start();
+     xstm.start();
      // alert("ARR LENGTH "+g_preload_img_arr.length);
-     setTimeout(preload_images, 0, g_preload_img_arr, g_imgct); 
+     // FIXME: preload image will be fired by stream instead here
+     // setTimeout(preload_images, 0, g_preload_img_arr, g_imgct); 
      $("txt_in").focus();
 <?php
 if ($is_login) {