X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=bec14b75ade3ab04ea9ddb9cefed6effd273b0ef;hb=bd3aa68b123e6af44c44f3b155d280b40bbd7bd6;hp=6d5484bd1c5ac5f6e64ccd0e1a476f955111faf7;hpb=14cd1fc05b5d9148de3c427e43bf60cfdf098e9d;p=brisk.git

diff --git a/web/index_wr.php b/web/index_wr.php
index 6d5484b..bec14b7 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' => '<b>An error was occurred during the saving, try again or contact the administrator.</b>'),
                       'coerrdb' => array( 'it' => '<b>Il database è temporaneamente irraggiungibile, riprova più tardi o contatta l\'amministratore.</b>',
                                           'en' => '<b>The database is temporarly unavailable, retry to later or conctact the administrator.</b>'),
-                      'warrmust' => array( 'it' => '<b>Per autenticare qualcuno devi a tua volta essere autenticato.</b>',
-                                           'en' => 'To authenticate somebody you have to be authenticated in your turn'),
+                      'warrmust' => array( 'it' => '<b>Per autenticare qualcuno devi a tua volta essere autenticato e certificato.</b>',
+                                           'en' => 'To authenticate somebody you have to be authenticated and certified yourown'),
                       'mesgrepl' => array( 'it' => '<br><br>Il messaggio &egrave; stato inoltrato all\'amministratore.',
                                            'en' => '<br><br>The message was forwarded to the administrator'),
                       'mesgmust' => array( 'it' => '<b>Per mandare messaggi all\'amministratore devi essere autenticato.</b>',
@@ -41,7 +41,9 @@ $mlang_indwr = array( 'btn_backtotab' => array( 'it' => 'Torna ai tavoli.',
                       'shutmsg'  => array( 'it' => '<b>Il server sta per essere riavviato, non possono avere inizio nuove partite.</b>',
                                            'en' => '<b>The server is going to be rebooted, new games are not allowed.</b>'),
                       'mustauth' => array( 'it' => '<b>Il tavolo a cui volevi sederti richiede autentifica.</b>',
-                                           'en' => '<b>the table where you want to sit require authentication</b>'),
+                                           'en' => '<b>The table where you want to sit require authentication</b>'),
+                      'mustcert' => array( 'it' => '<b>Il tavolo a cui volevi sederti richiede autentifica e certificazione.</b>',
+                                           'en' => '<b>The table where you want to sit require authentication and certification</b>'),
                       'tabwait_a'=> array( 'it' => '<b>Il tavolo si &egrave; appena liberato, ci si potr&agrave; sedere tra ',
                                            'en' => '<b>The table is only just opened, you will sit down in '), // FIXME
                       'tabwait_b'=> array( 'it' => ' secondi.</b>',
@@ -127,9 +129,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 +237,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);
@@ -298,8 +307,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 +325,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
                 }
                 else {
                     /* MLANG: "<b>E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore.</b>" */
-                    $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 +340,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');
@@ -387,7 +395,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
         }
         else {
             /* MLANG: "<b>Per autenticare qualcuno devi a tua volta essere autenticato.</b>" */
-            $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 +416,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 +442,19 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
                 }
                 else {
                     /* MLANG: "<b>Il database è temporaneamente irraggiungibile, riprova più tardi o contatta l\'amministratore.</b>" */
-                    $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: "<b>E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore.</b>" */
-                $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: "<b>Per autenticare qualcuno devi a tua volta essere autenticato.</b>" */
-            $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 +495,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: <b>Per partecipare al sondaggio devi essere autenticato.</b>
-                $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 +517,7 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
     
             if (($poll_lock = Poll::lock_data(TRUE)) == FALSE) {
                 /* MLANG: "<b>E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore.</b>" */
-                $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 +526,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 +653,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 +700,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_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_CERT && ( ! $user->is_cert() ) ) {
+                    $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 = 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,11 +725,11 @@ 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: "<br>Ti sei alzato da un tavolo senza il consenso degli altri giocatori. <br><br>Dovrai aspettare ancora ".secstoword($user->bantime - $user->laccwr)." prima di poterti sedere nuovamente.", "resta in piedi.", "<br>Tu o qualcuno col tuo stesso indirizzo IP si è alzato da un tavolo senza il consenso degli altri giocatori.<br><br>Dovrai aspettare ancora ".secstoword($bantime - $user->laccwr)." prima di poterti sedere nuovamente.<br><br>Se non sei stato tu ad alzarti e possiedi un login con password, autenticandoti con quello, potrai accedere." */
-                    if ($user->flags & USER_FLAG_AUTH) {
+                    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);
                     }
                     else {
@@ -834,6 +841,11 @@ 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);
             }