X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=1e67bf8f81d73262fae95fd40de73bc744097e88;hb=db12d769481823f4c744ce0e3a50404cc6b01cd1;hp=ee69b35cf57fc8c4880f48f82be6eeb09f79442b;hpb=14cd1fc05b5d9148de3c427e43bf60cfdf098e9d;p=brisk.git diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index ee69b35..1e67bf8 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -42,8 +42,8 @@ $mlang_bin5_bin5 = array( 'info_curr' => array( 'it' => '%3$smano corrente%4$s', 'en' => '%3$scurrent hand%4$s'), // br, hr, b, /b, win, fri - 'info_part' => array( 'it' => 'Ha chiamato %3$s%5$s%4$s, il socio era %3$s%6$s%4$s,%1$s', - 'en' => 'The declarer was %3$s%5$s%4$s, the partner was %3$s%6$s%4$s,%1$s'), + 'info_part' => array( 'it' => 'Ha chiamato %3$s%5$s%4$s (punti torneo %7$d), il socio era %3$s%6$s%4$s,%1$s', + 'en' => 'The declarer was %3$s%5$s%4$s (tournment points %7$d), the partner was %3$s%6$s%4$s,%1$s'), // br, hr, b, /b 'info_capp' => array( 'it' => 'hanno fatto %3$scappotto%4$s EBBRAVI!.%1$s', 'en' => 'and they made %3Dscapot%4$s WELL DONE!.%1$s'), @@ -62,8 +62,8 @@ $mlang_bin5_bin5 = array( 'en' => 'lost'), // br, hr, b, /b, win_name - 'info_alon' => array( 'it' => '%3$s%5$s%4$s si è chiamato in mano,%1$s', - 'en' => '%3$s%5$s%4$s play alone against each other,%1$s'), + 'info_alon' => array( 'it' => '%3$s%5$s%4$s si è chiamato in mano (punti torneo %6$d),%1$s', + 'en' => '%3$s%5$s%4$s play alone against each other (tournment points %6$d),%1$s'), // br, hr, b, /b, old_asta_pnt, old_pnt, winornot 'info_aleaa' => array( 'it' => 'doveva fare %3$salmeno %5$d%4$s punti e ne ha fatti %3$s%6$d%4$s: ha %3$s%7$s%4$s.%1$s', 'en' => 'he/she had to do %3$sat least %5$d%4$s points and they had made %3$s%6$d%4$s: he/she had %3$s%7$s%4$s.%1$s'), @@ -185,6 +185,7 @@ class Bin5_table extends Table { var $asta_win; // the caller idx position at table var $briscola; + var $tourn_pts; // points in the caller hand var $friend; // the callee idx position at table var $match_id; // the id of the match on the database (-1 == just not saved) @@ -198,6 +199,8 @@ class Bin5_table extends Table { var $old_asta_win; // the old caller idx position at table var $old_friend; // the old callee idx position at table + var $old_tourn_pts; // the old tournment computed points in the hand of caller + function Bin5_table() { } @@ -223,6 +226,7 @@ class Bin5_table extends Table { $thiz->total = array( 0, 0, 0, 0, 0); $thiz->asta_win = -1; $thiz->briscola = -1; + $thiz->tourn_pts = -1; $thiz->friend = -1; $thiz->turn = 0; @@ -266,6 +270,7 @@ class Bin5_table extends Table { $thiz->asta_win = $from->asta_win; $thiz->briscola = $from->briscola; + $thiz->tourn_pts = $from->tourn_pts; $thiz->friend = $from->friend; $thiz->match_id = $from->match_id; @@ -436,6 +441,7 @@ class Bin5_table extends Table { $this->asta_pnt = 60; $this->asta_win = -1; $this->briscola = -1; + $this->tourn_pts = -1; $this->friend = -1; $this->turn = 0; @@ -638,6 +644,8 @@ class Bin5_table extends Table { // $this->old_mult, $this->old_pnt, $this->old_reason and $this->old_asta_win are specific $this->old_friend = $this->friend; + $this->old_tourn_pts = $this->tourn_pts; + $this->old_reason = game_description($action, 'html', $this->old_mult, $this->old_asta_win, ($this->old_asta_win != -1 ? @@ -645,7 +653,7 @@ class Bin5_table extends Table { $this->old_friend, ($this->old_friend != -1 ? $bri->user[$this->player[$this->old_friend]]->name : ""), - $this->old_pnt, $this->old_asta_pnt); + $this->old_pnt, $this->old_asta_pnt, $this->old_tourn_pts); if ($user->table_orig < TABLES_AUTH_N) { @@ -656,9 +664,9 @@ class Bin5_table extends Table { unset($bdb); } else { - log_points($remote_addr, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", "DATABASE CONNECTION FAILED"); + log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", "DATABASE CONNECTION FAILED"); } - log_points($remote_addr, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist); + log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist); } $this->game_init(&$bri->user); @@ -791,8 +799,7 @@ class Bin5_table extends Table { continue; $user_cur = &$bri->user[$this->player[$i]]; $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; "; - $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', - $dt, NICKSERV, $msg); + $user_cur->comm[$user_cur->step % COMM_N] .= nickserv_msg($dt, $msg); $user_cur->step_inc(); } } @@ -1113,27 +1120,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) { */ @@ -1211,6 +1200,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; @@ -1243,7 +1234,7 @@ class Bin5 { } // if authorized not check if banlisted - if ($user_cur->flags & USER_FLAG_AUTH) { + if ($user_cur->is_auth()) { continue; } @@ -1268,7 +1259,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; @@ -1278,21 +1269,14 @@ 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); if ($remcalc < 3) { require_once("${G_base}Obj/hardban.phh"); - Hardbans::add(($user_cur->flags & USER_FLAG_AUTH ? $user_cur->name : FALSE), + Hardbans::add(($user_cur->is_auth() ? $user_cur->name : FALSE), $user_cur->ip, $user_cur->sess, $user_cur->laccwr + BAN_TIME); } // $user->bantime = $user->laccwr + BAN_TIME; @@ -1377,7 +1361,7 @@ class Bin5 { } - function chatt_send($user, $mesg) + function chatt_send($user, $mesg, $mlang_indwr = NULL) { GLOBAL $mlang_brisk, $G_lang; @@ -1403,7 +1387,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 { @@ -2021,14 +2005,14 @@ function log_points($remote_addr, $curtime, $user, $where, $mesg) if (($fp = @fopen(LEGAL_PATH."/points.log", 'a')) != FALSE) { /* Unix time | session | nickname | IP | where was | mesg */ fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|%s|\n", $curtime, $user->sess, - ($user->flags & USER_FLAG_AUTH ? 'A' : 'N'), + ($user->is_auth() ? 'A' : 'N'), $user->name, $remote_addr, $where , $mesg)); fclose($fp); } } function game_description($act, $form, $old_mult, $win = -1, $win_name = "?1?", $fri = -1, $fri_name = "?2?", - $old_pnt = -1, $old_asta_pnt = -1) + $old_pnt = -1, $old_asta_pnt = -1, $old_tourn_pts = -1) { GLOBAL $G_lang, $mlang_bin5_bin5; @@ -2070,7 +2054,8 @@ function game_description($act, $form, $old_mult, $win = -1, $win_name = "?1?", $noty .= sprintf($mlang_bin5_bin5['info_part'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, $win_name, - $fri_name); + $fri_name, + $old_tourn_pts); if ($old_pnt == 120) { $noty .= sprintf($mlang_bin5_bin5['info_capp'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc ); @@ -2097,7 +2082,8 @@ function game_description($act, $form, $old_mult, $win = -1, $win_name = "?1?", else { $noty .= sprintf($mlang_bin5_bin5['info_alon'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc, - $win_name); + $win_name, + $old_tourn_pts); if ($old_pnt == 120) { $noty .= sprintf($mlang_bin5_bin5['info_acap'][$G_lang], $tg_br, $tg_hr, $tg_bo, $tg_bc);