X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=94d0788f4a49bc12561a89e480beea986f88eede;hb=d74b7138ed4d14834b26355a7f5d9350bc96ee44;hp=9eadb627a4384161c9f382bf103e7d8a5520bfae;hpb=933c84955d9b255c83aa33ad0a6f6656042e9244;p=brisk.git
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 9eadb62..94d0788 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, 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'),
// 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,%1$s',
+ 'en' => '%3$s%5$s%4$s play alone against each other,%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'),
@@ -295,6 +300,8 @@ class Bin5_table extends Table {
$thiz->card = array();
$thiz->bunch_create();
$thiz->mazzo = rand(0,PLAYERS_N-1);
+ $thiz->points = array();
+ $thiz->total = array();
$thiz->points_n = 0;
$thiz->mult = 0;
@@ -626,8 +633,12 @@ class Bin5_table extends Table {
$this->old_friend = $this->friend;
$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_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);
@@ -649,13 +660,145 @@ class Bin5_table extends Table {
return (TRUE);
}
+ function match_continue(&$bri, $user, $match_id_s)
+ {
+ $ret = FALSE;
+ $curtime = time();
+
+ do {
+ /* - verify if match_id and user are both valid to accept
+ the match_continue request - */
+ $match_id = (int)$match_id_s;
+ if ($match_id <= 0) {
+ $msg = "questa partita non esiste";
+ break;
+ }
+
+ if ($user->continue_get() == BIN5_USER_CONTINUE_ALREADY) {
+ $msg = "Hai già richiesto di continuare una partita.";
+ break;
+ }
+
+ if ($user->continue_get() == $match_id) {
+ $msg = "Hai già richiesto di continuare questa partita.";
+ break;
+ }
+ // retrieves users list for this match
+ $match_data = array();
+ if (($bdb = BriskDB::create()) != FALSE) {
+ // match_order_get return FALSE for old matches
+ $ucodes = $bdb->match_order_get($match_data, $match_id, BIN5_PLAYERS_N);
+ unset($bdb);
+ }
+ if ($ucodes == FALSE) {
+ $msg = "questa partita non è stata memorizzata correttamente";
+ break;
+ }
+
+ // if current user code must be in the users list
+ if (array_search($user->code, $ucodes) === FALSE) {
+ $msg = sprintf("Questo utente non compare nella partita che si vuole continuare [%d].", $user->code);
+ break;
+ }
+
+ /* - the user is in the list, add the match_id to his profile
+ and check if he is the N'th to require continue - */
+
+ // set the match_id for the current user
+ $user->continue_set($match_id);
+
+ for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+ $user_cur = &$bri->user[$this->player[$i]];
+ if ($user_cur->continue_get() != $match_id) {
+ break;
+ }
+ }
+ $ret = TRUE;
+ // not all players set the continue match than we exit
+ if ($i < BIN5_PLAYERS_N) {
+ $msg = sprintf("L'utente %s vorrebbe continuare la partita n° %d.",
+ xcape($user->name), $match_id);
+ break;
+ }
+
+ /* - all users decide to continue the same match, update all infos and rearrange users
+ to the right positions on the table - */
+
+ /* reset users table order */
+ for ($i = 0 ; $i < BIN5_PLAYERS_N - 1 ; $i++) {
+ if ($bri->user[$this->player[$i]]->code == $ucodes[$i]) {
+ continue;
+ }
+ for ($e = $i + 1 ; $e < BIN5_PLAYERS_N ; $e++) {
+ if ($bri->user[$this->player[$e]]->code == $ucodes[$i]) {
+ $swap = $this->player[$i];
+ $this->player[$i] = $this->player[$e];
+ $this->player[$e] = $swap;
+ $bri->user[$this->player[$i]]->table_pos = $i;
+ $bri->user[$this->player[$e]]->table_pos = $e;
+ }
+ }
+ }
+ for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+ fprintf(STDERR, "USERZ: [%s]\n", $bri->user[$this->player[$i]]->name);
+ }
+
+ // update database info to be aligned with current table (ttok and table_idx
+ if (($bdb = BriskDB::create()) != FALSE) {
+ if ($bdb->match_continue($match_id, $this, $user->table_orig) == FALSE) {
+ unset($bdb);
+ $msg = "aggiornamento dei dati della partita fallito";
+ break;
+ }
+ unset($bdb);
+ }
+
+ /* bunch and multiplier status set */
+ $this->mazzo = $match_data['mazzo_next'];
+ $this->mult = $match_data['mult_next'];
+ $this->match_id = $match_id;
+ $this->game_init(&$bri->user);
+
+ /* reload of the page with the new layout */
+ for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+ $user_cur = &$bri->user[$this->player[$i]];
+ $user_cur->continue_set(BIN5_USER_CONTINUE_ALREADY);
+
+ $user_cur->trans_step = $user_cur->step + 1;
+ $user_cur->comm[$user_cur->step % COMM_N] = sprintf('gst.st_loc++; gst.st=%d; xstm.stop(); window.onunload = null ; window.onbeforeunload = null ; document.location.assign("index.php");|', $user_cur->step+1);
+ $user_cur->step_inc();
+
+ // a void command force xynt-streamer to flush all data to client
+ $user_cur->trans_step = $user_cur->step + 1;
+ $user_cur->comm[$user_cur->step % COMM_N] = "";
+ $user_cur->step_inc();
+
+ $user_cur->comm[$user_cur->step % COMM_N] = show_table(&$bri, &$user_cur, $user_cur->step+1, TRUE, FALSE);
+ $user_cur->step_inc();
+ }
+ return (TRUE);
+ } while (FALSE);
+
+ $dt = date("H:i ", $curtime);
+ for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+ if ($ret == FALSE && $this->player[$i] != $user->idx)
+ 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->step_inc();
+ }
+ }
+
} // end class Bin5_table
define('BIN5_USER_FLAG_RING_ENDAUCT', 0x01);
-
+define('BIN5_USER_CONTINUE_INIT', -1);
+define('BIN5_USER_CONTINUE_ALREADY', -2);
class Bin5_user extends User {
var $asta_card; //
var $asta_pnt; //
@@ -663,6 +806,8 @@ class Bin5_user extends User {
var $exitislock; // Player can exit from the table ?
var $privflags; // Flags for briskin5 only
+ var $continue; // Id of the match that the user would continue
+
const BASE = "../";
function User() {
@@ -678,6 +823,7 @@ class Bin5_user extends User {
$thiz->handpt = -1;
$thiz->exitislock = TRUE;
$thiz->privflags = 0;
+ $thiz->continue = BIN5_USER_CONTINUE_INIT;
return ($thiz);
}
@@ -697,6 +843,7 @@ class Bin5_user extends User {
$this->handpt = $from->handpt;
$this->exitislock = $from->exitislock;
$this->privflags = $from->privflags;
+ $this->continue = $from->continue;
}
/* CLONE NOT USED
@@ -725,11 +872,13 @@ class Bin5_user extends User {
/* NOTE: at this moment idx and table_pos fields have the same value
but diffentent functions, we keep them separated for a while */
$thiz->room = $bri;
- $thiz->idx = $table_pos;
+ $thiz->idx = $table_pos; // it is the position in the mini-room,
+ // not related to table pos (see below)
$thiz->asta_card = -2;
$thiz->asta_pnt = -1;
$thiz->handpt = -1;
$thiz->exitislock = TRUE;
+ $thiz->continue = BIN5_USER_CONTINUE_INIT;
log_wr("Bin5 constructor");
@@ -861,13 +1010,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;
@@ -877,14 +1024,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']++;
@@ -895,7 +1042,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 {
@@ -905,7 +1052,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");
/***************
@@ -921,33 +1068,33 @@ 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); */
+ /* $sem = Brisk::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); */
+ /* 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("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;
@@ -955,9 +1102,9 @@ 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');
@@ -981,24 +1128,27 @@ class Bin5_user extends User {
} /* if ($this->the_end == TRUE) { ... */
} /* if ($this->the_end == TRUE) { ... */
- } /* if ($cur_step < $this->step) { */
+ } /* if ($this->rd_step < $this->step) { */
- /* Room::unlock_data($sem); */
- } /* else of if ($cur_step == -1) { */
+ /* Brisk::unlock_data($sem); */
+ } /* else of if ($this->rd_step == -1) { */
return ($ret);
- } // function maincheck (...
-
-
-
+ } // function maincheck(...
+ function continue_set($match_code)
+ {
+ $this->continue = $match_code;
+ }
+ function continue_get() {
+ return ($this->continue);
+ }
} // end class Bin5_user
-
class Bin5 {
static $delta_t = array();
@@ -1017,7 +1167,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();
@@ -1028,8 +1178,8 @@ class Bin5 {
exit;
}
- $user = $room->user;
- $table = $room->table[$table_idx];
+ $user = $brisk->user;
+ $table = $brisk->table[$table_idx];
log_wr("Bin5 constructor");
@@ -1202,95 +1352,23 @@ class Bin5 {
{
GLOBAL $mlang_brisk, $G_lang;
- if ($user->stat == 'table') {
- $table = &$this->table[$user->table];
+ if ($user->stat != 'table') {
+ return;
}
+ $curtime = time();
+ $table = &$this->table[$user->table];
$user_mesg = substr($mesg,6);
- $curtime = time();
+ $ret = FALSE;
+ $mesg = "";
$dt = date("H:i ", $curtime);
- if (strncmp($user_mesg, "/nick ", 6) == 0) {
+ if (strncmp($user_mesg, "/cont ", 6) == 0) {
log_main($user->sess." chatt_send BEGIN");
- if (($name_new = validate_name(substr($user_mesg, 6))) == FALSE) {
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['nickmust'][$G_lang]);
- $user->step_inc();
-
- return;
- }
- $user_mesg = "COMMAND ".$user_mesg;
- // Search dup name
- // change
- // update local graph
- // update remote graphs
- for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
- $user_cur = $this->user[$i];
- // if ($user_cur->sess == '' || $user_cur->stat != 'room')
- if ($user_cur->sess == '')
- continue;
- if (strcasecmp($user_cur->name, $name_new) == 0) {
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-
- $premsg = sprintf($mlang_brisk['nickdupl'][$G_lang], xcape($name_new));
- $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $premsg);
- $user->step_inc();
- break;
- }
- }
- if ($i == BIN5_MAX_PLAYERS) {
- if ($user->flags & USER_FLAG_AUTH && strcasecmp($user->name,$name_new) != 0) {
- if ($this->table[$user->table]->auth_only == TRUE) {
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_brisk['authchan'][$G_lang]);
- $user->step_inc();
- return;
- }
- else {
- $user->flags &= ~USER_FLAG_AUTH; // Remove auth if name changed
- }
- }
-
- $user->name = $name_new;
-
- log_main($user->sess." chatt_send start set");
-
-
- for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
- log_main($user->sess." chatt_send set loop");
-
- $user_cur = &$this->user[$i];
- if ($user_cur->sess == '')
- continue;
-
- if ($user_cur->stat == 'table' && $user_cur->table == $user->table) {
- $table = &$this->table[$user->table];
-
- $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
- $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('set_names([%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"], [%d, "%s"]); ',
- $this->user[$table->player[($user_cur->table_pos) % BIN5_PLAYERS_N]]->flags,
- xcape($this->user[$table->player[($user_cur->table_pos) % BIN5_PLAYERS_N]]->name),
-
- $this->user[$table->player[($user_cur->table_pos+1) % BIN5_PLAYERS_N]]->flags,
- xcape($this->user[$table->player[($user_cur->table_pos+1) % BIN5_PLAYERS_N]]->name),
-
- $this->user[$table->player[($user_cur->table_pos+2) % BIN5_PLAYERS_N]]->flags,
- xcape($this->user[$table->player[($user_cur->table_pos+2) % BIN5_PLAYERS_N]]->name),
-
- (BIN5_PLAYERS_N == 3 ? 0: $this->user[$table->player[($user_cur->table_pos+3) % BIN5_PLAYERS_N]]->flags),
- (BIN5_PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+3) % BIN5_PLAYERS_N]]->name)),
-
- (BIN5_PLAYERS_N == 3 ? 0: $this->user[$table->player[($user_cur->table_pos+4) % BIN5_PLAYERS_N]]->flags),
- (BIN5_PLAYERS_N == 3 ? "" : xcape($this->user[$table->player[($user_cur->table_pos+4) % BIN5_PLAYERS_N]]->name)));
- if ($user_cur == $user) {
- $user_cur->comm[$user_cur->step % COMM_N] .= $user_cur->myname_innerHTML();
- }
- $user_cur->step_inc();
- }
- }
- }
+ $match_id = substr($user_mesg, 6);
+ $table->match_continue($this, $user, $match_id);
}
else {
for ($i = 0 ; $i < ($user->stat == 'room' ? BIN5_MAX_PLAYERS : BIN5_PLAYERS_N) ; $i++) {
@@ -1405,7 +1483,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();
@@ -1424,7 +1501,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')
@@ -1559,6 +1636,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);
@@ -1750,6 +1830,11 @@ function show_table_info(&$bri, &$table, $table_pos)
{
GLOBAL $G_lang, $mlang_bin5_bin5;
+ $tg_br = "
";
+ $tg_hr = "