From e246dc1e59ed187a121f0cae319881f40e1fd426 Mon Sep 17 00:00:00 2001 From: "Matteo Nastasi (mop)" Date: Thu, 27 Nov 2014 08:36:46 +0100 Subject: [PATCH] refactored exit management and add ghost_session class to manage welcome messages --- doc/ARCHITECTURE.txt | 9 +- web/Obj/brisk.phh | 218 ++++++++++++++++++---------------- web/Obj/sac-a-push.phh | 3 +- web/Obj/user.phh | 58 ++++----- web/briskin5/Obj/briskin5.phh | 39 ++---- web/index.php | 28 +++-- web/index_wr.php | 26 ++-- 7 files changed, 193 insertions(+), 188 deletions(-) diff --git a/doc/ARCHITECTURE.txt b/doc/ARCHITECTURE.txt index bb91c57..f1d7069 100644 --- a/doc/ARCHITECTURE.txt +++ b/doc/ARCHITECTURE.txt @@ -1,4 +1,11 @@ -Sparse documentation about Brisk. +===== Sparse documentation about Brisk. ===== + +User cleanup: + spush::garbage_manager() + if (user->the_end) + close opened socket + + brisk->users_cleanup() to reset all users with the_end set ==== brisk/table/user relationships ==== diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh index 841ee0e..bc65746 100644 --- a/web/Obj/brisk.phh +++ b/web/Obj/brisk.phh @@ -1178,7 +1178,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == "") + if ($user_cur->is_active() == FALSE) continue; // check if the IP is blacklisted @@ -1232,6 +1232,17 @@ class Brisk return (FALSE); } + function users_cleanup() + { + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + $user_cur = $this->user[$i]; + + if ($user_cur->the_end) { + $user_cur->reset(); // users_cleanup, OK + } + } + } + function garbage_manager($force) { GLOBAL $G_lang, $mlang_brisk, $G_base; @@ -1298,10 +1309,12 @@ class Brisk $bin5_user = $bin5->user[$i]; $user_cur->subst = $bin5_user->subst; + $user_cur->rd_step = $bin5_user->rd_step; $user_cur->step = $bin5_user->step; $user_cur->lacc = $bin5_user->lacc; $user_cur->laccwr = $bin5_user->lacc; $user_cur->bantime = $bin5_user->bantime; + $user_cur->the_end = $bin5_user->the_end; } log_legal($curtime, $user_cur->ip, $user_cur, "STAT:DESTROY_GAME", $plist); @@ -1354,22 +1367,22 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - + log_rd2("User: ".$user_cur->name." stat: ".$user_cur->stat." subst: ".$user_cur->subst); - - if ($user_cur->sess == "") + + if ($user_cur->is_active() == FALSE) continue; - + if ($user_cur->lacc + EXPIRE_TIME_RD < ($curtime - $delta)) { // Auto logout dell'utente log_rd2("AUTO LOGOUT.".($user_cur->lacc + EXPIRE_TIME_RD)." curtime - delta ".($curtime - $delta)); + $user_cur->the_end = TRUE; + + log_rd2("AUTO LOGOUT."); if ($user_cur->stat == 'table' || $user_cur->stat == 'room') { log_auth($user_cur->sess, "Autologout session."); - $user_cur->reset(); - - log_rd2("AUTO LOGOUT."); if ($user_cur->subst == 'sitdown' || $user_cur->stat == 'table') $this->room_wakeup($user_cur); else if ($user_cur->subst == 'standup') @@ -1466,35 +1479,35 @@ class Brisk $from_table = ($user->stat == "table"); if ($from_table) { - log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); + log_main("WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); - for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = $this->user[$table->player[$i]]; - log_main("PREIMPOST: INLOOP name: ".$user_cur->name); + for ($i = 0 ; $i < $table->player_n ; $i++) { + $user_cur = $this->user[$table->player[$i]]; + log_main("PREIMPOST: INLOOP name: ".$user_cur->name); - if ($user->idx_get() != $table->player[$i]) { - $user_cur->stat_set("room"); - $user_cur->subst = "sitdown"; - $user_cur->laccwr = $curtime; - } - else if ($user->sess != "") { - $user_cur->stat_set("room"); - $user_cur->subst = "standup"; - $user_cur->laccwr = $curtime; - $user_cur->table = -1; + if ($user->idx_get() != $table->player[$i]) { + $user_cur->stat_set("room"); + $user_cur->subst = "sitdown"; + $user_cur->laccwr = $curtime; + } + else if ($user->is_active()) { + $user_cur->stat_set("room"); + $user_cur->subst = "standup"; + $user_cur->laccwr = $curtime; + $user_cur->table = -1; + } } - } } else { - $user->stat_set("room"); - $user->subst = "standup"; - $user->laccwr = $curtime; + $user->stat_set("room"); + $user->subst = "standup"; + $user->laccwr = $curtime; } $remove_wagon = FALSE; if($table->wag_own == $user->idx_get()) { - $table->wag_reset($curtime); - $remove_wagon = TRUE; + $table->wag_reset($curtime); + $remove_wagon = TRUE; } @@ -1503,7 +1516,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room' continue; // log_main("VALORI: name: ".$user_cur->name."from_table: ".$from_table." tab: ".$user_cur->table." taix: ".$table_idx." ucur: ".$user_cur." us: ".$user); @@ -1519,7 +1532,7 @@ class Brisk $ret .= $this->table_content($user_cur, $table_idx); $ret .= $this->standup_content($user_cur); - + // $ret .= table_act_content(FALSE, 0, $table_idx, $user->table, FALSE); $ret .= $table->act_content($user); @@ -1558,31 +1571,32 @@ class Brisk log_main("JOIN WAKEUP: from table [".$user->table."] nplayers_n: ".$this->table[$user->table]->player_n); for ($i = 0 ; $i < $table->player_n ; $i++) { - $user_cur = $this->user[$table->player[$i]]; - log_main("PREIMPOST INLOOP name: ".$user_cur->name); - if ($user_cur->sess != "") { + $user_cur = $this->user[$table->player[$i]]; + log_main("PREIMPOST INLOOP name: ".$user_cur->name); + if ($user_cur->is_empty()) { + continue; + } if ($update_lacc == TRUE) { - $user_cur->laccwr = $curtime; + $user_cur->laccwr = $curtime; } log_main("cur: ".$user_cur->name." subst: ".$user_cur->subst); if ($user_cur->subst == "shutdowned") { - $user_cur->stat_set("room"); - $user_cur->subst = "sitdown"; + $user_cur->stat_set("room"); + $user_cur->subst = "sitdown"; } else if ($user_cur->subst == "shutdowner") { - $user_cur->stat_set("room"); - $user_cur->subst = "standup"; - $user_cur->table = -1; - $user_wup[$user_wup_n++] = $user_cur; - - $remove_wagon = FALSE; - if($table->wag_own == $table->player[$i]) { - $remove_wagon = TRUE; - $table->wag_reset($curtime); - } + $user_cur->stat_set("room"); + $user_cur->subst = "standup"; + $user_cur->table = -1; + $user_wup[$user_wup_n++] = $user_cur; + + $remove_wagon = FALSE; + if($table->wag_own == $table->player[$i]) { + $remove_wagon = TRUE; + $table->wag_reset($curtime); + } } $user_tab[$user_tab_n++] = $table->player[$i]; - } } for ($wup_idx = 0 ; $wup_idx < $user_wup_n ; $wup_idx++) @@ -1593,7 +1607,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { log_main("START LOOP"); $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') { + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') { // is not active user or the stat isn't 'room' log_main("name: ".$user_cur->name."skip subst: ".$user_cur->subst); continue; } @@ -1607,7 +1621,7 @@ class Brisk $ret .= $this->table_content($user_cur, $table_idx); $ret .= $this->standup_content($user_cur); - + $ret .= $table->act_content($user_cur); @@ -1716,8 +1730,8 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $ret = ""; $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') - continue; + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room' + continue; $ret = "gst.st = ".($user_cur->step+1)."; "; if ($table_idx > -1) @@ -1757,7 +1771,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $ret = ""; $user_cur = $this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or the stat isn't 'room' continue; $ret = "gst.st = ".($user_cur->step+1)."; ".$train_app; @@ -1941,7 +1955,7 @@ class Brisk for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == '') + if ($user_cur->is_active() == FALSE) continue; if (strcasecmp($user_cur->name,$name_new) == 0) break; @@ -2120,7 +2134,9 @@ class Brisk $user_cur = $this->user[$i]; if ($target != "" && $user_cur->name != $target) continue; - if ($user_cur->sess == '' || $user_cur->stat == 'table' || $user->idx_get() == $i) + if ($user_cur->is_active() == FALSE // is not active user + || $user_cur->stat == 'table' // or stat is 'table' + || $user->idx_get() == $i) // or the $user idx is equal to current var continue; if ($is_normchat == TRUE) { @@ -2185,26 +2201,28 @@ class Brisk function get_user($sess, &$idx) { - GLOBAL $PHP_SELF; + GLOBAL $PHP_SELF; - if (validate_sess($sess)) { - for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - if (strcmp($sess, $this->user[$i]->sess) == 0) { - // find it - $idx = $i; - $ret = $this->user[$i]; - return ($ret); - } + if (validate_sess($sess)) { + for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { + if ($this->user[$i]->is_empty()) + continue; + if (strcmp($sess, $this->user[$i]->sess) == 0) { + // find it + $idx = $i; + $ret = $this->user[$i]; + return ($ret); + } + } + log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF)); + // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) + // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess)); + } + else { + log_main(sprintf("get_user: Wrong strlen [%s]",$sess)); } - log_main(sprintf("get_user: Wrong sess from page [%s]",$PHP_SELF)); - // for ($i = 0 ; $i < MAX_PLAYERS ; $i++) - // log_main(sprintf("get_user: Wrong sess compared with [%s]",$this->user[$i]->sess)); - } - else { - log_main(sprintf("get_user: Wrong strlen [%s]",$sess)); - } - return (FALSE); + return (FALSE); } /* @@ -2270,25 +2288,28 @@ class Brisk // no actions at this moment } for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { - /* free user ? */ - if (strcmp($sess, $this->user[$i]->sess) == 0) { - if ($idx == -1) - $idx = $i; - } - if ($idfree == -1 && strcmp($this->user[$i]->sess, "") == 0) { - $idfree = $i; - continue; // NOTE: CHECK IT !! - } - if (strcasecmp($this->user[$i]->name, $name_new) == 0) { - if ($authenticate != FALSE) { - $ghost = $i; - $ghost_auth = $this->user[$i]->is_auth(); - } - else { - $idx = $i; - break; - } - } + /* free user ? */ + if ($this->user[$i]->is_empty()) { + if ($idfree == -1) { + $idfree = $i; + } + continue; + } + if (strcmp($sess, $this->user[$i]->sess) == 0) { + if ($idx == -1) { + $idx = $i; + } + } + if (strcasecmp($this->user[$i]->name, $name_new) == 0) { + if ($authenticate != FALSE) { + $ghost = $i; + $ghost_auth = $this->user[$i]->is_auth(); + } + else { + $idx = $i; + break; + } + } } if ($idx == -1) $idx = $idfree; @@ -2444,7 +2465,7 @@ class Brisk { for ($i = 0 ; $i < MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == '') + if ($user_cur->is_active() == FALSE) continue; log_main("STANDUP START: ".$user_cur->stat); @@ -2455,7 +2476,7 @@ class Brisk $user_cur->comm[$user_cur->step % COMM_N] .= $user->myname_innerHTML(); } log_main("FROM STANDUP: NAME: ".$user_cur->name." SENDED: ".$user_cur->comm[$user_cur->step % COMM_N]); - + $user_cur->step_inc(); } } @@ -2475,24 +2496,17 @@ class Brisk function standup_content($user) { $ret = ""; - $content = ""; if ($user->stat != 'room') return; - for ($i = 0 , $ct = 0 ; $ct < 4 && $i < MAX_PLAYERS ; $i++) { - if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "") - continue; - $ct++; - } - - // $content .= sprintf('', $ct); - $content = ' j_stand_cont( [ '; $user_cur_id = $user->idx_get(); for ($i = 0 , $ct = 0 ; $i < MAX_PLAYERS ; $i++) { - if ($this->user[$i]->sess == "" || $this->user[$i]->stat != "room" || $this->user[$i]->name == "") + if ($this->user[$i]->is_active() == FALSE // is not active user + || $this->user[$i]->stat != "room" // or the stat isn't 'room' + || $this->user[$i]->name == "") // or the name is empty, happens when user is reset (TODO: check it) continue; $flags = $this->user[$i]->flags; diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh index 5f9818a..6d75492 100644 --- a/web/Obj/sac-a-push.phh +++ b/web/Obj/sac-a-push.phh @@ -605,7 +605,7 @@ class Sac_a_push { foreach ($this->socks as $k => $sock) { $id = intval($sock); if (isset($this->s2u[$id])) { - if ($this->s2u[$id]->sess == '') { + if ($this->s2u[$id]->the_end) { if ($this->s2u[$id]->rd_socket_get() != NULL) { $this->s2u[$id]->rd_socket_set(NULL); } @@ -616,6 +616,7 @@ class Sac_a_push { } } } + $this->app->users_cleanup(); } function run() diff --git a/web/Obj/user.phh b/web/Obj/user.phh index fcabab7..ebb81f1 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -345,6 +345,18 @@ class User { return (($this->flags & USER_FLAG_AUTH) && ($this->flags & USER_FLAG_TY_CERT)); } + function is_empty() + { + return ($this->sess == ""); + } + + function is_active() + { + if ($this->sess != "" && !$this->the_end) // OK: is_active() + return TRUE; + return FALSE; + } + function flags_set($flags, $mask) { $flags_old = $this->flags & (~$mask); @@ -384,7 +396,7 @@ class User { $this->rd_endtime = $curtime + RD_ENDTIME_DELTA; $this->rd_stat = $stat; $this->rd_subst = $subst; - $this->rd_step = $step; + $this->rd_step = $step; // TRACKED $this->rd_from = $from; $this->rd_scristp = 0; $this->rd_kalive = $curtime + RD_KEEPALIVE_TOUT; @@ -617,7 +629,7 @@ class User { log_rd("maincheck begin"); - $ret = FALSE; + $ret = ""; $curtime = time(); /* Nothing changed, return. */ @@ -627,19 +639,13 @@ class User { log_rd2("do other cur_stat[".$this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd_step."] user_step[".$this->step."]"); if ($this->rd_step == -1) { - /* - * if $this->rd_step == -1 load the current state from the main struct - */ - + /* if $this->rd_step == -1 load the current state from the main struct */ $S_load_stat['wR_minusone']++; - - // if ($this->the_end == TRUE) { - // log_rd2("main_check: the end".var_export(debug_backtrace())); - // } - + if ($this->trans_step != -1) { log_rd2("TRANS USATO ".$this->trans_step); - $this->rd_step = $this->trans_step; + $this->rd_step = $this->step = $this->trans_step; // TRACKED + $ret .= $this->room->show_room($this->step, $this); $this->trans_step = -1; } else { @@ -654,7 +660,6 @@ class User { if ($this->stat == 'room') { log_rd("roomma ".$this->step); - $curtime = time(); if ($this->rec !== FALSE) { $doc_filepath = $G_base.$G_doc_path.sprintf($G_tos_fname, $G_tos_vers, $G_lang); $doc_filename = basename($doc_filepath); @@ -702,7 +707,7 @@ class User { /* NOTE the sets went common */ $this->rd_stat = $this->stat; $this->rd_subst = $this->subst; - $this->rd_step = $this->step; + $this->rd_step = $this->step; // TRACKED } /*************** * * @@ -746,29 +751,18 @@ class User { } $this->rd_stat = $this->stat; $this->rd_subst = $this->subst; - $this->rd_step = $this->step; + $this->rd_step = $this->step; } while (0); log_rd2($this->step, 'index_rd.php: after ret set'); - - if ($this->the_end == TRUE) { - log_rd2("LOGOUT BYE BYE!!"); - log_auth($this->sess, "Explicit logout."); - - $this->reset(); - - if ($this->subst == 'sitdown') { - log_load("ROOM WAKEUP"); - $this->room->room_wakeup($this); - } - else if ($this->subst == 'standup') - $this->room->room_outstandup($this); - else - log_rd2("LOGOUT FROM WHAT ???"); - } /* if ($this->the_end == TRUE) { ... */ + + // if ($this->the_end == TRUE) { management is moved + // in the spush scope } /* if ($this->rd_step < $this->step) { */ } /* else of if ($this->rd_step == -1) { */ - + + if ($ret == "") + $ret = FALSE; return ($ret); } // function maincheck(... diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 05ecdf1..1f1434c 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -1112,27 +1112,9 @@ class Bin5_user extends User { log_rd2($this->step, 'index_rd.php: after ret set'); - if ($this->the_end == TRUE) { - log_rd2("LOGOUT BYE BYE!!"); - log_auth($this->sess, "Explicit logout."); - - if ($this->the_end == TRUE) { - $this->reset(); - - // FIXME !!! - /* if ($this->subst == 'sitdown') { */ - /* log_load("ROOM WAKEUP"); */ - /* $this->room->room_wakeup($this); */ - /* } */ - /* else if ($this->subst == 'standup') */ - /* $this->room->room_outstandup($this); */ - /* else */ - /* log_rd2("LOGOUT FROM WHAT ???"); */ - - } /* if ($this->the_end == TRUE) { ... */ - } /* if ($this->the_end == TRUE) { ... */ + // if ($this->the_end == TRUE) { management is moved + // in the spush scope } /* if ($this->rd_step < $this->step) { */ - } /* else of if ($this->rd_step == -1) { */ @@ -1210,6 +1192,8 @@ class Bin5 { if (validate_sess($sess)) { for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) { + if ($this->user[$i]->is_empty()) + continue; if (strcmp($sess, $this->user[$i]->sess) == 0) { // find it $idx = $i; @@ -1267,7 +1251,7 @@ class Bin5 { if ($force || $this->garbage_timeout < $curtime) { for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) { $user_cur = $this->user[$i]; - if ($user_cur->sess == "" || + if ($user_cur->is_active() == FALSE || // is not active user or ($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner'))) continue; @@ -1277,15 +1261,8 @@ class Bin5 { if ($user_cur->stat == 'table') { log_auth($user_cur->sess," bin5 Autologout session."); - /* SI DELEGA AL garbage_manager principale LA RIMOZIONE DELL'UTENTE - - $tmp_sess = $user_cur->sess; - $user_cur->sess = ""; - Bin5_user::step_unproxy($tmp_sess); - $user_cur->name = ""; - $user_cur->the_end = FALSE; - - */ + /* main garbage_manager is delegate as autologout management */ + $user_cur->the_end = TRUE; /* se gli altri utenti non erano d'accordo questo utente viene bannato */ $remcalc = $this->table[0]->exitlock_calc(&$this->user, $user_cur->table_pos); @@ -1402,7 +1379,7 @@ class Bin5 { for ($i = 0 ; $i < ($user->stat == 'room' ? BIN5_MAX_PLAYERS : BIN5_PLAYERS_N) ; $i++) { if ($user->stat == 'room') { $user_cur = &$this->user[$i]; - if ($user_cur->sess == '' || $user_cur->stat != 'room') + if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or stat isn't 'room' continue; } else { diff --git a/web/index.php b/web/index.php index 31d3711..0f1434f 100644 --- a/web/index.php +++ b/web/index.php @@ -22,6 +22,7 @@ * */ +require_once("Obj/user.phh"); require_once("Obj/brisk.phh"); require_once("Obj/auth.phh"); require_once("Obj/proxyscan.phh"); @@ -331,6 +332,7 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f $tables = ""; $standup = ""; $ACTION = "login"; + $last_msg = ""; if (isset($BRISK_SHOWHTML) == FALSE) { $is_table = FALSE; @@ -348,17 +350,19 @@ function index_main(&$brisk, $transp_type, $header, &$header_out, $remote_addr_f $brisk->garbage_manager(TRUE); log_main("post garbage_manager"); if (($user = &$brisk->get_user($sess, &$idx)) != FALSE) { - $brisk->sess_cur_set($user->sess); - log_main("user stat: ".$user->stat); - if ($user->stat == "table") { - $cookies = new Cookies(); - $cookies->add("table_token", $user->table_token, $curtime + 31536000); - $cookies->add("table_idx", $user->table, $curtime + 31536000); - $header_out['cookies'] = $cookies; - $header_out['Location'] = "briskin5/index.php"; - return TRUE; + if ($user->the_end == FALSE) { + $brisk->sess_cur_set($user->sess); + log_main("user stat: ".$user->stat); + if ($user->stat == "table") { + $cookies = new Cookies(); + $cookies->add("table_token", $user->table_token, $curtime + 31536000); + $cookies->add("table_idx", $user->table, $curtime + 31536000); + $header_out['cookies'] = $cookies; + $header_out['Location'] = "briskin5/index.php"; + return TRUE; + } + $ACTION = "room"; } - $ACTION = "room"; } } @@ -1040,7 +1044,9 @@ supported by:
echo "$body"; ?>
-


+
+
+


diff --git a/web/index_wr.php b/web/index_wr.php index bec14b7..5a7c265 100644 --- a/web/index_wr.php +++ b/web/index_wr.php @@ -3,7 +3,7 @@ * brisk - index_wr.php * * Copyright (C) 2006-2014 Matteo Nastasi - * mailto: nastasi@alternativeoutput.it + * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it * @@ -286,7 +286,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) else if ($argz[0] == 'shutdown') { log_auth($user->sess, "Shutdown session."); - $user->reset(); + $user->the_end = TRUE; log_rd2("AUTO LOGOUT."); if ($user->subst == 'sitdown' || $user->stat == 'table') @@ -799,7 +799,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) $bin5_user_cur->trans_step = $user_cur->step + 1; $bin5_user_cur->comm[$bin5_user_cur->step % COMM_N] = ""; $bin5_user_cur->step_inc(); - $bin5_user_cur->comm[$bin5_user_cur->step % COMM_N] = show_table(&$bin5,&$bin5_user_cur,$bin5_user_cur->step+1,TRUE, FALSE); + $bin5_user_cur->comm[$bin5_user_cur->step % COMM_N] = show_table(&$bin5,&$bin5_user_cur,$bin5_user_cur->step+1,TRUE,FALSE); $bin5_user_cur->step_inc(); log_wr("TRY PRESAVE: ".$bin5_user_cur->step." TRANS STEP: ".$bin5_user_cur->trans_step); @@ -829,10 +829,17 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) log_wr("MOP finish"); } else if ($argz[0] == 'logout') { - $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; "; - $user->comm[$user->step % COMM_N] .= 'postact_logout();'; + $brisk->ghost_sess->push($curtime, $user->sess, GHOST_SESS_REAS_LOUT); $user->the_end = TRUE; - $user->step_inc(); + + if ($user->subst == 'sitdown') { + log_load("ROOM WAKEUP"); + $brisk->room_wakeup($user); + } + else if ($user->subst == 'standup') + $brisk->room_outstandup($user); + else + log_rd2("LOGOUT FROM WHAT ???"); } } /********************** @@ -850,11 +857,10 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie) $brisk->room_wakeup($user); } else if ($argz[0] == 'logout') { - $brisk->room_wakeup($user); - $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; "; - $user->comm[$user->step % COMM_N] .= 'postact_logout();'; + $brisk->ghost_sess->push($curtime, $user->sess, GHOST_SESS_REAS_LOUT); $user->the_end = TRUE; - $user->step_inc(); + + $brisk->room_wakeup($user); } } } -- 2.17.1