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

diff --git a/web/index_rd.php b/web/index_rd.php
index 51986e1..65c7655 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -22,8 +22,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 +180,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);
     }
   }
       
@@ -188,10 +203,6 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       $ret .= show_room(&$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 +254,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 +333,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();