X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=9382782a1d9ae03c28a463c38c8cd1ad11054997;hb=db5d6355c39327ba7f8052f360f1e846ba4ad01c;hp=9523cd4d2800f4c5fb0578027edd1169ffa3e859;hpb=827cf9b1db2abe2e726ac97063f90445244cf99f;p=brisk.git
diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 9523cd4..9382782 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -53,53 +53,6 @@ $mlang_bin5_bin5 = array(
'info_match'=> array( 'it' => 'Il codice della partita è %d.',
'en' => 'Match code is %d.'),
-
-
- // 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'),
-
- // br, hr, b, /b, old_asta_pnt, old_pnt, winornot
- 'info_alea' => array( 'it' => 'dovevano fare %3$salmeno %5$d%4$s punti e ne hanno fatti %3$s%6$d%4$s: hanno %7$s.%1$s',
- 'en' => 'they had to do %3$sat least %5$d%4$s points and they had made %3$s%6$d%4$s: they have %7$s.%1$s'),
- // br, hr, b, /b, old_pnt, winornot
- 'info_more' => array( 'it' => 'dovevano fare %3$spiù di 60%4$s punti e ne hanno fatti %3$s%5$d%4$s: hanno %6$s.%1$s',
- 'en' => 'they had to do %3$sover 60%4$s points and they had made %3$s%5$d%4$s: they have %3$s%6$s%4$s.%1$s'),
- 'info_win' => array( 'it' => 'vinto',
- 'en' => 'win'),
- 'info_peer' => array( 'it' => 'pareggiato',
- 'en' => 'drew'),
- 'info_lost' => array( 'it' => 'perso',
- 'en' => 'lost'),
-
- // br, hr, b, /b, win_name
- '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'),
- // br, hr, b, /b, old_pnt, winornot
- 'info_morea' => array( 'it' => 'doveva fare %3$spiù di 60%4$s punti e ne ha fatti %3$s%5$d%4$s: ha %3$s%6$s%4$s.%1$s',
- 'en' => 'he/she had to do %3$smore than 60%4$s points and they had made %3$s%5$d%4$s: he/she had %3$s%6$s%4$s.%1$s'),
- // br, hr, b, /b
- 'info_acap' => array( 'it' => 'ha fatto %3$scappotto%4$s EBBRAVO!.%1$s',
- 'en' => 'and he/she made %3$scapot%4$s WELL DONE!.%1$s'),
-
- // br, hr, b, /b
- 'info_omul' => array( 'it' => '%1$sLa partita valeva %3$s%5$s%4$s.%1$s',
- 'en' => '%1$sEN: The game was worth %3$s%5$s%4$s.%1$s' ),
-
- // br, hr, b, /b
- 'info_alpa' => array( 'it' => '%1$sHanno passato %3$stutti%4$s.%1$s',
- 'en' => '%1$sEN: Hanno passato %3$stutti%4$s.%1$s' ),
-
- // br, hr, b, /b, aband-name
- 'info_aban' => array( 'it' => ' Ha lasciato %3$s%5$s%4$s perché aveva al massimo %3$s2 punti%4$s.',
- 'en' => ' EN: Ha lasciato %3$s%5$s%4$s perché aveva al massimo %3$s2 punti%4$s.'),
-
'btn_bkgame'=> array( 'it' => 'torna alla partita',
'en' => 'back to the game'),
'call_wptn' => array( 'it' => '
con %d punti',
@@ -130,7 +83,16 @@ function multoval($mult)
function dom_select_rules()
{
- printf("");
+ GLOBAL $G_lang;
+
+ $ret = "\n";
+
+ echo "$ret";
}
class Card {
@@ -302,6 +264,7 @@ class Bin5_table extends Table {
function spawn(&$from)
{
+ GLOBAL $G_lang;
if (($thiz =& new Bin5_table()) == FALSE)
return (FALSE);
@@ -609,7 +572,7 @@ class Bin5_table extends Table {
$this->mazzo = $match_data['mazzo_next'];
$this->mult = $match_data['mult_next'];
$this->match_id = $match_id;
- $this->game_init(&$bri->user);
+ $this->game_init($bri->user);
/* reload of the page with the new layout */
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
@@ -624,7 +587,7 @@ class Bin5_table extends Table {
$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->comm[$user_cur->step % COMM_N] = show_table($bri, $user_cur, $user_cur->step+1, TRUE, FALSE);
$user_cur->step_inc();
}
return (TRUE);
@@ -643,6 +606,8 @@ class Bin5_table extends Table {
function rules_change(&$bri, $user, $rules_id_s)
{
+ GLOBAL $G_lang;
+
//
// Rules: update version following loaded tcode
//
@@ -651,18 +616,26 @@ class Bin5_table extends Table {
do {
if ($this->match_id != -1) {
+ // FIXME_LANG
$msg = sprintf("Stai già giocando la partita con codice %d.", $this->match_id);
break;
}
+ if ($this->asta_card != -1 || $this->asta_pla_n < BIN5_PLAYERS_N) {
+ // FIXME_LANG
+ $msg = sprintf("La partita è già stata avviata.");
+ break;
+ }
+
$rules_id = (int)$rules_id_s;
- // FIXME: from dynamic rules list
- if ($rules_id != 1 && $rules_id != 2 && $rules_id != 4) {
+ if (! in_array($rules_id, rules_keys())) {
+ // FIXME_LANG
$msg = "queste regole non esistono o non sono attive";
break;
}
if ($user->rules_get() == $rules_id) {
+ // FIXME_LANG
$msg = "hai già richiesto di usare queste regole";
break;
}
@@ -689,7 +662,7 @@ class Bin5_table extends Table {
if ($i < BIN5_PLAYERS_N) {
// FIXME_LANG
$msg = sprintf("L'utente %s voleva già usare le %s.",
- xcape($user_cur->name), xcape(rules_id2descr($user_cur->rules_get())));
+ xcape($user_cur->name), xcape(rules_id2descr($user_cur->rules_get(), $G_lang)));
break;
}
@@ -701,7 +674,7 @@ class Bin5_table extends Table {
if ($rules_tot < BIN5_PLAYERS_N) {
// FIXME_LANG
$msg = sprintf("L'utente %s vorrebbe usare le %s.",
- xcape($user->name), xcape(rules_id2descr($rules_id)));
+ xcape($user->name), xcape(rules_id2descr($rules_id, $G_lang)));
break;
}
@@ -712,7 +685,7 @@ class Bin5_table extends Table {
$rules_name = rules_id2name($rules_id);
$this->rules = new $rules_name($this);
- // $this->game_init(&$bri->user);
+ // $this->game_init($bri->user);
/* reload of the page with the new layout */
for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
@@ -729,20 +702,27 @@ class Bin5_table extends Table {
$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->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] .= nickserv_msg($dt, $msg);
- $user_cur->step_inc();
+ if ($ret == TRUE) {
+ for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
+ $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] .= nickserv_msg($dt, $msg);
+ $user_cur->step_inc();
+ }
+ }
+ else {
+ $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
+ $user->comm[$user->step % COMM_N] = xcape(sprintf("rules_set(%d);",
+ $this->rules->id));
+ $user->comm[$user->step % COMM_N] .= nickserv_msg($dt, $msg);
+ $user->step_inc();
}
} // end function rules_change
} // end class Bin5_table
@@ -967,7 +947,7 @@ class Bin5_user extends User {
protected function page_sync($sess, $page)
{
log_rd2("PAGE_SYNC");
- printf("xXx BIN5_USER::PAGE_SYNC\n");
+ // printf("xXx BIN5_USER::PAGE_SYNC\n");
return (sprintf('xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
}
@@ -1024,8 +1004,8 @@ class Bin5_user extends User {
if ($this->stat == 'table') {
log_load("RESYNC");
/* NOTE: $this->room is associated with the current $bri object */
- printf("xXx CLASS NAME [%s]\n", get_class($this->room));
- $ret = show_table(&$this->room, $this, $this->step, FALSE, FALSE);
+ // printf("xXx CLASS NAME [%s]\n", get_class($this->room));
+ $ret = show_table($this->room, $this, $this->step, FALSE, FALSE);
}
log_rd2("NEWSTAT: ".$this->stat);
@@ -1042,11 +1022,11 @@ class Bin5_user extends User {
if ($this->rd_stat != $this->stat) {
$to_stat = $this->stat;
log_load("RESYNC");
- printf("xXx BIN5_USER::MAINCHECK\n");
+ // 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");
+ // printf("xXx LOST HISTORY!\n");
$this->rd_step = -1;
break;
}
@@ -1137,7 +1117,7 @@ class Bin5 {
$user[$table->player[$i]]->table_token = $table_token;
$this->user[$i] = Bin5_user::spawn($user[$table->player[$i]], $this, $table_idx, $i, $get, $post, $cookie);
}
- $this->table[0] = Bin5_table::spawn(&$table);
+ $this->table[0] = Bin5_table::spawn($table);
log_main("TABLE_OLD_WIN - Bin5:".$this->table[0]->old_asta_win);
@@ -1230,7 +1210,7 @@ class Bin5 {
$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);
+ $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->is_auth() ? $user_cur->name : FALSE),
@@ -1423,7 +1403,7 @@ class Bin5 {
{
GLOBAL $G_ban_list, $G_black_list;
- printf("NEW_SOCKET (root): %d\n", intval($new_socket));
+ // printf("NEW_SOCKET (root): %d\n", intval($new_socket));
$enc = get_encoding($header);
if (isset($header['User-Agent'])) {
@@ -1450,7 +1430,7 @@ class Bin5 {
case "":
case "index.php":
ob_start();
- bin5_index_main($transp_type, $header_out, $addr, $get, $post, $cookie);
+ bin5_index_main($transp_type, $header, $header_out, $addr, $get, $post, $cookie);
$content = ob_get_contents();
ob_end_clean();
@@ -1478,9 +1458,10 @@ class Bin5 {
break;
case "index_rd.php":
+ case "index_rd_wss.php":
if (($transp = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
$transp = "iframe";
- if ($transp == 'websocket')
+ if ($transp == 'websocket' || $transp == 'websocketsec')
$enc = 'plain';
do {
@@ -1502,7 +1483,7 @@ class Bin5 {
if (($prev = $user->rd_socket_get()) != NULL) {
$s_a_p->socks_unset($user->rd_socket_get());
fclose($user->rd_socket_get());
- printf("CLOSE AND OPEN AGAIN ON IFRA2\n");
+ // printf("CLOSE AND OPEN AGAIN ON IFRA2\n");
$user->rd_socket_set(NULL);
}
@@ -1525,7 +1506,7 @@ class Bin5 {
$s_a_p->socks_set($new_socket, $user, NULL);
$user->rd_socket_set($new_socket);
- printf(" - qui ci siamo - ");
+ // printf(" - qui ci siamo - ");
return TRUE;
} while (FALSE);
@@ -1580,11 +1561,13 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
$table_pos = $user->table_pos;
$ret = "table_init();";
- $ret .= $table->exitlock_show(&$bri->user, $table_pos);
+ $ret .= $table->exitlock_show($bri->user, $table_pos);
if (!$is_again) {
/* GENERAL STATUS */
- $ret .= sprintf( 'gst.st = %d; stat = "%s"; subst = "%s"; table_pos = %d;',
- $sendstep, $user->stat, $user->subst, $table_pos);
+ $user_rules = $user->rules_get();
+ $ret .= sprintf('gst.st = %d; stat = "%s"; subst = "%s"; table_pos = %d; rules_set(%d);',
+ $sendstep, $user->stat, $user->subst, $table_pos,
+ ($user_rules == BIN5_USER_CONTINUE_INIT ? $table->rules->id_get() : $user_rules));
log_rd(sprintf( 'SHOW_TABLE: gst.st = %d; stat = "%s"; subst = "%s"; table_pos = %d;', $sendstep, $user->stat, $user->subst, $table_pos));
@@ -1611,7 +1594,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
}
/* NOTIFY FOR THE CARD MAKER */
if ($is_transition) { // && $user->subst == "asta" superfluo
- $ret .= show_table_info(&$bri, &$table, $table_pos);
+ $ret .= show_table_info($bri, $table, $table_pos);
$ret .= "setTimeout(preload_images, 500, g_preload_img_arr, g_imgct);";
}
else {
@@ -1621,7 +1604,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
$ret .= table_welcome($user);
if ($is_transition && !$is_again) { // just sit, play cow
- $ret .= playsound("cow.mp3");
+ $ret .= playsound("cow");
}
@@ -1819,7 +1802,7 @@ function show_table_info(&$bri, &$table, $table_pos)
// TAG: POINTS_MANAGEMENT
$pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
- $noty = sprintf('%s.
\n', xcape(ucfirst(rules_id2descr($table->rules->id_get()))));
+ $noty = sprintf('%s.
\n', xcape(ucfirst(rules_id2descr($table->rules->id_get(), $G_lang))));
$noty .= sprintf('