Copyright date updated

[brisk.git] / web / index.php

diff --git a/web/index.php b/web/index.php
index 9fb6b3d..a645129 100644 (file)
--- 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
@@ -182,13 +182,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;
@@ -231,7 +224,7 @@ function index_main(&$room, &$header_out, $addr, $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)
@@ -269,7 +262,7 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
               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";
+                  $header_out['Location'] = "briskin5/index.php";
                   return TRUE;
               }
               $ACTION = "room";
@@ -287,7 +280,7 @@ function index_main(&$room, &$header_out, $addr, $get, $post, $cookie)
           
           $room->garbage_manager(TRUE);
           /* try login */
-          if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $addr)) != FALSE) {
+          if (($user = $room->add_user(&$sess, &$idx, $name, $pass_private, $addr, $cookie)) != FALSE) {
               $ACTION = "room";
               if ($idx < 0) {
                   $idx = -$idx - 1;
@@ -865,7 +858,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 +871,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 +993,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 +1006,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; ?>;
@@ -1073,7 +1068,8 @@ hstm = new http_streaming(window, null /* console*/ , gst, 'index_php', 'sess',
      // console.log("session from main: "+sess);
      hstm.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) {