user is_auth() is_cert() methods added

[brisk.git] / web / briskin5 / index_wr.php

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 3391a55..534fd28 100644 (file)
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -40,15 +40,10 @@ require_once("Obj/briskin5.phh");
  */
 function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
 {
-    GLOBAL $G_base, $G_dbasetype, $G_black_list;
+    GLOBAL $G_base, $G_dbasetype, $G_ban_list, $G_black_list;
 
     $remote_addr = addrtoipv4($remote_addr_full);
 
-    if (array_search($remote_addr, $G_black_list) !== FALSE) {
-        // TODO: waiting async 5 sec before close
-        return (FALSE);
-    }
-
     $curtime = time();
     if ($bin5 == NULL) {
         return FALSE;
@@ -77,7 +72,8 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
         return FALSE;
     }
     $bin5->brisk->sess_cur_set($user->sess);
-    if (array_search($user->ip, $G_black_list) !== FALSE) {
+    if ( ( ! $user->is_auth() ) &&
+        $bin5->brisk->ban_check($user->ip)) {
         // TODO: waiting async 5 sec before close
         return (FALSE);
     }
@@ -154,7 +150,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
             }
             else {
                 require_once("../Obj/hardban.phh");
-                Hardbans::add(($user->flags & USER_FLAG_AUTH ? $user->name : FALSE),
+                Hardbans::add(($user->is_auth() ? $user->name : FALSE),
                               $user->ip, $user->sess, $user->laccwr + BAN_TIME);
             }
             //      $user->bantime = $user->laccwr + BAN_TIME;