X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=a645129a529e9c044068a31090e4c1bf034c106a;hb=78c68fdf4027088a08b915982ae19a500d9a4e26;hp=8cf1eee7bf90f4577f53292fda6fc02ffc15d94d;hpb=380e4f95319a328524a764956fb802d991864bf7;p=brisk.git diff --git a/web/index.php b/web/index.php index 8cf1eee..a645129 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 @@ -280,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; @@ -1068,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();