X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=14a8b19247d2c9876b01192e23868d7cbe14b289;hb=b8cdf67fa95fe158b8588e98d637fe0ffe654bb5;hp=c1bcaa2c3da90c7595e9efb02a8a11fb634dd321;hpb=a14d9d7ed95e0ad85851e423d4d3295b00e35d2b;p=brisk.git
diff --git a/web/index_wr.php b/web/index_wr.php
index c1bcaa2..14a8b19 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -41,7 +41,9 @@ $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'),
+ '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.',
@@ -75,19 +77,19 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
'Ciao, sono l\' amministratore del sito di Brisk.
L\' utente \'%s\' ha garantito per te col nickname \'%s\',
-vai al link: %s/mailmgr.php?code=%d&hash=%s
+vai al link: <%s>
per confermare il tuo indirizzo di posta elettronica.
Ciò è necessario per ottenere la password.
Saluti e buone partite, mop.',
- 'en' => 'EN mtext [%s] [%s] [%s] [%d] [%s]'),
+ 'en' => 'EN mtext [%s] [%s] [%s]'),
'nu_mhtml' => array( 'it' => 'Ciao, sono l\' amministratore del sito di Brisk.
L\' utente \'%s\' ha garantito per te col nickname \'%s\',
-clicca qui per confermare il tuo indirizzo di posta elettronica.
+clicca qui per confermare il tuo indirizzo di posta elettronica.
Ciò è necessario per ottenere la password.
Saluti e buone partite, mop.
',
- 'en' => 'EN mhtml [%s] [%s] [%s] [%d] [%s]'),
+ 'en' => 'EN mhtml [%s] [%s] [%s]'),
'nu_gtext' => array( 'it' =>
'Ciao %s, sono l\' amministratore del sito di Brisk.
@@ -119,13 +121,13 @@ define('LICMGR_CHO_AFTER', 2);
function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
{
- GLOBAL $G_domain, $G_webbase, $G_mail_domain, $G_mail_seed;
- GLOBAL $G_shutdown, $G_alarm_passwd, $G_black_list, $G_lang, $G_room_help, $G_room_about;
+ GLOBAL $G_domain, $G_webbase, $G_mail_seed;
+ GLOBAL $G_shutdown, $G_alarm_passwd, $G_ban_list, $G_black_list, $G_lang, $G_room_help, $G_room_about;
GLOBAL $G_room_passwdhowto, $mlang_indwr;
GLOBAL $G_tos_vers;
- $remote_addr = addrtoipv4($remote_addr_full);
log_load("index_wr.php");
+ $remote_addr = addrtoipv4($remote_addr_full);
if (($mesg = gpcs_var('mesg', $get, $post, $cookie)) === FALSE)
unset($mesg);
@@ -142,13 +144,6 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
/*
* MAIN
*/
-
- /* if the IP is banned, exit without do nothing */
- if (array_search($remote_addr, $G_black_list) !== FALSE) {
- // TODO: find a way to add a nonblocking sleep(5) here
- return (FALSE);
- }
-
$is_spawn = FALSE;
log_wr(0, 'index_wr.php: COMM: '.xcapemesg($mesg));
@@ -240,7 +235,8 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
// LACC UPDATED
$user->lacc = $curtime;
- if (array_search($user->ip, $G_black_list) !== FALSE) {
+ if (!($user->flags & USER_FLAG_AUTH) &&
+ $brisk->ban_check($user->ip)) {
// TODO: find a way to add a nonblocking sleep(5) here
return (FALSE);
}
@@ -346,14 +342,9 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$bdb->transaction('BEGIN');
$is_trans = TRUE;
// insert the new user disabled with reason NU_MAILED
- /*
- * FIXME: password management
- */
- $the_pass = "LA PASSWORD";
-
- if (($usr_obj = $bdb->user_add($cli_name, $the_pass, $cli_email,
+ if (($usr_obj = $bdb->user_add($cli_name, 'THE_PASS', $cli_email,
USER_FLAG_TY_DISABLE,
- USER_DIS_REA_NU_TOBECHK, $user->code)) == FALSE) {
+ USER_DIS_REA_NU_MAILED, $user->code)) == FALSE) {
fprintf(STDERR, "ERROR: user_add FAILED\n");
break;
}
@@ -361,14 +352,15 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
fprintf(STDERR, "ERROR: mail reserve code FAILED\n");
break;
}
- $hash = md5($curtime . $G_alarm_passwd . $cli_name . $the_pass . $cli_email);
+ $hash = md5($curtime . $G_alarm_passwd . $cli_name . $cli_email);
- $confirm_page = sprintf("http://%s/%s/mailcheck.php", $G_domain, $G_webbase);
+ $confirm_page = sprintf("http://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
+ $G_domain, $G_webbase, $mail_code, $hash);
$subj = $mlang_indwr['nu_msubj'][$G_lang];
$body_txt = sprintf($mlang_indwr['nu_mtext'][$G_lang],
- $user->name, $cli_name, $confirm_page, $mail_code, $hash);
+ $user->name, $cli_name, $confirm_page);
$body_htm = sprintf($mlang_indwr['nu_mhtml'][$G_lang],
- $user->name, $cli_name, $confirm_page, $mail_code, $hash);
+ $user->name, $cli_name, $confirm_page);
$mail_item = new MailDBItem($mail_code, $usr_obj->code, MAIL_TYP_CHECK,
$curtime, $subj, $body_txt, $body_htm, $hash);
@@ -710,7 +702,12 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
$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)) {
+ else if ($table->auth_type == TABLE_AUTH_TY_CERT
+ && ( (($user->flags & USER_FLAG_AUTH) == 0) || (($user->flags & USER_FLAG_TY_CERT) == 0) ) ) {
+ $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");',
+ $dt, NICKSERV, $mlang_indwr['mustcert'][$G_lang]);
+ }
+ else if ($table->auth_type == TABLE_AUTH_TY_AUTH && (($user->flags & USER_FLAG_AUTH) == 0)) {
$not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");',
$dt, NICKSERV, $mlang_indwr['mustauth'][$G_lang]);
}
@@ -856,12 +853,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
}
}
}
- log_wr("before save data");
- // Brisk::save_data($brisk);
- log_wr($user->step, 'index_wr.php: after save_data()');
-/* Brisk::unlock_data($sem); */
-/* exit; */
return (FALSE);
}
?>