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

diff --git a/web/index_wr.php b/web/index_wr.php
index 9ac86bf..c1fbcff 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -106,47 +106,50 @@ 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) { 
-      log_main("chal lock data success");
-      
-      if (($chals = &Challenges::load_data()) != FALSE) {
-
-        $token =  uniqid("");
-        // echo '2|'.$argz[1].'|'.$token.'|'.$_SERVER['REMOTE_ADDR'].'|'.$curtime.'|';
-        // exit;
-
-        if (($login_new = validate_name(urldecode($cli_name))) != FALSE) {
-          if ($chals->add($login_new, $token, $_SERVER['REMOTE_ADDR'], $curtime) != FALSE) {
-            echo '0|'.$token;
-          }
-          else {
-            echo '1|';
+      GLOBAL $cli_name;
+      if (($a_sem = Challenges::lock_data(TRUE)) != FALSE) { 
+          log_main("chal lock data success");
+          
+          if (($chals = &Challenges::load_data()) != FALSE) {
+              
+              $token =  uniqid("");
+              // echo '2|'.$argz[1].'|'.$token.'|'.$_SERVER['REMOTE_ADDR'].'|'.$curtime.'|';
+              // exit;
+              
+              if (($login_new = validate_name(urldecode($cli_name))) != FALSE) {
+                  if ($chals->add($login_new, $token, $_SERVER['REMOTE_ADDR'], $curtime) != FALSE) {
+                      log_send("SUCCESS: token:".$token);
+                      echo '0|'.$token;
+                  }
+                  else {
+                      log_send("getchallenge FAILED");
+                      echo '1|';
+                  }
+              }
+              else {
+                  log_send("getchallenge FAILED");
+                  echo '1|';
+              }
+              if ($chals->ismod()) {
+                  Challenges::save_data(&$chals);
+              }
           }
-        }
-        else {
-          echo '1|';
-        }
-        if ($chals->ismod()) {
-          Challenges::save_data(&$chals);
-        }
+          
+          
+          Challenges::unlock_data($a_sem);
       }
-      
-
-      Challenges::unlock_data($a_sem);
-    }
   }
   else if ($argz[0] == 'auth') {
     printf("challenge|ok");
@@ -192,7 +195,7 @@ if ($argz[0] == 'shutdown') {
 
   log_rd2("AUTO LOGOUT.");
   if ($user->subst == 'sitdown' || $user->stat == 'table')
-    $room->room_wakeup(&$user);
+    $room->room_wakeup($user);
   else if ($user->subst == 'standup')
     $room->room_outstandup(&$user);
   else {
@@ -206,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))));
@@ -244,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();
                 
@@ -336,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");
@@ -491,7 +494,7 @@ else if ($user->stat == 'room') {
   else if ($user->subst == 'standup') {
    
     if ($argz[0] == 'sitdown') {
-      log_wr("SITDOWN command");
+        log_wr("SITDOWN command");
 
       if ($user->the_end == TRUE) {
 	log_wr("INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
@@ -568,7 +571,7 @@ else if ($user->stat == 'room') {
 	//
 
         // Create new spawned table
-        $bri_sem = Briskin5::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;
@@ -579,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.
         //
@@ -595,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';
@@ -606,7 +611,6 @@ else if ($user->stat == 'room') {
           $bri_user_cur->comm[$bri_user_cur->step % COMM_N] = "";
           $bri_user_cur->step_inc();
           $bri_user_cur->comm[$bri_user_cur->step % COMM_N] = show_table(&$bri,&$bri_user_cur,$bri_user_cur->step+1,TRUE, FALSE);
-          
           $bri_user_cur->step_inc();
           
           log_wr("TRY PRESAVE: ".$bri_user_cur->step." TRANS STEP: ".$bri_user_cur->trans_step);
@@ -624,23 +628,20 @@ else if ($user->stat == 'room') {
           $user_cur->trans_step = $user_cur->step + 1;
           log_wr("TRANS ATTIVATO");
           
-          
           $user_cur->stat_set('table');
           $user_cur->subst = 'asta';
           $user_cur->laccwr = $curtime;
           $user_cur->step_inc();
         }
         log_wr("presave bri");
-        Briskin5::save_data($bri);
-        Briskin5::unlock_data($bri_sem);
+        Bin5::save_data($bri);
+        Bin5::unlock_data($bri_sem);
         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)."; ";
@@ -656,10 +657,10 @@ else if ($user->stat == 'room') {
    **********************/
   else if ($user->subst == 'sitdown') {
     if ($argz[0] == 'wakeup') {
-      $room->room_wakeup(&$user);      
+      $room->room_wakeup($user);      
     }
     else if ($argz[0] == 'logout') {
-      $room->room_wakeup(&$user);      
+      $room->room_wakeup($user);      
       $user->comm[$user->step % COMM_N] = "gst.st = ".($user->step+1)."; ";
       $user->comm[$user->step % COMM_N] .= 'postact_logout();';
       $user->the_end = TRUE;