X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Findex_wr.php;h=534fd28029f5becbb9f9a3935052a81daefa35d7;hb=8b9c2b3ec59baef7c9f64f9663347bc5b9cf69fe;hp=ef9dfdaa57b3334225e802df2f8d111dce5c839b;hpb=059f6fcca909267802697e22ac7c8b701b9ed14e;p=brisk.git

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index ef9dfda..534fd28 100644
--- 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;
@@ -527,8 +523,6 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                 log_wr("NOSENSE");
         }
     }
-    log_wr("before save data");
-    log_wr($user->step, 'bin::index_wr.php: after save_data()');
     return TRUE;
 }
 ?>