X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=c775dc138cac463f09206b468753d8c75fa362a9;hb=254c175a7e331947c69794aa7a0248caa47e32f5;hp=2bb43217a32a26f096e35b460dadcd0184622585;hpb=40c213b1f4ab1331f5c203ffee5fc91e042eb7c7;p=brisk.git

diff --git a/web/index_rd.php b/web/index_rd.php
index 2bb4321..c775dc1 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -29,10 +29,10 @@ require_once("Obj/brisk.phh");
 require_once("briskin5/Obj/briskin5.phh");
 
 $S_load_stat = array( 'U_first_loop' => 0,
-                    'R_garbage'    => 0,
-                    'U_heavy'      => 0,
-                    'R_minusone'   => 0,
-                    'R_the_end'    => 0 );
+                      'U_heavy'      => 0,
+                      'R_garbage'    => 0,
+                      'R_minusone'   => 0,
+                      'R_the_end'    => 0 );
 
 $mlang_indrd = array( 
                      'btn_backtotab'  => array('it' => ' torna ai tavoli ',
@@ -129,11 +129,15 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                 log_only("F");
                 
                 $S_load_stat['R_garbage']++;
-                if (($room = Room::load_data()) != FALSE) {
-                    log_main("pre garbage_manager TRE");
-                    $room->garbage_manager(FALSE);
-                    Room::save_data($room);
+                if (($room = Room::load_data()) == FALSE) {
+                    Room::unlock_data();
+                    ignore_user_abort(FALSE);
+                    return (unrecerror());
                 }
+                log_main("pre garbage_manager TRE");
+                $room->garbage_manager(FALSE);
+                Room::save_data($room);
+                unset($room);
             }
             log_lock("U");
             Room::unlock_data($sem);
@@ -157,34 +161,31 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     }
     
 
-    if (1 == 1) { // C'è veramente qualche caso in cui serve questo step ??
-        if ($user == FALSE) {
-            do {
-                ignore_user_abort(TRUE);
-                if (($sem = Room::lock_data()) == FALSE) 
-                    break;
-                
-                log_lock("P");
-                $S_load_stat['U_heavy']++;
-                if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
-                    break;
-                }
-            } while (0);
-            
-            if ($sem != FALSE)
-                Room::unlock_data($sem);
+    if ($user == FALSE) {
+        do {
+            ignore_user_abort(TRUE);
+            if (($sem = Room::lock_data()) == FALSE) 
+                break;
             
-            ignore_user_abort(FALSE);
-            if ($user == FALSE) {
-                return (unrecerror());
+            log_lock("P");
+            $S_load_stat['U_heavy']++;
+            if (($user = User::load_data($proxy_step['i'], $sess)) == FALSE) {
+                break;
             }
-        }
+        } while (0);
         
-        /* Nothing changed, return. */
-        if ($cur_step == $user->step) 
-            return (FALSE);
-    } // if (0 == 1) { xx C'è veramente qualche caso in cui serve questo step ??
-
+        if ($sem != FALSE)
+            Room::unlock_data($sem);
+        
+        ignore_user_abort(FALSE);
+        if ($user == FALSE) {
+            return (unrecerror());
+        }
+    }
+    
+    /* Nothing changed, return. */
+    if ($cur_step == $user->step) 
+        return (FALSE);
     
     log_rd2("do other cur_stat[".$cur_stat."] user->stat[".$user->stat."] cur_step[".$cur_step."] user_step[".$user->step."]");
     
@@ -255,7 +256,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                                         ($is_super ? 0 : $G_splash_timeout));
                 $ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime);
             }
-            $ret .= $room->show_room($user->step, &$user);
+            $ret .= $room->show_room($user->step, $user);
             
             // TODO uncomment and test
             /* NOTE the sets went common */
@@ -300,8 +301,9 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
                     break;
                 } 
                 for ($i = $cur_step ; $i < $user->step ; $i++) {
-                    log_rd2("ADDED TO THE STREAM: ".$user->comm[$i % COMM_N]);
-                    $ret .= $user->comm[$i % COMM_N];
+                    $ii = $i % COMM_N;
+                    log_rd2("ADDED TO THE STREAM: ".$user->comm[$ii]);
+                    $ret .= $user->comm[$ii];
                 }
                 $new_stat =  $user->stat;
                 $new_subst = $user->subst;
@@ -310,39 +312,39 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
             
             log_mop($user->step, 'index_rd.php: after ret set');
             
-          if ($user->the_end == TRUE) {
-              log_rd2("LOGOUT BYE BYE!!");
-              log_auth($user->sess, "Explicit logout.");
-              
-              $S_load_stat['R_the_end']++;
-              $room = &Room::load_data();
-              unset($user);
-              if (($user = &$room->get_user($sess, $idx)) == FALSE) {
-                  Room::unlock_data($sem);
-                  ignore_user_abort(FALSE);
-                  return (unrecerror());
-              }              
-              $user->reset();
-              
-              if ($user->subst == 'sitdown') {
-                  log_load("ROOM WAKEUP");
-                  $room->room_wakeup($user);
-              }
-              else if ($user->subst == 'standup')
-                  $room->room_outstandup(&$user);
-              else
-                  log_rd2("LOGOUT FROM WHAT ???");
-              
-              Room::save_data($room);
-          }
-      }
-      
-      Room::unlock_data($sem);
-      ignore_user_abort(FALSE);
-  }
-  
-  
-  return ($ret);
+            if ($user->the_end == TRUE) {
+                log_rd2("LOGOUT BYE BYE!!");
+                log_auth($user->sess, "Explicit logout.");
+                
+                $S_load_stat['R_the_end']++;
+                $room = Room::load_data();
+                unset($user);
+                if (($user = $room->get_user($sess, $idx)) == FALSE) {
+                    Room::unlock_data($sem);
+                    ignore_user_abort(FALSE);
+                    return (unrecerror());
+                }              
+                $user->reset();
+                
+                if ($user->subst == 'sitdown') {
+                    log_load("ROOM WAKEUP");
+                    $room->room_wakeup($user);
+                }
+                else if ($user->subst == 'standup')
+                    $room->room_outstandup($user);
+                else
+                    log_rd2("LOGOUT FROM WHAT ???");
+                
+                Room::save_data($room);
+            }
+        }
+        
+        Room::unlock_data($sem);
+        ignore_user_abort(FALSE);
+    }
+    
+    
+    return ($ret);
 }
 
 /*
@@ -361,8 +363,6 @@ $is_page_streaming =  (stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_A
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
 header('Content-type: application/xml; charset="utf-8"',true);
-// header('Content-type: text/plain; charset="utf-8"',true);
-// header('Content-type: text/html; charset="utf-8"',true);
 
 if (!isset($myfrom))
      $myfrom = "";