X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_wr.php;h=6dfeea6217703d0a4c20a825e02f3012f195f6a6;hb=f7dc9ccf7ceef5b2fa796f713dc8851c6473f5e0;hp=1348c12bf4646292f69160ee76914b32119d8450;hpb=1ccc2ec3beebfc0939ce8558a15f23e99b29dcaa;p=brisk.git

diff --git a/web/index_wr.php b/web/index_wr.php
index 1348c12..6dfeea6 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -100,26 +100,26 @@ if (array_search($_SERVER['REMOTE_ADDR'], $G_black_list) !== FALSE) {
 
 $is_spawn = FALSE;
 
-log_mop(0, 'index_wr.php: COMM: '.xcapemesg($mesg));
+log_wr(0, 'index_wr.php: COMM: '.xcapemesg($mesg));
 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) {
@@ -186,7 +186,7 @@ $argz = explode('|', xcapemesg($mesg));
 
 log_wr('POSTSPLIT: '.$argz[0]);
 
-log_mop($user->step, 'index_wr.php: after get_user()');
+log_wr($user->step, 'index_wr.php: after get_user()');
 
 if ($argz[0] == 'shutdown') {
   log_auth($user->sess, "Shutdown session.");
@@ -209,10 +209,10 @@ 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))));
+          fwrite($fp, sprintf("%ld|%s|%s|%s|\n", $curtime, xcapelt($user->name), xcapelt(urldecode($cli_name)), xcapelt(urldecode($cli_email))));
         fclose($fp);
       }
       Warrant::unlock_data($wa_lock);
@@ -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");
@@ -497,13 +497,13 @@ else if ($user->stat == 'room') {
         log_wr("SITDOWN command");
 
       if ($user->the_end == TRUE) {
-	log_wr("INFO:SKIP:argz == sitdown && the_end == TRUE => ignore request.");
+	log_wr("INFO:SKIP:argz == sitdown && ->the_end == TRUE => ignore request.");
 	Room::unlock_data($sem);
 	exit;
       }
 
       // Take parameters
-      $table_idx = $argz[1];
+      $table_idx = (int)$argz[1];
       $table = &$room->table[$table_idx];
     
       if ($G_shutdown || $table->wakeup_time > $curtime || 
@@ -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;
@@ -622,7 +622,7 @@ else if ($user->stat == 'room') {
           while (array_pop($user_cur->comm) != NULL);
           
           $ret = "";
-          $ret .= sprintf('gst.st_loc++; gst.st=%d; createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); createCookie("lang", "%s", 24*365, cookiepath); the_end=true; window.onunload = null ; window.onbeforeunload = null ; document.location.assign("briskin5/index.php");|', $user_cur->step+1, $table_idx, $table_token, $G_lang);
+          $ret .= sprintf('gst.st_loc++; gst.st=%d; createCookie("table_idx", %d, 24*365, cookiepath); createCookie("table_token", "%s", 24*365, cookiepath); createCookie("lang", "%s", 24*365, cookiepath); hstm.stop(); window.onunload = null ; window.onbeforeunload = null ; document.location.assign("briskin5/index.php");|', $user_cur->step+1, $table_idx, $table_token, $G_lang);
           
           $user_cur->comm[$user_cur->step % COMM_N] = $ret;
           $user_cur->trans_step = $user_cur->step + 1;
@@ -639,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)."; ";
@@ -672,7 +670,7 @@ else if ($user->stat == 'room') {
 }
 log_wr("before save data");
 Room::save_data($room);
-log_mop($user->step, 'index_wr.php: after save_data()');
+log_wr($user->step, 'index_wr.php: after save_data()');
 
 Room::unlock_data($sem);
 exit;