X-Git-Url: http://mop.ddnsfree.com/gitweb/?p=brisk.git;a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=f5db998feaa38ad120a7a757b31f8900cad13442;hp=14399439b8bbbbbb94bb012d16a078beb10ca8a1;hb=d0accc6cc623168616438ad06f0611a3dbb8f5a4;hpb=5fa01c83781bbb977710f84ec20ff882d59b8034

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 1439943..f5db998 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -339,11 +339,9 @@ class Bin5_table extends Table {
     function multer($is_new)
     {
         if ($is_new) {
-            // return (pow(2, $this->mult) * $this->asta2mult($this->asta_pnt));
             return (static::s_multer($this->mult, $this->asta_pnt));
         }
         else {
-            // return (pow(2, $this->old_mult) * $this->asta2mult($this->old_asta_pnt));
             return (static::s_multer($this->old_mult, $this->old_asta_pnt));
         }
     }
@@ -353,6 +351,11 @@ class Bin5_table extends Table {
         return (pow(2, $mult) * static::asta2mult($pnt));
     }
 
+    static function s_point_calc($pnt_done, $mult, $pnt_req, $is_allpoints)
+    {
+        return ($pnt_done * static::s_multer($mult, $pnt_req) * ($is_allpoints ? 2 : 1));
+    }
+
     //   function bunch_create_old() function AND
     //   {
     //     $ret = array();
@@ -509,15 +512,15 @@ class Bin5_table extends Table {
     {
         GLOBAL $G_all_points, $G_dbasetype;
 
-        $pts = array();
+        $pnts_sav = array();
 
-        $this->old_act = $action;
         if ($action == BIN5_RULES_ALLPASS) { // return TRUE if all correct
+            $this->old_act = $action;
             $this->old_asta_win = -1;
             $this->old_pnt = 0;
             $this->mult_inc(1);
             for ($i = 0 ; $i < PLAYERS_N ; $i++) {
-                $pts[$i] = 0;
+                $pnts_sav[$i] = 0;
             }
 
             $game_delta = 1;
@@ -525,13 +528,17 @@ class Bin5_table extends Table {
             $this->game_init(&$bri->user);
         }
         else if ($action == BIN5_RULES_ABANDON) { // return TRUE if all correct
+            if (!($user->handpt <= 2)) {
+                return (FALSE);
+            }
+            $this->old_act = $action;
             log_wr(sprintf("GIOCO FINITO !!!"));
             $this->old_asta_win = $user->table_pos;
             $this->old_pnt = 0;
             $this->mult_inc(1);
 
             for ($i = 0 ; $i < PLAYERS_N ; $i++) {
-                $pts[$i] = 0;
+                $pnts_sav[$i] = 0;
             }
 
             // Non si cambia mazzo se si abbandona la partita
@@ -540,6 +547,7 @@ class Bin5_table extends Table {
             $this->game_init(&$bri->user);
         }
         else if ($action == BIN5_RULES_FINISH) { // return TRUE if all correct
+            $this->old_act = $action;
             do {
                 $pro = 0;
 
@@ -559,17 +567,17 @@ class Bin5_table extends Table {
                 log_wr(sprintf("PRO: [%d]", $pro));
 
                 // PATTA case !
-                if ($this->asta_pnt == 61 && $pro == 60) {
+                if (game_result($this->asta_pnt, $pro) == 0) {
                     $this->points[$this->points_n % MAX_POINTS] = array();
                     for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                         $this->points[$this->points_n % MAX_POINTS][$i] = 0;
-                        $pts[$i] = 0;
+                        $pnts_sav[$i] = 0;
                     }
                     $this->points_n++;
                     $this->old_pnt = $pro;
+                    $this->old_asta_win = $this->asta_win;
                     $this->mult_inc(1);
 
-                    // return($pts);
                     break;
                 }
 
@@ -578,31 +586,29 @@ class Bin5_table extends Table {
                 else
                     $sig = -1;
 
+                // TAG: POINTS_MANAGEMENT
                 $this->points[$this->points_n % MAX_POINTS] = array();
                 for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                     if ($i == $this->asta_win)
-                        $pt = ($i == $this->friend ? 4 : 2);
+                        $pnt = ($i == $this->friend ? 4 : 2);
                     else if ($i == $this->friend)
-                        $pt = 1;
+                        $pnt = 1;
                     else
-                        $pt = -1;
-
-                    log_wr(sprintf("PRO: pt[%d][%d] = %d", $this->points_n % MAX_POINTS, $i, $pt));
+                        $pnt = -1;
 
-                    $pt = $pt * $sig * $this->multer(TRUE) * ($pro == 120 ? 2 : 1);
+                    log_wr(sprintf("PRO: pt[%d][%d] = %d", $this->points_n % MAX_POINTS, $i, $pnt));
 
-                    log_wr(sprintf("PRO:[%d][%d][%d]", $sig, $this->multer(TRUE), ($pro == 120 ? 2 : 1)));
+                    $pnt_sav = static::s_point_calc($pnt * $sig,           0, $this->asta_pnt, ($pro == 120));
+                    $pnt_tab = static::s_point_calc($pnt * $sig, $this->mult, $this->asta_pnt, ($pro == 120));
 
-                    $this->points[$this->points_n % MAX_POINTS][$i] = $pt;
-                    $this->total[$i] += $pt;
-                    $pts[$i] = $pt;
+                    $this->points[$this->points_n % MAX_POINTS][$i] = $pnt_tab;
+                    $this->total[$i] += $pnt_tab;
+                    $pnts_sav[$i] = $pnt_sav;
                 }
                 $this->points_n++;
                 $this->old_pnt = $pro;
                 $this->old_asta_win = $this->asta_win;
                 $this->mult_set(0);
-
-                // return($pts);
             } while (0);
             $game_delta = 1;
         }
@@ -621,7 +627,7 @@ class Bin5_table extends Table {
             $ucodes[$i] = $user_cur->code_get();
 
             /* pro log */
-            $plist .= '|'.xcapelt($user_cur->name).'|'.$pts[$i];
+            $plist .= '|'.xcapelt($user_cur->name).'|'.$pnts_sav[$i];
             $codes .= '|'.xcapelt($user_cur->code_get());
         }
         $plist .= $codes;
@@ -646,13 +652,13 @@ class Bin5_table extends Table {
             require_once("../Obj/dbase_".$G_dbasetype.".phh");
 
             if (($bdb = BriskDB::create()) != FALSE) {
-                $bdb->bin5_points_save($curtime, $this, $user->table_orig, $action, $ucodes, $pts);
+                $bdb->bin5_points_save($curtime, $this, $user->table_orig, $action, $ucodes, $pnts_sav);
                 unset($bdb);
             }
             else {
-                log_points($remote_addr, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", "DATABASE CONNECTION FAILED");
+                log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", "DATABASE CONNECTION FAILED");
             }
-            log_points($remote_addr, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
+            log_points($user->ip, $curtime, $user, "STAT:BRISKIN5:FINISH_GAME", $plist);
         }
 
         $this->game_init(&$bri->user);
@@ -785,8 +791,7 @@ class Bin5_table extends Table {
                 continue;
             $user_cur = &$bri->user[$this->player[$i]];
             $user_cur->comm[$user_cur->step % COMM_N] = "gst.st = ".($user_cur->step+1)."; ";
-            $user_cur->comm[$user_cur->step % COMM_N] .= sprintf('chatt_sub("%s", [2, "%s"],"%s");',
-                                                                 $dt, NICKSERV, $msg);
+            $user_cur->comm[$user_cur->step % COMM_N] .= nickserv_msg($dt, $msg);
             $user_cur->step_inc();
         }
     }
@@ -1073,7 +1078,6 @@ class Bin5_user extends User {
           $this->rd_step  = $this->step;
       } /* if ($this->rd_step == -1) { */
       else {
-          /* $sem = Room::lock_data(FALSE); */
           $S_load_stat['rU_heavy']++;
 
           if ($this->rd_step < $this->step) {
@@ -1081,7 +1085,6 @@ class Bin5_user extends User {
                   if ($this->rd_step + COMM_N < $this->step) {
                       if ($this->rd_stat != $this->stat) {
                           $to_stat = $this->stat;
-                          /* Room::unlock_data($sem); */
                           log_load("RESYNC");
                           printf("xXx BIN5_USER::MAINCHECK\n");
                           return ($this->page_sync($this->sess, ($to_stat == "table" ? "index.php" : "../index.php"), $this->table, $this->table_token));
@@ -1109,33 +1112,14 @@ class Bin5_user extends User {
 
               log_rd2($this->step, 'index_rd.php: after ret set');
 
-              if ($this->the_end == TRUE) {
-                  log_rd2("LOGOUT BYE BYE!!");
-                  log_auth($this->sess, "Explicit logout.");
-
-                  if ($this->the_end == TRUE) {
-                      $this->reset();
-
-                      // FIXME !!!
-                      /* if ($this->subst == 'sitdown') { */
-                      /*     log_load("ROOM WAKEUP"); */
-                      /*     $this->room->room_wakeup($this); */
-                      /* } */
-                      /* else if ($this->subst == 'standup') */
-                      /*     $this->room->room_outstandup($this); */
-                      /* else */
-                      /*     log_rd2("LOGOUT FROM WHAT ???"); */
-
-                  } /* if ($this->the_end == TRUE) { ... */
-              } /* if ($this->the_end == TRUE) { ... */
+              // if ($this->the_end == TRUE) { management is moved
+              // in the spush scope
           } /* if ($this->rd_step < $this->step) { */
-
-          /* Room::unlock_data($sem); */
       }  /* else of if ($this->rd_step == -1) { */
 
 
       return ($ret);
-    }  //   function maincheck (...
+    }  //   function maincheck(...
 
     function continue_set($match_code)
     {
@@ -1151,6 +1135,7 @@ class Bin5_user extends User {
 
 class Bin5 {
     static $delta_t = array();
+    var $brisk;// room object reference
 
     var $user;
     var $table;
@@ -1167,7 +1152,7 @@ class Bin5 {
 
     var $delay_mgr;
 
-    function Bin5 ($room, $table_idx, $table_token, $get, $post, $cookie) {
+    function Bin5($brisk, $table_idx, $table_token, $get, $post, $cookie) {
         $this->user = array();
         $this->table = array();
 
@@ -1178,9 +1163,9 @@ class Bin5 {
             exit;
         }
 
-        $user  = $room->user;
-        $table = $room->table[$table_idx];
-
+        $this->brisk = $brisk;
+        $user  = $brisk->user;
+        $table = $brisk->table[$table_idx];
         log_wr("Bin5 constructor");
 
         for ($i = 0 ; $i < $table->player_n ; $i++) {
@@ -1207,6 +1192,8 @@ class Bin5 {
 
         if (validate_sess($sess)) {
             for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
+                if ($this->user[$i]->is_empty())
+                    continue;
                 if (strcmp($sess, $this->user[$i]->sess) == 0) {
                     // find it
                     $idx = $i;
@@ -1224,7 +1211,32 @@ class Bin5 {
 
         return (FALSE);
     }
+    function banned_kickoff()
+    {
+        $is_ban = FALSE;
 
+        for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
+            $user_cur = $this->user[$i];
+
+            // check if the IP is blacklisted
+            if ($this->brisk->black_check($user_cur->ip)) {
+                $user_cur->lacc = 0;
+                $is_ban = TRUE;
+                continue;
+            }
+
+            // if authorized not check if banlisted
+            if ($user_cur->is_auth()) {
+                continue;
+            }
+
+            if ($this->brisk->ban_check($user_cur->ip)) {
+                $user_cur->lacc = 0;
+                $is_ban = TRUE;
+            }
+        }
+        return ($is_ban);
+    }
 
     function garbage_manager($force)
     {
@@ -1239,7 +1251,7 @@ class Bin5 {
         if ($force || $this->garbage_timeout < $curtime) {
             for ($i = 0 ; $i < BIN5_MAX_PLAYERS ; $i++) {
                 $user_cur = $this->user[$i];
-                if ($user_cur->sess == "" ||
+                if ($user_cur->is_active() == FALSE || // is not active user or
                     ($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner')))
                     continue;
 
@@ -1249,21 +1261,14 @@ class Bin5 {
                     if ($user_cur->stat == 'table') {
                         log_auth($user_cur->sess," bin5 Autologout session.");
 
-                        /* SI DELEGA AL garbage_manager principale LA RIMOZIONE DELL'UTENTE
-
-                           $tmp_sess = $user_cur->sess;
-                           $user_cur->sess = "";
-                           Bin5_user::step_unproxy($tmp_sess);
-                           $user_cur->name = "";
-                           $user_cur->the_end = FALSE;
-
-                        */
+                        /* main garbage_manager is delegate as autologout management */
+                        $user_cur->the_end = TRUE;
 
                         /* se gli altri utenti non erano d'accordo questo utente viene bannato */
                         $remcalc = $this->table[0]->exitlock_calc(&$this->user, $user_cur->table_pos);
                         if ($remcalc < 3) {
                             require_once("${G_base}Obj/hardban.phh");
-                            Hardbans::add(($user_cur->flags & USER_FLAG_AUTH ? $user_cur->name : FALSE),
+                            Hardbans::add(($user_cur->is_auth() ? $user_cur->name : FALSE),
                                           $user_cur->ip, $user_cur->sess, $user_cur->laccwr + BAN_TIME);
                         }
                         //      $user->bantime = $user->laccwr + BAN_TIME;
@@ -1348,7 +1353,7 @@ class Bin5 {
     }
 
 
-    function chatt_send($user, $mesg)
+    function chatt_send($user, $mesg, $mlang_indwr = NULL)
     {
         GLOBAL $mlang_brisk, $G_lang;
 
@@ -1374,7 +1379,7 @@ class Bin5 {
             for ($i = 0 ; $i < ($user->stat == 'room' ? BIN5_MAX_PLAYERS : BIN5_PLAYERS_N) ; $i++) {
                 if ($user->stat == 'room') {
                     $user_cur = &$this->user[$i];
-                    if ($user_cur->sess == '' || $user_cur->stat != 'room')
+                    if ($user_cur->is_active() == FALSE || $user_cur->stat != 'room') // is not active user or stat isn't 'room'
                         continue;
                 }
                 else {
@@ -1445,7 +1450,7 @@ class Bin5 {
 
     static function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
     {
-        GLOBAL $G_black_list;
+        GLOBAL $G_ban_list, $G_black_list;
 
         printf("NEW_SOCKET (root): %d\n", intval($new_socket));
 
@@ -1483,7 +1488,6 @@ class Bin5 {
 
         break;
         case "index_wr.php":
-            // FIXME $content can be unset
             if (isset($table_idx) && isset($table_token)) {
                 if (($bri = $s_a_p->app->match_get($table_idx, $table_token)) != FALSE) {
                     ob_start();
@@ -1521,6 +1525,8 @@ class Bin5 {
                     return TRUE;
                     break;
                 }
+                $bri->brisk->sess_cur_set($user->sess);
+
                 // close a previous opened index_read_ifra socket, if exists
                 if (($prev = $user->rd_socket_get()) != NULL) {
                     $s_a_p->socks_unset($user->rd_socket_get());
@@ -1839,6 +1845,7 @@ function show_table_info(&$bri, &$table, $table_pos)
     $ret = "";
     $user = $bri->user[$table->player[$table_pos]];
 
+    // TAG: POINTS_MANAGEMENT
     $pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
     $noty = sprintf('<table class=\"points\"><tr><th></th>');
 
@@ -1968,10 +1975,11 @@ function briscola_show($bri, $table, $user)
 
 function game_result($asta_pnt, $pnt)
 {
+    $sixty = 60;
     if ($asta_pnt == 61) {
-        if ($pnt > 60)
+        if ($pnt > $sixty)
             return (1);
-        else if ($pnt == 60)
+        else if ($pnt == $sixty)
             return (0);
         else
             return (-1);
@@ -1989,7 +1997,7 @@ function log_points($remote_addr, $curtime, $user, $where, $mesg)
     if (($fp = @fopen(LEGAL_PATH."/points.log", 'a')) != FALSE) {
         /* Unix time | session | nickname | IP | where was | mesg */
         fwrite($fp, sprintf("%ld|%s|%s|%s|%s|%s|%s|\n", $curtime, $user->sess,
-                            ($user->flags & USER_FLAG_AUTH ? 'A' : 'N'),
+                            ($user->is_auth() ? 'A' : 'N'),
                             $user->name, $remote_addr, $where , $mesg));
         fclose($fp);
     }