X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Findex_rd.php;h=9b82158ae54dd06020a84d4f1ca8d9181d871112;hb=182eff6ad1aafbdcb765a4190a24a1c8f2f93f6b;hp=689fce087441e12f25d584c885fdf1e1442a3a3e;hpb=de20c76cee40d53ffcb77ec50e9e3a13fe2ca3d4;p=brisk.git

diff --git a/web/index_rd.php b/web/index_rd.php
index 689fce0..9b82158 100644
--- a/web/index_rd.php
+++ b/web/index_rd.php
@@ -2,7 +2,7 @@
 /*
  *  brisk - index_rd.php
  *
- *  Copyright (C) 2006-2009 Matteo Nastasi
+ *  Copyright (C) 2006-2011 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -20,18 +20,20 @@
  * not, write to the Free Software Foundation, Inc, 59 Temple Place -
  * Suite 330, Boston, MA 02111-1307, USA.
  *
- * $Id$
- *
  */
 
+$G_base = "";
+
 require_once("Obj/brisk.phh");
 // require_once("Obj/proxyscan.phh");
 require_once("briskin5/Obj/briskin5.phh");
 
 
 $mlang_indrd = array( 
-                     'btn_backtotab'  => array('it' => 'torna ai tavoli',
-                                               'en' => 'back to tables') 
+                     'btn_backtotab'  => array('it' => ' torna ai tavoli ',
+                                               'en' => ' back to tables '),
+                     'btn_btotabsup'  => array('it' => ' grazie della donazione, torna ai tavoli ',
+                                               'en' => ' thank you for donation, back to tables ') 
                      );
 
 // Use of proxies isn't allowed.
@@ -133,7 +135,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
   if (($proxy_step = step_get($sess)) != FALSE) {
     // log_rd2("Postget".$proxy_step."zizi");
 
-    if ($cur_step == $proxy_step) {
+    if ($cur_step == $proxy_step['s']) {
       log_lock("P");
       return (FALSE);
     }
@@ -225,7 +227,12 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
       if ($G_with_splash &&
           ($$CO_splashdate < $curtime - $G_splash_interval ||
            $$CO_splashdate > $curtime)) {
-        $ret .=  show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), $G_splash_timeout, $mlang_indrd['btn_backtotab'][$G_lang], $G_splash_w, $G_splash_h, true, $G_splash_timeout);
+          $is_super = $user->flags & USER_FLAG_TY_SUPER;
+          $ret .=  show_notify_ex(str_replace("\n", " ", $G_splash_content[$G_lang]), 
+                                  ($is_super ? 0 : $G_splash_timeout), 
+                                  $mlang_indrd[($is_super ? 'btn_btotabsup' : 'btn_backtotab')][$G_lang], 
+                                  $G_splash_w, $G_splash_h, true, 
+                                  ($is_super ? 0 : $G_splash_timeout));
         $ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime);
       }
       $ret .= $room->show_room($user->step, &$user);
@@ -278,7 +285,9 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 	$new_subst = $user->subst;
 	$new_step =  $user->step;
       } while (0);
-      
+
+      log_mop($user->step, 'index_rd.php: after ret set');
+
       if ($user->the_end == TRUE) {
 	log_rd2("LOGOUT BYE BYE!!");
 	log_auth($user->sess, "Explicit logout.");
@@ -287,7 +296,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
 
 	if ($user->subst == 'sitdown') {
 	  log_load("ROOM WAKEUP");
-	  $room->room_wakeup(&$user);
+	  $room->room_wakeup($user);
 	}
 	else if ($user->subst == 'standup')
 	  $room->room_outstandup(&$user);
@@ -317,9 +326,7 @@ function maincheck($sess, $cur_stat, $cur_subst, $cur_step, &$new_stat, &$new_su
    step
 */
 
-$is_page_streaming =  ((stristr($HTTP_USER_AGENT, "linux") && 
-			(stristr($HTTP_USER_AGENT, "firefox") || stristr($HTTP_USER_AGENT, "iceweasel"))) ? FALSE : TRUE);
-
+$is_page_streaming =  (stristr($HTTP_USER_AGENT, "MSIE") || stristr($HTTP_USER_AGENT, "CHROME") ? TRUE : FALSE);
 
 header("Cache-Control: no-cache, must-revalidate"); // HTTP/1.1
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); // Date in the past
@@ -341,6 +348,7 @@ $old_step =  $ext_step = $step;
 
 for ($i = 0 ; time() < $endtime ; $i++) {
   // log_rd("PRE MAIN ".$step);;
+  $pre_main = gettimeofday(TRUE);
   if (($ret = maincheck($sess, $old_stat, $old_subst, $old_step, &$stat, &$subst, &$step)) != FALSE) {
     echo '@BEGIN@';
     // log_rd2(sprintf("\nSESS: [%s]\nOLD_STAT: [%s] OLD_SUBST: [%s] OLD_STEP: [%s] \nSTAT: [%s] SUBST: [%s] STEP: [%s] \nCOMM: [%s]\n", $sess, $old_stat, $old_subst, $old_step, $stat, $subst, $step, $ret));
@@ -348,6 +356,7 @@ for ($i = 0 ; time() < $endtime ; $i++) {
     echo ' @END@'; 
     log_send("IS_PAGE: ".($is_page_streaming == TRUE ? "TRUE" : "FALSE")."EXT_STEP: ".$ext_step." ENDTIME: [".$endtime."] ".$ret);
     flush();
+    log_mop(0, 'index_rd.php: after flush (begin: '.sprintf("%f", $pre_main).')');
     if ($is_page_streaming)
       break;
   }
@@ -356,7 +365,7 @@ for ($i = 0 ; time() < $endtime ; $i++) {
   $old_step =  $step;
   // log_rd("POST MAIN ".$step);;
   usleep(400000);
-  if (($i % 5) == 0) {
+  if (($i % 10) == 0) {
     // log_rd2("TIME: ".time());
     echo '_';
     flush();