'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'),
'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'),
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)
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()
{
}
$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;
$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;
$this->asta_pnt = 60;
$this->asta_win = -1;
$this->briscola = -1;
+ $this->tourn_pts = -1;
$this->friend = -1;
$this->turn = 0;
log_wr(sprintf("PRO: [%d]", $pro));
// PATTA case !
- if ($this->asta_pnt == 61 && $pro == 60) {
+ if (game_result($this->asta_pnt, $pro) == 0) {
$this->points[$this->points_n % MAX_POINTS] = array();
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
$this->points[$this->points_n % MAX_POINTS][$i] = 0;
}
$this->points_n++;
$this->old_pnt = $pro;
+ $this->old_asta_win = $this->asta_win;
$this->mult_inc(1);
break;
// $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 ?
$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) {
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);
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();
}
}
$this->rd_step = $this->step;
} /* if ($this->rd_step == -1) { */
else {
- /* $sem = Brisk::lock_data(FALSE); */
$S_load_stat['rU_heavy']++;
if ($this->rd_step < $this->step) {
if ($this->rd_step + COMM_N < $this->step) {
if ($this->rd_stat != $this->stat) {
$to_stat = $this->stat;
- /* Brisk::unlock_data($sem); */
log_load("RESYNC");
printf("xXx BIN5_USER::MAINCHECK\n");
return ($this->page_sync($this->sess, ($to_stat == "table" ? "index.php" : "../index.php"), $this->table, $this->table_token));
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) { */
-
- /* Brisk::unlock_data($sem); */
} /* else of if ($this->rd_step == -1) { */
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;
return (FALSE);
}
+ function banned_kickoff()
+ {
+ $is_ban = FALSE;
+
+ for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
+ $user_cur = $this->user[$i];
+
+ // check if the IP is blacklisted
+ if ($this->brisk->black_check($user_cur->ip)) {
+ $user_cur->lacc = 0;
+ $is_ban = TRUE;
+ continue;
+ }
+ // if authorized not check if banlisted
+ if ($user_cur->is_auth()) {
+ continue;
+ }
+
+ if ($this->brisk->ban_check($user_cur->ip)) {
+ $user_cur->lacc = 0;
+ $is_ban = TRUE;
+ }
+ }
+ return ($is_ban);
+ }
function garbage_manager($force)
{
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;
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;
}
- function chatt_send($user, $mesg)
+ function chatt_send($user, $mesg, $mlang_indwr = NULL)
{
GLOBAL $mlang_brisk, $G_lang;
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 {
static function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
{
- GLOBAL $G_black_list;
+ GLOBAL $G_ban_list, $G_black_list;
printf("NEW_SOCKET (root): %d\n", intval($new_socket));
function game_result($asta_pnt, $pnt)
{
+ $sixty = 60;
if ($asta_pnt == 61) {
- if ($pnt > 60)
+ if ($pnt > $sixty)
return (1);
- else if ($pnt == 60)
+ else if ($pnt == $sixty)
return (0);
else
return (-1);
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;
$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 );
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);
projects / brisk.git / blobdiff