X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=eae9bfe4b1b4d372b45b5d81d0aeee153741adf7;hb=93d7a6690daa9a9138277a8d83edb766fb2bab8a;hp=d8cd409a194240c913c15121adc5751f00a4e394;hpb=8b9c2b3ec59baef7c9f64f9663347bc5b9cf69fe;p=brisk.git
diff --git a/web/index_wr.php b/web/index_wr.php
index d8cd409..eae9bfe 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -32,8 +32,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.',
@@ -300,8 +300,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->is_auth());
- if ($user->is_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) {
@@ -318,7 +318,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 {
@@ -333,10 +333,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 ? "login già in uso" :
+ ($idret == 2 ? "email già utilizzata"
+ : "errore sconosciuto")));
break;
}
$bdb->transaction('BEGIN');
@@ -389,7 +388,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 != "") {
@@ -436,19 +435,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 != "") {
@@ -492,7 +491,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
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;
}
@@ -511,7 +510,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;
}
@@ -520,7 +519,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;
}
@@ -694,25 +693,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],
+ $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['tabwait_a'][$G_lang],
$table->wakeup_time - $curtime, $mlang_indwr['tabwait_b'][$G_lang]);
}
else if ($table->auth_type == TABLE_AUTH_TY_CERT && ( ! $user->is_cert() ) ) {
- $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");',
- $dt, NICKSERV, $mlang_indwr['mustcert'][$G_lang]);
+ $not_allowed_msg = nickserv_msg($dt, $mlang_indwr['mustcert'][$G_lang]);
}
else if ($table->auth_type == TABLE_AUTH_TY_AUTH && ( ! $user->is_auth() ) ) {
- $not_allowed_msg = sprintf('chatt_sub("%s", [2, "%s"],"%s");',
- $dt, NICKSERV, $mlang_indwr['mustauth'][$G_lang]);
+ $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;