projects
/
brisk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log refactoring and garbaging moved in garbage_manager
[brisk.git]
/
web
/
index_rd.php
diff --git
a/web/index_rd.php
b/web/index_rd.php
index
067526d
..
38a660e
100644
(file)
--- a/
web/index_rd.php
+++ b/
web/index_rd.php
@@
-69,7
+69,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
$ret = FALSE;
$room = FALSE;
$ret = FALSE;
$room = FALSE;
- log_rd2($sess, "M");
+
//
log_rd2($sess, "M");
/* Sync check (read only without modifications */
ignore_user_abort(TRUE);
if (($sem = Room::lock_data()) != FALSE) {
/* Sync check (read only without modifications */
ignore_user_abort(TRUE);
if (($sem = Room::lock_data()) != FALSE) {
@@
-115,16
+115,22
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
}
if ($room == FALSE) {
}
if ($room == FALSE) {
- ignore_user_abort(TRUE);
- if (($sem = Room::lock_data()) != FALSE) {
+ do {
+ ignore_user_abort(TRUE);
+ if (($sem = Room::lock_data()) == FALSE)
+ break;
+
log_only($sess, "P");
log_only($sess, "P");
- $room = &Room::load_data();
+ if (($room = &Room::load_data()) == FALSE)
+ break;
+ } while (0);
+
+ if ($sem != FALSE)
Room::unlock_data($sem);
Room::unlock_data($sem);
- ignore_user_abort(FALSE);
- }
- else {
+
+ ignore_user_abort(FALSE);
+ if ($room == FALSE)
return (FALSE);
return (FALSE);
- }
}
if (($user = &$room->get_user($sess, $idx)) == FALSE) {
}
if (($user = &$room->get_user($sess, $idx)) == FALSE) {
@@
-169,11
+175,16
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
}
if ($cur_step == -1) {
}
if ($cur_step == -1) {
- log_rd2($sess, "PRE-NEWSTAT
."
);
+ log_rd2($sess, "PRE-NEWSTAT
: ".$user->stat
);
if ($user->stat == 'room') {
log_rd($sess, "roomma");
$ret .= show_room(&$room, &$user);
if ($user->stat == 'room') {
log_rd($sess, "roomma");
$ret .= show_room(&$room, &$user);
+
+ /* NOTE the sets went common */
+ $new_stat = $user->stat;
+ $new_subst = $user->subst;
+ $new_step = $user->step;
}
/***************
* *
}
/***************
* *
@@
-181,15
+192,24
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
* *
***************/
else if ($user->stat == 'table') {
* *
***************/
else if ($user->stat == 'table') {
- $ret = show_table(&$room,&$user,$user->step,FALSE,FALSE);
+ /* FIXME we need to decide what do in this case
+
+ if ($user->subst != "shutdowned" && $user->subst != "shutdowner")
+ $ret = show_table(&$room,&$user,$user->step,FALSE,FALSE);
log_rd2($sess, "SENDED TO THE STREAM: ".$ret);
log_rd2($sess, "SENDED TO THE STREAM: ".$ret);
+
+
+ $new_stat = $user->stat;
+ $new_subst = $user->subst;
+ $new_step = $user->step;
+ */
+ log_rd2($sess, "ALL COMMENTED: ".$ret);
+
+
}
log_rd2($sess, "NEWSTAT: ".$user->stat);
}
log_rd2($sess, "NEWSTAT: ".$user->stat);
- $new_stat = $user->stat;
- $new_subst = $user->subst;
- $new_step = $user->step;
}
else {
ignore_user_abort(TRUE);
}
else {
ignore_user_abort(TRUE);
@@
-207,6
+227,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
$to_stat = $user->stat;
Room::unlock_data($sem);
ignore_user_abort(FALSE);
$to_stat = $user->stat;
Room::unlock_data($sem);
ignore_user_abort(FALSE);
+ log_load($user->sess, "RESYNC");
return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php"));
}
log_rd2($sess, "lost history, refresh from scratch");
return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php"));
}
log_rd2($sess, "lost history, refresh from scratch");
@@
-232,8
+253,10
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
$user->name = "";
$user->the_end = FALSE;
$user->name = "";
$user->the_end = FALSE;
- if ($user->subst == 'sitdown')
+ if ($user->subst == 'sitdown') {
+ log_load($user->sess, "ROOM WAKEUP");
$room->room_wakeup(&$user);
$room->room_wakeup(&$user);
+ }
else if ($user->subst == 'standup')
$room->room_outstandup(&$user);
else
else if ($user->subst == 'standup')
$room->room_outstandup(&$user);
else
@@
-263,7
+286,7
@@
function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
*/
$is_page_streaming = ((stristr($HTTP_USER_AGENT, "linux") &&
*/
$is_page_streaming = ((stristr($HTTP_USER_AGENT, "linux") &&
-
stristr($HTTP_USER_AGENT, "firefox"
)) ? FALSE : TRUE);
+
(stristr($HTTP_USER_AGENT, "firefox") || stristr($HTTP_USER_AGENT, "iceweasel")
)) ? FALSE : TRUE);
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1