X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=fb97713c1188988ebcbe5e6ebbd479aee56ab965;hb=0d462f547c388b20d72a9de96955484636736108;hp=51986e1e82b7f6c5d0e3090414a66317b6c2d8e5;hpb=f402ea85540dde36f860954f4e8ae3c5c9313a84;p=brisk.git

diff --git a/web/index_rd.php b/web/index_rd.php
index 51986e1..fb97713 100644
--- a/web/index_rd.php
+++ b/web/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,14 @@
  */
 
 require_once("Obj/brisk.phh");
+// require_once("Obj/proxyscan.phh");
 require_once("briskin5/Obj/briskin5.phh");
 
+// Use of proxies isn't allowed.
+// if (is_proxy()) {
+//   sleep(5);
+//   exit;
+//}
 log_load("index_rd.php");
 
 $first_loop = TRUE;
@@ -174,9 +183,18 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       ignore_user_abort(FALSE);
     }
     else {
-      log_rd2("TRANS NON ATTIVATO");
-      Room::unlock_data($sem);
-      ignore_user_abort(FALSE);
+       log_rd2("TRANS NON ATTIVATO");
+//        ARRAY_POP DISABLED
+//        log_rd2("TRANS NON ATTIVATO, clean del comm array");
+//        while (($el = array_pop($user->comm)) != NULL) { 
+//          log_rd2("clean element [".$el."]");
+//        }
+//        //        $user->step_inc(COMM_N + 1);
+//        Room::save_data($room);
+//        //        $new_step = $user->step;
+	 
+       Room::unlock_data($sem);
+       ignore_user_abort(FALSE);
     }
   }
       
@@ -185,13 +203,9 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 
     if ($user->stat == 'room') {
       log_rd("roomma ".$user->step);
-      $ret .= show_room(&$room, $user->step, &$user);
+      $ret .= $room->show_room($user->step, &$user);
 
       // TODO uncomment and test
-      // while (array_pop($user->comm) != NULL);
-      // $new_step = -1;
-      // $user->step_inc(COMM_N + 1);
-      // Room::save_data($room);
       /* NOTE the sets went common */
       $new_stat =  $user->stat;
       $new_subst = $user->subst;
@@ -243,13 +257,18 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       if ($user->the_end == TRUE) {
 	log_rd2("LOGOUT BYE BYE!!");
 	log_auth($user->sess, "Explicit logout.");
+
+	$user->reset();
+	/* factorized with ->reset()
 	$tmp_sess = $user->sess;
 	$user->sess = "";
 	step_unproxy($tmp_sess);
-	
 	$user->name = "";
+	while (array_pop($user->comm) != NULL);	
+	$user->step = 0;
 	$user->the_end = FALSE;
-	
+	*/
+
 	if ($user->subst == 'sitdown') {
 	  log_load("ROOM WAKEUP");
 	  $room->room_wakeup(&$user);
@@ -317,8 +336,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();