add new type of tables (certified only) and new type of user (certified)

[brisk.git] / web / index_wr.php

diff --git a/web/index_wr.php b/web/index_wr.php
index 2977049..14a8b19 100644 (file)
--- 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' => '<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>',
@@ -120,12 +122,12 @@ define('LICMGR_CHO_AFTER',  2);
 function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
 {
     GLOBAL $G_domain, $G_webbase, $G_mail_seed;
-    GLOBAL $G_shutdown, $G_alarm_passwd, $G_black_list, $G_lang, $G_room_help, $G_room_about;
+    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);
     }
@@ -706,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]);
                 }
@@ -853,8 +854,6 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
         }
     }
     
-/* Brisk::unlock_data($sem); */
-/* exit; */
     return (FALSE);
 }
 ?>