chat reset in user class

[brisk.git] / web / briskin5 / index_rd.php

diff --git a/web/briskin5/index_rd.php b/web/briskin5/index_rd.php
index 540892e..ddc4582 100644 (file)
--- a/web/briskin5/index_rd.php
+++ b/web/briskin5/index_rd.php
@@ -2,7 +2,10 @@
 /*
  *  brisk - index_rd.php
  *
- *  Copyright (C) 2006-2007 matteo.nastasi@milug.org
+ *  Copyright (C) 2006-2008 Matteo Nastasi
+ *                          mailto: nastasi@alternativeoutput.it 
+ *                                  matteo.nastasi@milug.org
+ *                          web: http://www.alternativeoutput.it
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,8 +25,15 @@
  */
 
 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;
+// }
+
 log_load("LOAD: bin5/index_rd.php ".$QUERY_STRING);
 
 $first_loop = TRUE;
@@ -99,7 +109,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       $first_loop = FALSE;
     }
 
-    log_only("U");
+    log_lock("U");
     Briskin5::unlock_data($sem);
     ignore_user_abort(FALSE);
   }
@@ -111,7 +121,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     // log_rd2("Postget".$proxy_step."zizi");
     
     if ($cur_step == $proxy_step) {
-      log_only2("P");
+      log_lock("P");
       return (FALSE);
     }
     else {
@@ -128,7 +138,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       if (($sem = Briskin5::lock_data($table_idx)) == FALSE) 
        break;
       
-      log_only("P");
+      log_lock("P");
       if (($bri = &Briskin5::load_data($table_idx, $table_token)) == FALSE) 
        break;
     } while (0);
@@ -177,6 +187,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
     }
     else {
       log_rd2("TRANS NON ATTIVATO");
+
+//       ARRAY_POP DISABLED
+//       while (array_pop($user->comm) != NULL);
+//       // $user->step_inc(COMM_N + 1);
+//       Briskin5::save_data($bri);
+
       Briskin5::unlock_data($sem);
       ignore_user_abort(FALSE);
     }
@@ -185,16 +201,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   if ($cur_step == -1) {
     log_rd2("PRE-NEWSTAT.");
 
-    if ($user->stat == 'room') {
-      log_rd("roomma");
-      $ret .= show_room(&$bri, &$user);
-    }
     /***************
      *             *
      *    TABLE    *
      *             *
      ***************/
-    else if ($user->stat == 'table') {      
+    if ($user->stat == "table") {      
       $ret = show_table(&$bri,&$user,$user->step,FALSE,FALSE);
 
       log_rd2("SENDED TO THE STREAM: ".$ret);
@@ -208,7 +220,11 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   else {
     ignore_user_abort(TRUE);
     $sem = Briskin5::lock_data($table_idx);
-    $bri = &Briskin5::load_data($table_idx, $table_token);
+    if (($bri = &Briskin5::load_data($table_idx, $table_token)) == FALSE) {
+      Briskin5::unlock_data($sem);
+      ignore_user_abort(FALSE);
+      return (unrecerror());
+    }
     if (($user = &$bri->get_user($sess, $idx)) == FALSE) {
       Briskin5::unlock_data($sem);
       ignore_user_abort(FALSE);
@@ -221,7 +237,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
            $to_stat = $user->stat;
            Briskin5::unlock_data($sem);
            ignore_user_abort(FALSE);
-           return (page_sync($user->sess, $to_stat == "table" ? "table.php" : "index.php"));
+           return (page_sync($user->sess, $to_stat == "table" ? "index.php" : "../index.php"));
          }
          log_rd2("lost history, refresh from scratch");
          $new_step = -1;
@@ -312,8 +328,8 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   $old_subst = $subst;
   $old_step =  $step;
   // log_rd("POST MAIN ".$step);;
-  usleep(400000);
-  if (($i % 5) == 0) {
+  usleep(200000);
+  if (($i % 10) == 0) {
     // log_rd2("TIME: ".time());
     echo '_';
     flush();