X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=inline;f=web%2Findex_wr.php;h=a9d890674049b05c40d4f89674beda16b8e0622a;hb=eb65f5518b0cacc60e1dd265ab966290e7cc0c54;hp=8571c76d1bc89874c849e1cfc5fcef473cc81fc8;hpb=628c0ad0666348d62d0e46fcace789c38edb5350;p=brisk.git
diff --git a/web/index_wr.php b/web/index_wr.php
index 8571c76..a9d8906 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -56,6 +56,8 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
'en' => 'The table is only just opened, you will sit down in '), // FIXME
'tabwait_b'=> array( 'it' => ' secondi.',
'en' => ' seconds.'),
+ 'mustfirst'=> array( 'it' => 'Il tuo utente può sedersi al tavolo solo per primo.',
+ 'en' => 'Your can sit down as first user only.' ),
'pollmust' => array( 'it' => 'Per partecipare al sondaggio devi essere autenticato.',
'en' => 'To vote for the poll you have to be authenticated'),
'pollnone' => array( 'it' => '
Al momento non è attivo alcun sondaggio.',
@@ -105,7 +107,7 @@ function index_wr_main(&$room, $remote_addr_full, $get, $post, $cookie)
/* if the IP is banned, exit without do nothing */
if (array_search($remote_addr, $G_black_list) !== FALSE) {
- sleep(5);
+ // TODO: find a way to add a nonblocking sleep(5) here
return (FALSE);
}
@@ -199,6 +201,11 @@ function index_wr_main(&$room, $remote_addr_full, $get, $post, $cookie)
// LACC UPDATED
$user->lacc = $curtime;
+ if (array_search($user->ip, $G_black_list) !== FALSE) {
+ // TODO: find a way to add a nonblocking sleep(5) here
+ return (FALSE);
+ }
+
if ($argz[0] == 'ping') {
log_wr("PING RECEIVED");
}
@@ -562,20 +569,26 @@ function index_wr_main(&$room, $remote_addr_full, $get, $post, $cookie)
$table_idx = (int)$argz[1];
$table = &$room->table[$table_idx];
- if ($G_shutdown || $table->wakeup_time > $curtime ||
- ($table->auth_only && (($user->flags & USER_FLAG_AUTH) == 0)) ) {
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-
- /* MLANG: "Il server sta per essere riavviato, non possono avere inizio nuove partite.", "Il tavolo a cui volevi sederti richiede autentifica.", "Il tavolo si è appena liberato, ci si potrà sedere tra %d secondi." */
- if ($G_shutdown) {
- $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['shutmsg'][$G_lang]);
- }
- else if ($table->auth_only && (($user->flags & USER_FLAG_AUTH) == 0)) {
- $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['mustauth'][$G_lang]);
- }
- else {
- $user->comm[$user->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s%d%s");', $dt, NICKSERV, $mlang_indwr['tabwait_a'][$G_lang], $table->wakeup_time - $curtime, $mlang_indwr['tabwait_b'][$G_lang]);
- }
+ $not_allowed_msg = "";
+ if ($G_shutdown) {
+ $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");',
+ $dt, NICKSERV, $mlang_indwr['shutmsg'][$G_lang]);
+ }
+ else if ($table->wakeup_time > $curtime) {
+ $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s%d%s");',
+ $dt, NICKSERV, $mlang_indwr['tabwait_a'][$G_lang],
+ $table->wakeup_time - $curtime, $mlang_indwr['tabwait_b'][$G_lang]);
+ }
+ else if ($table->auth_only && (($user->flags & USER_FLAG_AUTH) == 0)) {
+ $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");',
+ $dt, NICKSERV, $mlang_indwr['mustauth'][$G_lang]);
+ }
+ else if ($user->flags & USER_FLAG_TY_FIRONLY && $table->player_n > 0) {
+ $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"], "%s");',
+ $dt, NICKSERV, $mlang_indwr['mustfirst'][$G_lang]);
+ }
+ if ($not_allowed_msg != "") {
+ $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ".$not_allowed_msg;
$user->step_inc();
return TRUE;
}
@@ -654,10 +667,7 @@ function index_wr_main(&$room, $remote_addr_full, $get, $post, $cookie)
$bri_user_cur = $bri->user[$i];
$user_cur = $room->user[$table->player[$i]];
- $bri_user_cur->stat_set('table');
- $bri_user_cur->subst = 'asta';
$bri_user_cur->laccwr = $curtime;
-
$bri_user_cur->trans_step = $user_cur->step + 1;
$bri_user_cur->comm[$bri_user_cur->step % COMM_N] = "";
$bri_user_cur->step_inc();
@@ -672,11 +682,8 @@ function index_wr_main(&$room, $remote_addr_full, $get, $post, $cookie)
// // CHECK
while (array_pop($user_cur->comm) != NULL);
- $ret = "";
- $ret .= sprintf('gst.st_loc++; gst.st=%d; createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); createCookie("lang", "%s", 24*365, cookiepath); xstm.stop(); window.onunload = null ; window.onbeforeunload = null ; document.location.assign("briskin5/index.php");|', $user_cur->step+1, $table_idx, $table_token, $G_lang);
-
- $user_cur->comm[$user_cur->step % COMM_N] = $ret;
$user_cur->trans_step = $user_cur->step + 1;
+ $user_cur->comm[$user_cur->step % COMM_N] = sprintf('gst.st_loc++; gst.st=%d; createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); createCookie("lang", "%s", 24*365, cookiepath); xstm.stop(); window.onunload = null ; window.onbeforeunload = null ; document.location.assign("briskin5/index.php");|', $user_cur->step+1, $table_idx, $table_token, $G_lang);
log_wr("TRANS ATTIVATO");
$user_cur->stat_set('table');