X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=9d4a9c568307017057e56d2fcd6acdc3c314a3a8;hb=3610477b5c8d4a8e1e9996014a81e257ba33c075;hp=dfc671f9b9203fdcd2f22c098c9f4f780648bcac;hpb=92c5ac9505608504a33b757a2f0f1c1a0fcd86ad;p=brisk.git diff --git a/web/index.php b/web/index.php index dfc671f..9d4a9c5 100644 --- a/web/index.php +++ b/web/index.php @@ -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; @@ -1075,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();