X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=c1fbcfff5c594ea6692db9d6f20e42e7dcff66fc;hb=f6a4ad0c8fed8ed0d3bab5fba9842cf00576c028;hp=430a6fc0719076ebada4dfdf15957f11086c1989;hpb=1532532dd4d3670d6d55560bbc3cbb0b238f74cd;p=brisk.git

diff --git a/web/index_wr.php b/web/index_wr.php
index 430a6fc..c1fbcff 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -106,20 +106,20 @@ log_wr('COMM: '.xcapemesg($mesg));
 $curtime = time();
 $dt = date("H:i ", $curtime);
 
-$sem = Room::lock_data();
+$sem = Room::lock_data(TRUE);
 if (($room = &Room::load_data()) == FALSE) {
   echo "Load data error";
   log_wr("Load data error");
   Room::unlock_data($sem);
   exit;
 }
-if (($user = &$room->get_user($sess, &$idx)) == FALSE) {
+if (($user = $room->get_user($sess, &$idx)) == FALSE) {
   Room::unlock_data($sem);
   $argz = explode('|', xcapemesg($mesg));
 
   if ($argz[0] == 'getchallenge') {
       GLOBAL $cli_name;
-      if (($a_sem = Challenges::lock_data()) != FALSE) { 
+      if (($a_sem = Challenges::lock_data(TRUE)) != FALSE) { 
           log_main("chal lock data success");
           
           if (($chals = &Challenges::load_data()) != FALSE) {
@@ -209,7 +209,7 @@ else if ($argz[0] == 'warranty') {
 
   log_wr("INFO:SKIP:argz == warranty name: [".$cli_name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
   if ($user->flags & USER_FLAG_AUTH) {
-    if (($wa_lock = Warrant::lock_data()) != FALSE) {
+    if (($wa_lock = Warrant::lock_data(TRUE)) != FALSE) {
       if (($fp = @fopen(LEGAL_PATH."/warrant.txt", 'a')) != FALSE) {
         /* Unix time | session | nickname | IP | where was | mesg */
         fwrite($fp, sprintf("%ld|%s|%s|%s|\n", $curtime, $user->name, xcapelt(urldecode($cli_name)), xcapelt(urldecode($cli_email))));
@@ -247,7 +247,7 @@ else if ($argz[0] == 'mesgtoadm') {
     
     log_wr("INFO:SKIP:argz == mesgtoadm name: [".$user->name."] AUTH: ".($user->flags & USER_FLAG_AUTH));
     if ($user->flags & USER_FLAG_AUTH) {
-        if (($wa_lock = Warrant::lock_data()) != FALSE) {
+        if (($wa_lock = Warrant::lock_data(TRUE)) != FALSE) {
             if (($bdb = BriskDB::create()) != FALSE) {
                 $bdb->users_load();
                 
@@ -339,7 +339,7 @@ else if ($argz[0] == 'poll') {
       break;
     }
     
-    if (($poll_lock = Poll::lock_data()) == FALSE) {
+    if (($poll_lock = Poll::lock_data(TRUE)) == FALSE) {
       /* MLANG: "<b>E\' occorso un errore durante il salvataggio, riprova o contatta l\'amministratore.</b>" */
       $mesg_to_user = sprintf('chatt_sub("%s", [2, "%s"],"%s");', $dt, NICKSERV, $mlang_indwr['commerr'][$G_lang]);
       log_wr("break3");
@@ -571,7 +571,7 @@ else if ($user->stat == 'room') {
 	//
 
         // Create new spawned table
-        $bri_sem = Bin5::lock_data($table_idx);
+        $bri_sem = Bin5::lock_data(TRUE, $table_idx);
         $table_token = uniqid("");
         $room->table[$table_idx]->table_token = $table_token;
         $room->table[$table_idx]->table_start = $curtime;
@@ -582,15 +582,17 @@ else if ($user->stat == 'room') {
         }
         log_legal($curtime, $user, "STAT:CREATE_GAME", $plist);
 
-        if (($bri =& new Briskin5(&$room, $table_idx, $table_token)) == FALSE)
+        log_wr("pre new Bin5");
+        if (($bri = new Bin5($room, $table_idx, $table_token)) == FALSE)
           log_wr("bri create: FALSE");
         else
           log_wr("bri create: ".serialize($bri));
 	
+        log_wr("pre init table");
         // init table
-        $bri_table =& $bri->table[0];
-        $bri_table->init(&$bri->user);
-        $bri_table->game_init(&$bri->user);
+        $bri_table = $bri->table[0];
+        $bri_table->init($bri->user);
+        $bri_table->game_init($bri->user);
         //
         // Init spawned users.
         //
@@ -598,8 +600,8 @@ else if ($user->stat == 'room') {
         // 
         log_wr("game_init after");
         for ($i = 0 ; $i < $table->player_n ; $i++) {
-          $bri_user_cur = &$bri->user[$i];
-          $user_cur = &$room->user[$table->player[$i]];
+          $bri_user_cur = $bri->user[$i];
+          $user_cur = $room->user[$table->player[$i]];
           
           $bri_user_cur->stat_set('table');
           $bri_user_cur->subst = 'asta';
@@ -637,11 +639,9 @@ else if ($user->stat == 'room') {
         log_wr("postsave bri");
       }
       // change room
-      $room->room_sitdown(&$user, $table_idx);
-
-      log_wr("MOP finish");
-
+      $room->room_sitdown($user, $table_idx);
       
+      log_wr("MOP finish");
     }
     else if ($argz[0] == 'logout') {
       $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";