X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=1e67bf8f81d73262fae95fd40de73bc744097e88;hb=db12d769481823f4c744ce0e3a50404cc6b01cd1;hp=99085a8a6d4f97cd85c473cf9e3ad65ebed7c36c;hpb=f9a43770d979532e374b6f724e6303eb16b9afa0;p=brisk.git
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 99085a8..1e67bf8 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -37,8 +37,13 @@ define('BIN5_RULES_ALLPASS', 2);
$mlang_bin5_bin5 = array(
// br, hr, b, /b, win, fri
- 'info_part' => array( 'it' => 'Nell\'ultima mano ha chiamato %3$s%5$s%4$s, il socio era %3$s%6$s%4$s,%1$s',
- 'en' => 'In the last hand the declarer was %3$s%5$s%4$s, the partner was %3$s%6$s%4$s,%1$s'),
+ 'info_last' => array( 'it' => '%3$sultima mano%4$s',
+ 'en' => '%3$slast hand%4$s'),
+ '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 (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'),
@@ -57,8 +62,8 @@ $mlang_bin5_bin5 = array(
'en' => 'lost'),
// br, hr, b, /b, win_name
- 'info_alon' => array( 'it' => 'Nell\'ultima partita %3$s%5$s%4$s si è chiamato in mano,%1$s',
- 'en' => 'In the last hand %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'),
@@ -180,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)
@@ -193,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()
{
}
@@ -218,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;
@@ -261,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;
@@ -334,11 +344,9 @@ class Bin5_table extends Table {
function multer($is_new)
{
if ($is_new) {
- // return (pow(2, $this->mult) * $this->asta2mult($this->asta_pnt));
return (static::s_multer($this->mult, $this->asta_pnt));
}
else {
- // return (pow(2, $this->old_mult) * $this->asta2mult($this->old_asta_pnt));
return (static::s_multer($this->old_mult, $this->old_asta_pnt));
}
}
@@ -348,6 +356,11 @@ class Bin5_table extends Table {
return (pow(2, $mult) * static::asta2mult($pnt));
}
+ static function s_point_calc($pnt_done, $mult, $pnt_req, $is_allpoints)
+ {
+ return ($pnt_done * static::s_multer($mult, $pnt_req) * ($is_allpoints ? 2 : 1));
+ }
+
// function bunch_create_old() function AND
// {
// $ret = array();
@@ -428,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;
@@ -504,15 +518,15 @@ class Bin5_table extends Table {
{
GLOBAL $G_all_points, $G_dbasetype;
- $pts = array();
+ $pnts_sav = array();
- $this->old_act = $action;
if ($action == BIN5_RULES_ALLPASS) { // return TRUE if all correct
+ $this->old_act = $action;
$this->old_asta_win = -1;
$this->old_pnt = 0;
$this->mult_inc(1);
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
- $pts[$i] = 0;
+ $pnts_sav[$i] = 0;
}
$game_delta = 1;
@@ -520,13 +534,17 @@ class Bin5_table extends Table {
$this->game_init(&$bri->user);
}
else if ($action == BIN5_RULES_ABANDON) { // return TRUE if all correct
+ if (!($user->handpt <= 2)) {
+ return (FALSE);
+ }
+ $this->old_act = $action;
log_wr(sprintf("GIOCO FINITO !!!"));
$this->old_asta_win = $user->table_pos;
$this->old_pnt = 0;
$this->mult_inc(1);
for ($i = 0 ; $i < PLAYERS_N ; $i++) {
- $pts[$i] = 0;
+ $pnts_sav[$i] = 0;
}
// Non si cambia mazzo se si abbandona la partita
@@ -535,6 +553,7 @@ class Bin5_table extends Table {
$this->game_init(&$bri->user);
}
else if ($action == BIN5_RULES_FINISH) { // return TRUE if all correct
+ $this->old_act = $action;
do {
$pro = 0;
@@ -554,17 +573,17 @@ class Bin5_table extends Table {
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;
- $pts[$i] = 0;
+ $pnts_sav[$i] = 0;
}
$this->points_n++;
$this->old_pnt = $pro;
+ $this->old_asta_win = $this->asta_win;
$this->mult_inc(1);
- // return($pts);
break;
}
@@ -573,31 +592,29 @@ class Bin5_table extends Table {
else
$sig = -1;
+ // TAG: POINTS_MANAGEMENT
$this->points[$this->points_n % MAX_POINTS] = array();
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
if ($i == $this->asta_win)
- $pt = ($i == $this->friend ? 4 : 2);
+ $pnt = ($i == $this->friend ? 4 : 2);
else if ($i == $this->friend)
- $pt = 1;
+ $pnt = 1;
else
- $pt = -1;
-
- log_wr(sprintf("PRO: pt[%d][%d] = %d", $this->points_n % MAX_POINTS, $i, $pt));
+ $pnt = -1;
- $pt = $pt * $sig * $this->multer(TRUE) * ($pro == 120 ? 2 : 1);
+ log_wr(sprintf("PRO: pt[%d][%d] = %d", $this->points_n % MAX_POINTS, $i, $pnt));
- log_wr(sprintf("PRO:[%d][%d][%d]", $sig, $this->multer(TRUE), ($pro == 120 ? 2 : 1)));
+ $pnt_sav = static::s_point_calc($pnt * $sig, 0, $this->asta_pnt, ($pro == 120));
+ $pnt_tab = static::s_point_calc($pnt * $sig, $this->mult, $this->asta_pnt, ($pro == 120));
- $this->points[$this->points_n % MAX_POINTS][$i] = $pt;
- $this->total[$i] += $pt;
- $pts[$i] = $pt;
+ $this->points[$this->points_n % MAX_POINTS][$i] = $pnt_tab;
+ $this->total[$i] += $pnt_tab;
+ $pnts_sav[$i] = $pnt_sav;
}
$this->points_n++;
$this->old_pnt = $pro;
$this->old_asta_win = $this->asta_win;
$this->mult_set(0);
-
- // return($pts);
} while (0);
$game_delta = 1;
}
@@ -616,7 +633,7 @@ class Bin5_table extends Table {
$ucodes[$i] = $user_cur->code_get();
/* pro log */
- $plist .= '|'.xcapelt($user_cur->name).'|'.$pts[$i];
+ $plist .= '|'.xcapelt($user_cur->name).'|'.$pnts_sav[$i];
$codes .= '|'.xcapelt($user_cur->code_get());
}
$plist .= $codes;
@@ -627,23 +644,29 @@ 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, $bri->user[$this->player[$this->old_asta_win]]->name,
- $this->old_friend, $bri->user[$this->player[$this->old_friend]]->name,
- $this->old_pnt, $this->old_asta_pnt);
+ $this->old_asta_win,
+ ($this->old_asta_win != -1 ?
+ $bri->user[$this->player[$this->old_asta_win]]->name : ""),
+ $this->old_friend,
+ ($this->old_friend != -1 ?
+ $bri->user[$this->player[$this->old_friend]]->name : ""),
+ $this->old_pnt, $this->old_asta_pnt, $this->old_tourn_pts);
if ($user->table_orig < TABLES_AUTH_N) {
require_once("../Obj/dbase_".$G_dbasetype.".phh");
if (($bdb = BriskDB::create()) != FALSE) {
- $bdb->bin5_points_save($curtime, $this, $user->table_orig, $action, $ucodes, $pts);
+ $bdb->bin5_points_save($curtime, $this, $user->table_orig, $action, $ucodes, $pnts_sav);
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);
@@ -776,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();
}
}
@@ -1001,13 +1023,11 @@ class Bin5_user extends User {
return (sprintf('xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
}
- protected function maincheck($cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_subst, &$new_step, $splashdate, $table_idx, $table_token)
+ protected function maincheck($get, $post, $cookie)
{
- GLOBAL $G_lang, $mlang_indrd;
+ GLOBAL $G_lang;
GLOBAL $G_with_splash, $G_splash_content, $G_splash_interval, $G_splash_idx;
GLOBAL $G_splash_w, $G_splash_h, $G_splash_timeout;
- $CO_splashdate = "CO_splashdate".$G_splash_idx;
- $$CO_splashdate = $splashdate;
GLOBAL $S_load_stat;
@@ -1017,14 +1037,14 @@ class Bin5_user extends User {
$curtime = time();
/* Nothing changed, return. */
- if ($cur_step == $this->step)
+ if ($this->rd_step == $this->step)
return (FALSE);
- log_rd2("do other cur_stat[".$cur_stat."] user->stat[".$this->stat."] cur_step[".$cur_step."] user_step[".$this->step."]");
+ log_rd2("do other cur_stat[".$this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd_step."] user_step[".$this->step."]");
- if ($cur_step == -1) {
+ if ($this->rd_step == -1) {
/*
- * if $cur_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']++;
@@ -1035,7 +1055,7 @@ class Bin5_user extends User {
if ($this->trans_step != -1) {
log_rd2("TRANS USATO ".$this->trans_step);
- $cur_step = $this->trans_step;
+ $this->rd_step = $this->trans_step;
$this->trans_step = -1;
}
else {
@@ -1045,7 +1065,7 @@ class Bin5_user extends User {
/* this part I suppose is read only on $this->room structure */
- if ($cur_step == -1) {
+ if ($this->rd_step == -1) {
log_rd2("PRE-NEWSTAT");
/***************
@@ -1061,33 +1081,31 @@ class Bin5_user extends User {
}
log_rd2("NEWSTAT: ".$this->stat);
- $new_stat = $this->stat;
- $new_subst = $this->subst;
- $new_step = $this->step;
- } /* if ($cur_step == -1) { */
+ $this->rd_stat = $this->stat;
+ $this->rd_subst = $this->subst;
+ $this->rd_step = $this->step;
+ } /* if ($this->rd_step == -1) { */
else {
- /* $sem = Room::lock_data(FALSE); */
$S_load_stat['rU_heavy']++;
- if ($cur_step < $this->step) {
+ if ($this->rd_step < $this->step) {
do {
- if ($cur_step + COMM_N < $this->step) {
- if (($cur_stat != $this->stat)) {
+ if ($this->rd_step + COMM_N < $this->step) {
+ if ($this->rd_stat != $this->stat) {
$to_stat = $this->stat;
- /* Room::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("lost history, refresh from scratch");
printf("xXx LOST HISTORY!\n");
- $new_step = -1;
+ $this->rd_step = -1;
break;
}
- for ($i = $cur_step ; $i < $this->step ; $i++) {
+ for ($i = $this->rd_step ; $i < $this->step ; $i++) {
$ii = $i % COMM_N;
if ($this->comm[$ii] == "") {
- if ($i == $cur_step)
+ if ($i == $this->rd_step)
continue;
else
break;
@@ -1095,40 +1113,21 @@ class Bin5_user extends User {
log_rd2("ADDED TO THE STREAM: ".$this->comm[$ii]);
$ret .= $this->comm[$ii];
}
- $new_stat = $this->stat;
- $new_subst = $this->subst;
- $new_step = $this->step;
+ $this->rd_stat = $this->stat;
+ $this->rd_subst = $this->subst;
+ $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.");
-
- 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 ($cur_step < $this->step) { */
-
- /* Room::unlock_data($sem); */
- } /* else of if ($cur_step == -1) { */
+ // 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) { */
return ($ret);
- } // function maincheck (...
+ } // function maincheck(...
function continue_set($match_code)
{
@@ -1144,6 +1143,7 @@ class Bin5_user extends User {
class Bin5 {
static $delta_t = array();
+ var $brisk;// room object reference
var $user;
var $table;
@@ -1160,7 +1160,7 @@ class Bin5 {
var $delay_mgr;
- function Bin5 ($room, $table_idx, $table_token, $get, $post, $cookie) {
+ function Bin5($brisk, $table_idx, $table_token, $get, $post, $cookie) {
$this->user = array();
$this->table = array();
@@ -1171,9 +1171,9 @@ class Bin5 {
exit;
}
- $user = $room->user;
- $table = $room->table[$table_idx];
-
+ $this->brisk = $brisk;
+ $user = $brisk->user;
+ $table = $brisk->table[$table_idx];
log_wr("Bin5 constructor");
for ($i = 0 ; $i < $table->player_n ; $i++) {
@@ -1200,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;
@@ -1217,7 +1219,32 @@ class Bin5 {
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)
{
@@ -1232,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;
@@ -1242,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;
@@ -1341,7 +1361,7 @@ class Bin5 {
}
- function chatt_send($user, $mesg)
+ function chatt_send($user, $mesg, $mlang_indwr = NULL)
{
GLOBAL $mlang_brisk, $G_lang;
@@ -1367,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 {
@@ -1438,7 +1458,7 @@ class Bin5 {
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));
@@ -1476,7 +1496,6 @@ class Bin5 {
break;
case "index_wr.php":
- // FIXME $content can be unset
if (isset($table_idx) && isset($table_token)) {
if (($bri = $s_a_p->app->match_get($table_idx, $table_token)) != FALSE) {
ob_start();
@@ -1495,7 +1514,7 @@ class Bin5 {
return TRUE;
break;
- case "index_rd_ifra.php":
+ case "index_rd.php":
if (($transp = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
$transp = "iframe";
if ($transp == 'websocket')
@@ -1514,6 +1533,8 @@ class Bin5 {
return TRUE;
break;
}
+ $bri->brisk->sess_cur_set($user->sess);
+
// close a previous opened index_read_ifra socket, if exists
if (($prev = $user->rd_socket_get()) != NULL) {
$s_a_p->socks_unset($user->rd_socket_get());
@@ -1630,6 +1651,9 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
$ret .= show_table_info(&$bri, &$table, $table_pos);
$ret .= "setTimeout(preload_images, 500, g_preload_img_arr, g_imgct);";
}
+ else {
+ $ret .= "\$('imgct').innerHTML = \$('imgct').innerHTML = mlang_commons['imgload_a'][g_lang]+\"100%.\";";
+ }
if (!$is_again)
$ret .= table_welcome($user);
@@ -1821,9 +1845,15 @@ function show_table_info(&$bri, &$table, $table_pos)
{
GLOBAL $G_lang, $mlang_bin5_bin5;
+ $tg_br = "
";
+ $tg_hr = "
";
+ $tg_bo = "";
+ $tg_bc = "";
+
$ret = "";
$user = $bri->user[$table->player[$table_pos]];
+ // TAG: POINTS_MANAGEMENT
$pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
$noty = sprintf(' | ');
@@ -1849,9 +1879,15 @@ function show_table_info(&$bri, &$table, $table_pos)
$noty .= "
|---|
";
$noty .= "
";
if ($table->old_reason != "") {
+ $noty .= sprintf($mlang_bin5_bin5['info_last'][$G_lang],
+ $tg_br, $tg_hr, $tg_bo, $tg_bc);
+ $noty .= '
';
$noty .= $table->old_reason;
}
+ $noty .= sprintf($mlang_bin5_bin5['info_curr'][$G_lang],
+ $tg_br, $tg_hr, $tg_bo, $tg_bc);
+ $noty .= '
';
/* MLANG: "Fai tu il mazzo,", "Il mazzo a $unam," */
if ($table->mazzo == $table_pos)
$noty .= $mlang_bin5_bin5['info_yshuf'][$G_lang];
@@ -1883,10 +1919,10 @@ function show_table_info(&$bri, &$table, $table_pos)
if ($multer > 1) {
$noty .= sprintf($mlang_bin5_bin5['info_mult'][$G_lang], multoval($multer) );
}
- $noty .= "
";
+ $noty .= "
";
if ($table->match_id != -1) {
$noty .= sprintf($mlang_bin5_bin5['info_match'][$G_lang], $table->match_id);
- $noty .= "
";
+ $noty .= "
";
}
$ret .= show_notify($noty, 3000, $mlang_bin5_bin5['btn_bkgame'][$G_lang], 500, 400);
/* NOTE: show_notify($noty, 3000, "torna alla partita", 500,
@@ -1947,10 +1983,11 @@ function briscola_show($bri, $table, $user)
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);
@@ -1968,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;
@@ -2017,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 );
@@ -2044,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);
@@ -2076,7 +2115,7 @@ function game_description($act, $form, $old_mult, $win = -1, $win_name = "?1?",
$tg_br, $tg_hr, $tg_bo, $tg_bc,
multoval($old_multer));
}
- $noty .= sprintf('%2$s%1$s', $tg_br, $tg_hr);
+ $noty .= sprintf('%2$s', $tg_br, $tg_hr);
return ($noty);
}