X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Findex_wr.php;h=339e4616f0004a98d362abd3ec17f8695289bd62;hb=refs%2Ftags%2Fv4.18.1;hp=28b476e7ade3f10cc60371f81ab28d1cb19d9a5a;hpb=aa1fa37d0bd35d6f8d7b55ec1a6a92140f4ce9e0;p=brisk.git
diff --git a/web/index_wr.php b/web/index_wr.php
index 28b476e..339e461 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -3,7 +3,7 @@
* brisk - index_wr.php
*
* Copyright (C) 2006-2014 Matteo Nastasi
- * mailto: nastasi@alternativeoutput.it
+ * mailto: nastasi@alternativeoutput.it
* matteo.nastasi@milug.org
* web: http://www.alternativeoutput.it
*
@@ -22,7 +22,9 @@
*
*/
-$mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
+$mlang_indwr = array( 'unknownerr' => array( 'it' => 'errore sconosciuto',
+ 'en' => 'unknown error'),
+ 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
'en' => 'Back to tables.' ),
'warrrepl' => array( 'it' => '
Il nominativo è stato inoltrato all\'amministratore.
Nell\'arco di pochi giorni verrà
notificata al garantito l\'avvenuta registrazione.',
'en' => '
The subscription was forwarded to the administrator.
In a few days we will notify
your friend the occurred registration.'),
@@ -44,10 +46,8 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
'en' => 'The table where you want to sit require authentication'),
'mustcert' => array( 'it' => 'Il tavolo a cui volevi sederti richiede autentifica e certificazione.',
'en' => 'The table where you want to sit require authentication and certification'),
- 'tabwait_a'=> array( 'it' => 'Il tavolo si è appena liberato, ci si potrà sedere tra ',
- 'en' => 'The table is only just opened, you will sit down in '), // FIXME
- 'tabwait_b'=> array( 'it' => ' secondi.',
- 'en' => ' seconds.'),
+ 'tabwait'=> array( 'it' => 'Il tavolo si è appena liberato, ci si potrà sedere tra %d secondi.',
+ 'en' => 'The table is only just opened, you will sit down in %d 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.',
@@ -70,6 +70,10 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
'en' => '
You or someone with your same IP address is standing up from a table without the permission of the other players
You will wait '),
'badsit_b' => array( 'it' => ' prima di poterti sedere nuovamente.
Se non sei stato tu ad alzarti e possiedi un login con password, autenticandoti con quello, potrai accedere.',
'en' => ' before you can sit down again. If you don\'t leave the table and you have a login with a password, authenticating with this one you will access'),
+ 'nu_loginau' => array('it' => "login già in uso",
+ 'en' => "login already in use"),
+ 'nu_emailau' => array('it' => "email già utilizzata",
+ 'en' => "email already in use"),
'nu_msubj' => array( 'it' => 'Brisk: verifica email',
'en' => 'Brisk: email verification'),
// %s(guar) %s(login) %s(baseurl) %d(code) %s(hash)
@@ -129,9 +133,12 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
log_load("index_wr.php");
$remote_addr = addrtoipv4($remote_addr_full);
- if (($mesg = gpcs_var('mesg', $get, $post, $cookie)) === FALSE)
+ if (($mesg = gpcs_var('mesg', $get, $post, $cookie)) === FALSE)
unset($mesg);
+ if (($cl_step = gpcs_var('stp', $get, NULL, NULL)) === FALSE)
+ $cl_step = -2;
+
if (($sess = gpcs_var('sess', $get, $post, $cookie)) === FALSE)
$sess = "";
@@ -234,6 +241,10 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
// LACC UPDATED
$user->lacc = $curtime;
+ if ($user->cl_step < $cl_step) {
+ log_step(sprintf("%s|%s|%d|%d|%d|%d", $user->sess, $user->name, $user->step, $user->cl_step, $cl_step, $user->step - $user->cl_step));
+ $user->cl_step = $cl_step;
+ }
if ( ( ! $user->is_auth() ) &&
$brisk->ban_check($user->ip)) {
@@ -279,7 +290,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
else if ($argz[0] == 'shutdown') {
log_auth($user->sess, "Shutdown session.");
- $user->reset();
+ $user->the_end = TRUE;
log_rd2("AUTO LOGOUT.");
if ($user->subst == 'sitdown' || $user->stat == 'table')
@@ -333,9 +344,9 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
// check for already used fields
if (($idret = $bdb->check_record_by_login_or_email($cli_name, $cli_email)) != 0) {
- $mesg_to_user = nickserv_msg($dt, ($idret == 1 ? "login già in uso" :
- ($idret == 2 ? "email già utilizzata"
- : "errore sconosciuto")));
+ $mesg_to_user = nickserv_msg($dt, ($idret == 1 ? $mlang_indwr['nu_loginau'][$G_lang] :
+ ($idret == 2 ? $mlang_indwr['nu_emailau'][$G_lang]
+ : $mlang_indwr['unknownerr'][$G_lang])));
break;
}
$bdb->transaction('BEGIN');
@@ -696,8 +707,8 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$not_allowed_msg = nickserv_msg($dt, $mlang_indwr['shutmsg'][$G_lang]);
}
else if ($table->wakeup_time > $curtime) {
- $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['tabwait_a'][$G_lang],
- $table->wakeup_time - $curtime, $mlang_indwr['tabwait_b'][$G_lang]);
+ $not_allowed_msg = nickserv_msg($dt, sprintf($mlang_indwr['tabwait'][$G_lang],
+ $table->wakeup_time - $curtime));
}
else if ($table->auth_type == TABLE_AUTH_TY_CERT && ( ! $user->is_cert() ) ) {
$not_allowed_msg = nickserv_msg($dt, $mlang_indwr['mustcert'][$G_lang]);
@@ -723,7 +734,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
/* MLANG: "
Ti sei alzato da un tavolo senza il consenso degli altri giocatori.
Dovrai aspettare ancora ".secstoword($user->bantime - $user->laccwr)." prima di poterti sedere nuovamente.", "resta in piedi.", "
Tu o qualcuno col tuo stesso indirizzo IP si è alzato da un tavolo senza il consenso degli altri giocatori.
Dovrai aspettare ancora ".secstoword($bantime - $user->laccwr)." prima di poterti sedere nuovamente.
Se non sei stato tu ad alzarti e possiedi un login con password, autenticandoti con quello, potrai accedere." */
if ($user->is_auth()) {
- $user->comm[$user->step % COMM_N] .= show_notify($mlang_indwr['badwake_a'][$G_lang].secstoword($user->bantime - $user->laccwr).$mlang_indwr['badwake_b'][$G_lang], 2000, $mlang_indwr['btn_stays'][$G_lang], 400, 100);
+ $user->comm[$user->step % COMM_N] .= show_notify($mlang_indwr['badwake_a'][$G_lang].secstoword($bantime - $user->laccwr).$mlang_indwr['badwake_b'][$G_lang], 2000, $mlang_indwr['btn_stays'][$G_lang], 400, 140);
}
else {
$user->comm[$user->step % COMM_N] .= show_notify($mlang_indwr['badsit_a'][$G_lang].secstoword($bantime - $user->laccwr).$mlang_indwr['badsit_a'][$G_lang], 2000, $mlang_indwr['btn_stays'][$G_lang], 400, 180);
@@ -792,7 +803,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$bin5_user_cur->trans_step = $user_cur->step + 1;
$bin5_user_cur->comm[$bin5_user_cur->step % COMM_N] = "";
$bin5_user_cur->step_inc();
- $bin5_user_cur->comm[$bin5_user_cur->step % COMM_N] = show_table(&$bin5,&$bin5_user_cur,$bin5_user_cur->step+1,TRUE, FALSE);
+ $bin5_user_cur->comm[$bin5_user_cur->step % COMM_N] = show_table(&$bin5,&$bin5_user_cur,$bin5_user_cur->step+1,TRUE,FALSE);
$bin5_user_cur->step_inc();
log_wr("TRY PRESAVE: ".$bin5_user_cur->step." TRANS STEP: ".$bin5_user_cur->trans_step);
@@ -822,10 +833,17 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
log_wr("MOP finish");
}
else if ($argz[0] == 'logout') {
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $user->comm[$user->step % COMM_N] .= 'postact_logout();';
+ $brisk->ghost_sess->push($curtime, $user->sess, GHOST_SESS_REAS_LOUT);
$user->the_end = TRUE;
- $user->step_inc();
+
+ if ($user->subst == 'sitdown') {
+ log_load("ROOM WAKEUP");
+ $brisk->room_wakeup($user);
+ }
+ else if ($user->subst == 'standup')
+ $brisk->room_outstandup($user);
+ else
+ log_rd2("LOGOUT FROM WHAT ???");
}
}
/**********************
@@ -843,11 +861,10 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$brisk->room_wakeup($user);
}
else if ($argz[0] == 'logout') {
- $brisk->room_wakeup($user);
- $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
- $user->comm[$user->step % COMM_N] .= 'postact_logout();';
+ $brisk->ghost_sess->push($curtime, $user->sess, GHOST_SESS_REAS_LOUT);
$user->the_end = TRUE;
- $user->step_inc();
+
+ $brisk->room_wakeup($user);
}
}
}