X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2Findex_wr.php;h=c9b5b80e90d773bd0658b059b35a09d3c4a4ddce;hb=db12d769481823f4c744ce0e3a50404cc6b01cd1;hp=491ee9d8bfd4e175c06954e6c7520fd60186562f;hpb=d74b7138ed4d14834b26355a7f5d9350bc96ee44;p=brisk.git

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 491ee9d..c9b5b80 100644
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -26,29 +26,17 @@
 $G_base = "../";
 
 require_once("../Obj/brisk.phh");
-// require_once("../Obj/proxyscan.phh");
 require_once("Obj/briskin5.phh");
 
-// Use of proxies isn't allowed.
-// if (is_proxy()) {
-//   sleep(5);
-//   exit;
-//}
-
 /*
  *  MAIN
  */
 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;
@@ -76,8 +64,9 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
         log_wr("Get User Error");
         return FALSE;
     }
-
-    if (array_search($user->ip, $G_black_list) !== FALSE) {
+    $bin5->brisk->sess_cur_set($user->sess);
+    if ( ( ! $user->is_auth() ) &&
+        $bin5->brisk->ban_check($user->ip)) {
         // TODO: waiting async 5 sec before close
         return (FALSE);
     }
@@ -121,7 +110,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
             $user->step_inc();
         }
         else if ($argz[0] == 'chatt') {
-            $bin5->chatt_send(&$user,$mesg);
+            $bin5->chatt_send(&$user, $mesg);
         }
         else if ($argz[0] == 'preferences_update') {
             log_wr("PER DI PREFERENCES_UPDATE");
@@ -154,13 +143,13 @@ 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;
 
             if ($logout_cont == TRUE) {
-                $bin5->table_wakeup(&$user);
+                $bin5->table_wakeup($user);
             }
         }
         else if ($argz[0] == 'exitlock') {
@@ -375,8 +364,18 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                 if ($table->asta_win > -1 &&
                     $user->table_pos == $table->asta_win) {
                     $a_brisco = $argz[1];
-                    if ($a_brisco >= 0 && $a_brisco < 40) {
+                    if ($a_brisco >= 0 && $a_brisco < (BIN5_CARD_HAND * BIN5_PLAYERS_N)) {
                         $table->briscola = $a_brisco;
+
+                        $tourn_values = array(11, 10, 4,3,2, 1,1,1,1,1);
+                        $table->tourn_pts = 0;
+                        $seed = $a_brisco - ($a_brisco % 10);
+                        for ($i = $seed ; $i < ($seed + 10) ; $i++) {
+                            if ($table->card[$i]->owner == $table->asta_win) {
+                                $table->tourn_pts += $tourn_values[$i - $seed];
+                            }
+                        }
+
                         $table->friend   = $table->card[$a_brisco]->owner;
                         log_wr("GSTART 2");
                         $table->gstart = ($table->mazzo+1) % BIN5_PLAYERS_N;
@@ -527,8 +526,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;
 }
 ?>