fixed silent error in briskin5/index_wr.php and corrected version

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

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 5a2644f..8e894fd 100644 (file)
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -47,14 +47,15 @@ log_load("bin5/index_wr.php");
  */
 log_wr('COMM: '.$mesg);
 
-if ($table_idx < 0 || $table_idx >= TABLE_N)
+$table_idx = (int)$table_idx;
+if ($table_idx < 0 || $table_idx >= TABLES_N)
      exit;
 
-log_mop(0, 'bin::index_wr.php: COMM: '.xcapemesg($mesg));
+log_wr(0, 'bin::index_wr.php: COMM: '.xcapemesg($mesg));
 
-$sem = Bin5::lock_data($table_idx);
+$sem = Bin5::lock_data(TRUE, $table_idx);
 
-if (($bri = &Bin5::load_data($table_idx,$table_token)) == FALSE) {
+if (($bri = Bin5::load_data($table_idx,$table_token)) == FALSE) {
   echo "Bin5 Load data error";
   log_wr("Bin5 Load data error");
   Bin5::unlock_data($sem);
@@ -69,15 +70,15 @@ if (($user = &$bri->get_user($sess, &$idx)) == FALSE) {
 }
 $argz = explode('|', $mesg);
 
-log_wr('POSTSPLIT: '.$argz[0]);
-log_mop($user->step, 'bin::index_wr.php: after get_user()');
+log_wr('POSTSPLIT: '.$argz[0].'  user->stat: ['.$user->stat.']');
+log_wr($user->step, 'bin::index_wr.php: after get_user()');
 
 if (false && $argz[0] == 'shutdown') {
   log_auth($user_cur->sess, "Shutdown session. delegate to room gc the autologout");
   
   log_rd2("bin5/index_wr.php: AUTO LOGOUT.");
   if ($user->stat == 'table') {
-    $bri->table_wakeup(&$user);
+    $bri->table_wakeup($user);
     // to force the logout
     $user->lacc = 0;
   }
@@ -91,7 +92,7 @@ if (false && $argz[0] == 'shutdown') {
  *********************/
 else if ($user->stat == 'table') {
   $user->laccwr = time();
-  $table = &$bri->table[$user->table];
+  $table = $bri->table[$user->table];
 
   if ($argz[0] == 'tableinfo') {
     log_wr("PER DI TABLEINFO");
@@ -347,7 +348,7 @@ else if ($user->stat == 'table') {
       if ($table->asta_win > -1 && 
          $user->table_pos == $table->asta_win) {
        $a_brisco = $argz[1];
-       if ($a_brisco >= 0 && $a_brisco < (BIN5_PLAYERS_N == 5 ? 40 : 24)) {
+       if ($a_brisco >= 0 && $a_brisco < 40) {
          $table->briscola = $a_brisco;
          $table->friend   = $table->card[$a_brisco]->owner;
          log_wr("GSTART 2");
@@ -534,7 +535,7 @@ else if ($user->stat == 'table') {
 }
 log_wr("before save data");
 Bin5::save_data($bri);
-log_mop($user->step, 'bin::index_wr.php: after save_data()');
+log_wr($user->step, 'bin::index_wr.php: after save_data()');
 
 Bin5::unlock_data($sem);
 exit;