X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=8b25ae0f222f312ac4d4cf691d1085a503b361e3;hb=29ef3f7db6bc1d39c658a15d95d22e45bbd59c16;hp=3f57f2dced877d3546e2a218c26758a0ee886691;hpb=c14163f1c08c65ecc8f1c4ce9d7c7244a1526a51;p=brisk.git

diff --git a/web/index_rd.php b/web/index_rd.php
index 3f57f2d..8b25ae0 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,14 +183,16 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       ignore_user_abort(FALSE);
     }
     else {
-       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;
-
+       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);
     }
@@ -192,7 +203,7 @@ 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
       /* NOTE the sets went common */
@@ -246,13 +257,9 @@ 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.");
-	$tmp_sess = $user->sess;
-	$user->sess = "";
-	step_unproxy($tmp_sess);
-	
-	$user->name = "";
-	$user->the_end = FALSE;
-	
+
+	$user->reset();
+
 	if ($user->subst == 'sitdown') {
 	  log_load("ROOM WAKEUP");
 	  $room->room_wakeup(&$user);
@@ -291,6 +298,9 @@ $is_page_streaming =  ((stristr($HTTP_USER_AGENT, "linux") &&
 
 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 = "";