X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex.php;h=0e9d615a709355d06f0b6beefc166512028ea9b5;hb=a6d70a024c7ad3599d319bb1a7c94d6c366303b4;hp=73868dde5e38ef61b6124a56668e3e101f9c80b9;hpb=1f106d3bc82e9719222d91313cd8e9e433ea099d;p=brisk.git

diff --git a/web/index.php b/web/index.php
index 73868dd..0e9d615 100644
--- a/web/index.php
+++ b/web/index.php
@@ -28,11 +28,11 @@ if (DEBUGGING == "local" && $_SERVER['REMOTE_ADDR'] != '127.0.0.1') {
   exit;
 }
 
-log_load((isset($sess) ? $sess : "XXX"), "LOAD: index.php");
+log_load("index.php");
 
 function main()
 {
-  GLOBAL $sess, $name, $table_idx, $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER;
+  GLOBAL $sess, $name, $table_idx, $table_token, $BRISK_SHOWHTML, $BRISK_DEBUG, $_SERVER;
   
   $body = "";
   $tables = "";
@@ -42,66 +42,43 @@ function main()
   if (isset($BRISK_SHOWHTML) == FALSE) {
     $is_table = FALSE;
     $sem = Room::lock_data();
-    log_load($sess, "lock Room");
+    log_main("lock Room");
     $room = &Room::load_data();
-    
+    $curtime = time();
+
     /* Actions */
+
     if (validate_sess($sess)) {
-      // FIXME uncomment $room->garbage_manager(TRUE);
+      log_main("pre garbage_manager UNO");
+      $room->garbage_manager(TRUE);
+      log_main("post garbage_manager");
       if (($user = &$room->get_user($sess, &$idx)) != FALSE) {
+	log_main("user stat: ".$user->stat);
 	if ($user->stat == "table") {
-	  $change_page = TRUE;
-	  log_load($sess, "resync from index.php");
-
-	  if (isset($table_idx)) {
-	    $table_idx = (int)$table_idx;
-	    log_load($sess, "SET TABLE_IDX <yy".$table_idx.">".TABLES_N);
-	    if ($table_idx >= 0 && $table_idx < TABLES_N) {
-	      log_load($sess, "SET TABLE_IDX GOOD VALUE");
-	      $bri_sem = Briskin5::lock_data($table_idx);
-	      $bri = &Briskin5::load_data($table_idx);
-
-	      if (($bri_user = &$bri->get_user($sess, &$bri_idx)) != FALSE) {
-		if ($bri_user->subst == "shutdowned" || $bri_user->subst == "shutdowner") {
-		  // QUI WAKEUP
-		  $table     = &$room->table[$user->table];
-		  $bri_table = &$bri->table[0];
-
-		  for ($i = 0 ; $i < $bri_table->player_n ; $i++) {
-		    $room->user[$table->player[$i]]->subst = $bri->user[$i]->subst;
-		    $room->user[$table->player[$i]]->step = $bri->user[$i]->step;
-		    $room->user[$table->player[$i]]->trans_step = $bri->user[$i]->step+1;
-		    log_load($sess, "from table bri subst[".$i."]: ".$bri->user[$i]->subst);
-		    log_load($sess, "from table roo subst[".$i."]: ".$room->user[$table->player[$i]]->subst);
-		  }
-
-		  $room->room_join_wakeup(&$user);
-
-		  if (Room::save_data(&$room) == FALSE) {
-		    echo "ERRORE SALVATAGGIO\n";
-		    exit;
-		  }
-
-		  $change_page = FALSE;
-		}
-		log_load($sess, "from table subst: ".$bri_user->subst);
-	      }
-	      Briskin5::unlock_data($bri_sem);
-	    }
-	  }
-	  log_load($sess, "unlock Room");
-	  if ($change_page) {
-	    Room::unlock_data($sem);
-	    header ("Location: table.php");
+	  if (Room::save_data(&$room) == FALSE) {
+	    echo "ERRORE SALVATAGGIO\n";
 	    exit;
 	  }
+	  log_main("unlock Room");
+	  Room::unlock_data($sem);
+	  setcookie("table_token", $user->table_token, $curtime + 31536000);
+	  setcookie("table_idx", $user->table, $curtime + 31536000);
+	  header ("Location: briskin5/index.php");
+	  exit;
 	}
 	$ACTION = "room";
       }
+
+      if (Room::save_data(&$room) == FALSE) {
+	echo "ERRORE SALVATAGGIO\n";
+	exit;
+      }
     }
     
     if ($ACTION == "login" && isset($name)) {
-      // FIXME uncomment $room->garbage_manager(TRUE);
+      
+      log_main("pre garbage_manager DUE");
+      $room->garbage_manager(TRUE);
       /* try login */
       if (($user = &$room->add_user(&$sess, &$idx, $name, $_SERVER['REMOTE_ADDR'])) != FALSE) {
 	$ACTION = "room";