projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftok suffix changed
[brisk.git]
/
web
/
index.php
diff --git
a/web/index.php
b/web/index.php
index
8cf1eee
..
a645129
100644
(file)
--- a/
web/index.php
+++ b/
web/index.php
@@
-2,7
+2,7
@@
/*
* brisk - index.php
*
/*
* brisk - index.php
*
- * Copyright (C) 2006-201
1
Matteo Nastasi
+ * Copyright (C) 2006-201
2
Matteo Nastasi
* mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
* 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 */
$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;
$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);
// 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) {
$("txt_in").focus();
<?php
if ($is_login) {