X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=339e4616f0004a98d362abd3ec17f8695289bd62;hb=a077bfd2503b30f044b70ff6f8eaf44ae0de106b;hp=6d5484bd1c5ac5f6e64ccd0e1a476f955111faf7;hpb=14cd1fc05b5d9148de3c427e43bf60cfdf098e9d;p=brisk.git
diff --git a/web/index_wr.php b/web/index_wr.php
index 6d5484b..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.'),
@@ -32,8 +34,8 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
'en' => 'An error was occurred during the saving, try again or contact the administrator.'),
'coerrdb' => array( 'it' => 'Il database è temporaneamente irraggiungibile, riprova più tardi o contatta l\'amministratore.',
'en' => 'The database is temporarly unavailable, retry to later or conctact the administrator.'),
- 'warrmust' => array( 'it' => 'Per autenticare qualcuno devi a tua volta essere autenticato.',
- 'en' => 'To authenticate somebody you have to be authenticated in your turn'),
+ 'warrmust' => array( 'it' => 'Per autenticare qualcuno devi a tua volta essere autenticato e certificato.',
+ 'en' => 'To authenticate somebody you have to be authenticated and certified yourown'),
'mesgrepl' => array( 'it' => '
Il messaggio è stato inoltrato all\'amministratore.',
'en' => '
The message was forwarded to the administrator'),
'mesgmust' => array( 'it' => 'Per mandare messaggi all\'amministratore devi essere autenticato.',
@@ -41,11 +43,11 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
'shutmsg' => array( 'it' => 'Il server sta per essere riavviato, non possono avere inizio nuove partite.',
'en' => 'The server is going to be rebooted, new games are not allowed.'),
'mustauth' => array( 'it' => 'Il tavolo a cui volevi sederti richiede autentifica.',
- 'en' => 'the table where you want to sit require authentication'),
- '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.'),
+ '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'=> 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.',
@@ -68,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)
@@ -127,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 = "";
@@ -232,8 +241,12 @@ 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->flags & USER_FLAG_AUTH) &&
+ if ( ( ! $user->is_auth() ) &&
$brisk->ban_check($user->ip)) {
// TODO: find a way to add a nonblocking sleep(5) here
return (FALSE);
@@ -277,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')
@@ -298,8 +311,8 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$mesg_to_user = "";
- log_wr("INFO:SKIP:argz == warranty name: [".$cli_name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
- if ($user->flags & USER_FLAG_AUTH) {
+ log_wr("INFO:SKIP:argz == warranty name: [".$cli_name."] CERT: ".$user->is_cert());
+ if ($user->is_cert()) {
if (0 == 1) {
if (($wa_lock = Warrant::lock_data(TRUE)) != FALSE) {
if (($fp = @fopen(LEGAL_PATH."/warrant.txt", 'a')) != FALSE) {
@@ -316,7 +329,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
}
else {
/* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]);
+ $mesg_to_user = nickserv_msg($dt, $mlang_indwr['commerr'][$G_lang]);
}
} // 0 == 1
else {
@@ -331,10 +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 = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV,
- ($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');
@@ -387,7 +399,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
}
else {
/* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato." */
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['warrmust'][$G_lang]);
+ $mesg_to_user = nickserv_msg($dt, $mlang_indwr['warrmust'][$G_lang]);
}
if ($mesg_to_user != "") {
@@ -408,8 +420,8 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$mesg_to_user = "";
- log_wr("INFO:SKIP:argz == mesgtoadm name: [".$user->name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
- if ($user->flags & USER_FLAG_AUTH) {
+ log_wr("INFO:SKIP:argz == mesgtoadm name: [".$user->name."] AUTH: ".$user->is_auth());
+ if ($user->is_auth()) {
if (($wa_lock = Warrant::lock_data(TRUE)) != FALSE) {
if (($bdb = BriskDB::create()) != FALSE) {
$bdb->users_load();
@@ -434,19 +446,19 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
}
else {
/* MLANG: "Il database è temporaneamente irraggiungibile, riprova più tardi o contatta l\'amministratore." */
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['coerrdb'][$G_lang]);
+ $mesg_to_user = nickserv_msg($dt, $mlang_indwr['coerrdb'][$G_lang]);
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
}
}
else {
/* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]);
+ $mesg_to_user = nickserv_msg($dt, $mlang_indwr['commerr'][$G_lang]);
}
}
else {
/* MLANG: "Per autenticare qualcuno devi a tua volta essere autenticato." */
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['mesgmust'][$G_lang]);
+ $mesg_to_user = nickserv_msg($dt, $mlang_indwr['mesgmust'][$G_lang]);
}
if ($mesg_to_user != "") {
@@ -487,10 +499,10 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$dobreak = FALSE;
do {
- log_wr("INFO:SKIP:argz == poll name: [".$cli_poll_name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
- if (($user->flags & USER_FLAG_AUTH) != USER_FLAG_AUTH) {
+ log_wr("INFO:SKIP:argz == poll name: [".$cli_poll_name."] AUTH: ".$user->is_auth());
+ if ( ! $user->is_auth() ) {
// MLANG: Per partecipare al sondaggio devi essere autenticato.
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['pollmust'][$G_lang]);
+ $mesg_to_user = nickserv_msg($dt, $mlang_indwr['pollmust'][$G_lang]);
log_wr("break1");
break;
}
@@ -509,7 +521,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
if (($poll_lock = Poll::lock_data(TRUE)) == FALSE) {
/* MLANG: "E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore." */
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]);
+ $mesg_to_user = nickserv_msg($dt, $mlang_indwr['commerr'][$G_lang]);
log_wr("break3");
break;
}
@@ -518,7 +530,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$fp = @fopen(LEGAL_PATH."/".$G_poll_name.".txt", 'w+');
if ($fp == FALSE) {
- $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]);
+ $mesg_to_user = nickserv_msg($dt, $mlang_indwr['commerr'][$G_lang]);
log_wr("break4");
break;
}
@@ -645,7 +657,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
}
else if ($argz[0] == 'tosmgr') {
// check IF is authnticated user, both terms of service versions matches
- if ($user->flags & USER_FLAG_AUTH && count($argz) == 5) {
+ if ($user->is_auth() && count($argz) == 5) {
$f_type = $argz[1]; $f_code = $argz[2];
$f_tos_curr = $argz[3]; $f_tos_vers = $argz[4];
@@ -692,21 +704,20 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$not_allowed_msg = "";
if ($G_shutdown) {
- $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");',
- $dt, NICKSERV, $mlang_indwr['shutmsg'][$G_lang]);
+ $not_allowed_msg = nickserv_msg($dt, $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]);
+ $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]);
}
- 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 ($table->auth_type == TABLE_AUTH_TY_AUTH && ( ! $user->is_auth() ) ) {
+ $not_allowed_msg = nickserv_msg($dt, $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]);
+ $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['mustfirst'][$G_lang]);
}
if ($not_allowed_msg != "") {
$user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ".$not_allowed_msg;
@@ -718,12 +729,12 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
// if ($user->bantime > $user->laccwr) {
require_once("Obj/hardban.phh");
- if (($bantime = Hardbans::check(($user->flags & USER_FLAG_AUTH ? $user->name : FALSE),
+ if (($bantime = Hardbans::check(($user->is_auth() ? $user->name : FALSE),
$user->ip, $user->sess)) != -1) {
$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->flags & USER_FLAG_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);
+ if ($user->is_auth()) {
+ $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 ???");
}
}
/**********************
@@ -834,15 +852,19 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
* *
**********************/
else if ($user->subst == 'sitdown') {
+ if ($user->the_end == TRUE) {
+ log_wr("INFO:SKIP:argz == sitdown && ->the_end == TRUE => ignore request.");
+ return FALSE;
+ }
+
if ($argz[0] == 'wakeup') {
$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);
}
}
}