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
/
briskin5
/
index_wr.php
diff --git
a/web/briskin5/index_wr.php
b/web/briskin5/index_wr.php
index
e284e09
..
2fb6da2
100644
(file)
--- a/
web/briskin5/index_wr.php
+++ b/
web/briskin5/index_wr.php
@@
-40,7
+40,7
@@
if ($table_idx < 0 || $table_idx >= TABLE_N)
exit;
$sem = Briskin5::lock_data($table_idx);
exit;
$sem = Briskin5::lock_data($table_idx);
-$bri = &Briskin5::load_data($table_idx);
+$bri = &Briskin5::load_data($table_idx
,$table_token
);
if (($user = &$bri->get_user($sess, &$idx)) == FALSE) {
echo "Get User Error";
log_wr($sess, "Get User Error");
if (($user = &$bri->get_user($sess, &$idx)) == FALSE) {
echo "Get User Error";
log_wr($sess, "Get User Error");
@@
-61,7
+61,7
@@
if ($argz[0] == 'shutdown') {
log_rd2($user->sess, "AUTO LOGOUT.");
if ($user->subst == 'sitdown' || $user->stat == 'table')
log_rd2($user->sess, "AUTO LOGOUT.");
if ($user->subst == 'sitdown' || $user->stat == 'table')
- $bri->
room
_wakeup(&$user);
+ $bri->
table
_wakeup(&$user);
else if ($user->subst == 'standup')
$bri->room_outstandup(&$user);
else
else if ($user->subst == 'standup')
$bri->room_outstandup(&$user);
else
@@
-214,10
+214,10
@@
else if ($user->stat == 'room') {
**********************/
else if ($user->subst == 'sitdown') {
if ($argz[0] == 'wakeup') {
**********************/
else if ($user->subst == 'sitdown') {
if ($argz[0] == 'wakeup') {
- $bri->
room
_wakeup(&$user);
+ $bri->
table
_wakeup(&$user);
}
else if ($argz[0] == 'logout') {
}
else if ($argz[0] == 'logout') {
- $bri->
room
_wakeup(&$user);
+ $bri->
table
_wakeup(&$user);
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
$user->comm[$user->step % COMM_N] .= sprintf('postact_logout();');
$user->the_end = TRUE;
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
$user->comm[$user->step % COMM_N] .= sprintf('postact_logout();');
$user->the_end = TRUE;
@@
-269,7
+269,7
@@
else if ($user->stat == 'table') {
$user->bantime = $user->laccwr + BAN_TIME;
if ($logout_cont == TRUE) {
$user->bantime = $user->laccwr + BAN_TIME;
if ($logout_cont == TRUE) {
- $bri->
room
_wakeup(&$user);
+ $bri->
table
_wakeup(&$user);
}
}
else if ($argz[0] == 'exitlock') {
}
}
else if ($argz[0] == 'exitlock') {