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

diff --git a/web/briskin5/index_wr.php b/web/briskin5/index_wr.php
index 534fd28..bc69682 100644
--- a/web/briskin5/index_wr.php
+++ b/web/briskin5/index_wr.php
@@ -26,15 +26,8 @@
 $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
  */
@@ -66,7 +59,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
     log_wr(0, 'bin::index_wr.php: COMM: '.xcapemesg($mesg));
 
 
-    if (($user = &$bin5->get_user($sess, &$idx)) == FALSE) {
+    if (($user = &$bin5->get_user($sess, $idx)) == FALSE) {
         echo "Get User Error";
         log_wr("Get User Error");
         return FALSE;
@@ -112,12 +105,12 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
         if ($argz[0] == 'tableinfo') {
             log_wr("PER DI TABLEINFO");
             $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-            $user->comm[$user->step % COMM_N] .= show_table_info(&$bin5, &$table, $user->table_pos);
+            $user->comm[$user->step % COMM_N] .= show_table_info($bin5, $table, $user->table_pos);
             log_wr($user->comm[$user->step % COMM_N]);
             $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");
@@ -137,10 +130,10 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
 
             $logout_cont = TRUE;
             if ($remcalc >= 3) {
-                $lockcalc = $table->exitlock_calc(&$bin5->user, $user->table_pos);
+                $lockcalc = $table->exitlock_calc($bin5->user, $user->table_pos);
                 if ($lockcalc < 3) {
                     $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
-                    $user->comm[$user->step % COMM_N] .= $table->exitlock_show(&$bin5->user, $user->table_pos);
+                    $user->comm[$user->step % COMM_N] .= $table->exitlock_show($bin5->user, $user->table_pos);
                     $user->comm[$user->step % COMM_N] .=  show_notify("<br>I dati presenti sul server non erano allineati con quelli inviati dal tuo browser, adesso lo sono. Riprova ora.", 2000, "torna alla partita.", 400, 100);
 
                     log_wr($user->comm[$user->step % COMM_N]);
@@ -156,7 +149,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
             //      $user->bantime = $user->laccwr + BAN_TIME;
 
             if ($logout_cont == TRUE) {
-                $bin5->table_wakeup(&$user);
+                $bin5->table_wakeup($user);
             }
         }
         else if ($argz[0] == 'exitlock') {
@@ -205,12 +198,12 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
 
                 /* $table->game_init(&$bin5->user); */
 
-                if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_ABANDON, $user)) {
+                if ($table->rules_engine($bin5, $curtime, BIN5_RULES_ABANDON, $user)) {
                     for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                         $user_cur = &$bin5->user[$table->player[$i]];
 
                         $ret = sprintf('gst.st = %d;', $user_cur->step+1);
-                        $ret .= show_table(&$bin5,&$user_cur,$user_cur->step+1, TRUE, TRUE);
+                        $ret .= show_table($bin5, $user_cur,$user_cur->step+1, TRUE, TRUE);
                         $user_cur->comm[$user_cur->step % COMM_N] = $ret;
                         $user_cur->step_inc();
                     }
@@ -309,12 +302,12 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                         else if ($table->asta_pla_n == 0) {
                             log_wr("PASSANO TUTTI!");
 
-                            if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_ALLPASS, $user)) {
+                            if ($table->rules_engine($bin5, $curtime, BIN5_RULES_ALLPASS, $user)) {
                                 for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                                     $user_cur = &$bin5->user[$table->player[$i]];
 
                                     $ret = sprintf('gst.st = %d;', $user_cur->step+1);
-                                    $ret .= show_table(&$bin5,&$user_cur,$user_cur->step+1, TRUE, TRUE);
+                                    $ret .= show_table($bin5, $user_cur,$user_cur->step+1, TRUE, TRUE);
                                     $user_cur->comm[$user_cur->step % COMM_N] = $ret;
                                     $user_cur->step_inc();
                                 }
@@ -371,7 +364,7 @@ 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;
                         $table->friend   = $table->card[$a_brisco]->owner;
                         log_wr("GSTART 2");
@@ -497,10 +490,10 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                     if ($table->turn == (BIN5_PLAYERS_N * BIN5_CARD_HAND)) { /* game finished */
                         log_wr(sprintf("GIOCO FINITO !!!"));
 
-                        if ($table->rules_engine(&$bin5, $curtime, BIN5_RULES_FINISH, $user)) {
+                        if ($table->rules_engine($bin5, $curtime, BIN5_RULES_FINISH, $user)) {
                             for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
                                 $user_cur = &$bin5->user[$table->player[$i]];
-                                $retar[$i] .= show_table(&$bin5,&$user_cur,$user_cur->step+1,TRUE, TRUE);
+                                $retar[$i] .= show_table($bin5, $user_cur, $user_cur->step+1, TRUE, TRUE);
                             }
                         }
                     }
@@ -512,7 +505,7 @@ function bin5_index_wr_main(&$bin5, $remote_addr_full, $get, $post, $cookie)
                         $user_cur->step_inc();
                     }
 
-                    log_wr(sprintf("TURN: %d",$table->turn));
+                    log_wr(sprintf("TURN: %d", $table->turn));
                     /* Have played all the players ? */
                     /* NO:  switch the focus and enable the next player to play. */