X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fuser.phh;h=4e716d03dd2acf2a24948ac80f38966f56c9173f;hb=6aaadfdf64934a162818929b331b7d9a20d29994;hp=fcabab7f509b1e4b0c67d5efa8d5b28c7146b8e6;hpb=bd3aa68b123e6af44c44f3b155d280b40bbd7bd6;p=brisk.git

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index fcabab7..4e716d0 100644
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -2,7 +2,7 @@
 /*
  *  brisk - Obj/user.phh
  *
- *  Copyright (C) 2012 Matteo Nastasi
+ *  Copyright (C) 2012-2015 Matteo Nastasi
  *                          mailto: nastasi@alternativeoutput.it 
  *                                  matteo.nastasi@milug.org
  *                          web: http://www.alternativeoutput.it
@@ -120,6 +120,9 @@ class User {
   var $step;       // step of the current status
   var $trans_step; // step to enable transition between pages (disable == -1)
   var $cl_step;    // current step returned by client
+  var $ping_req;   // ping is already requested ?
+
+  var $pend_async; // number of async check that must be returned
 
   var $rd_socket;  // socket handle of push stream
   var $rd_endtime; // end time for push stream
@@ -182,6 +185,8 @@ class User {
     $thiz->step       = 1;
     $thiz->trans_step = -1;
     $thiz->cl_step    = -1;
+    $thiz->ping_req   = FALSE;
+    $thiz->pend_async = 0;
     $thiz->comm       = array();
 
     $thiz->rd_socket  = NULL;
@@ -236,6 +241,8 @@ class User {
     $this->step       = $from->step;
     $this->trans_step = $from->trans_step;
     $this->cl_step    = $from->cl_step;
+    $this->ping_req   = $from->ping_req;
+    $this->pend_async = $from->pend_async;
     $this->comm       = array();
 
     $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N)); 
@@ -300,6 +307,8 @@ class User {
     $thiz->step       = $from->step;
     $thiz->trans_step = $from->trans_step;
     $thiz->cl_step    = $from->cl_step;
+    $thiz->ping_req   = $from->ping_req;
+    $thiz->pend_async = $from->pend_async;
     $thiz->comm       = array();
 
     /*
@@ -345,6 +354,18 @@ class User {
       return (($this->flags & USER_FLAG_AUTH) && ($this->flags & USER_FLAG_TY_CERT));
   }
 
+  function is_empty()
+  {
+      return ($this->sess == "");
+  }
+
+  function is_active()
+  {
+      if ($this->sess != "" && !$this->the_end) // OK: is_active()
+          return TRUE;
+      return FALSE;
+  }
+
   function flags_set($flags, $mask)
   {
       $flags_old = $this->flags & (~$mask);
@@ -384,7 +405,7 @@ class User {
       $this->rd_endtime = $curtime + RD_ENDTIME_DELTA;
       $this->rd_stat    = $stat;
       $this->rd_subst   = $subst;
-      $this->rd_step    = $step;
+      $this->rd_step    = $step; // TRACKED
       $this->rd_from    = $from;
       $this->rd_scristp = 0;
       $this->rd_kalive  = $curtime + RD_KEEPALIVE_TOUT;
@@ -617,7 +638,7 @@ class User {
 
       log_rd("maincheck begin");
       
-      $ret = FALSE;
+      $ret = "";
       $curtime = time();
 
       /* Nothing changed, return. */
@@ -626,20 +647,15 @@ class User {
       
       log_rd2("do other cur_stat[".$this->rd_stat."] user->stat[".$this->stat."] cur_step[".$this->rd_step."] user_step[".$this->step."]");
       
-      if ($this->rd_step == -1) {
-          /*
-           *  if $this->rd_step == -1 load the current state from the main struct
-           */
-          
+      fprintf(STDERR, "ASYNC: %d %d\n", $this->rd_step, $this->pend_async);
+      if ($this->rd_step == -1 && $this->pend_async == 0) {
+          /*  if $this->rd_step == -1 load the current state from the main struct  */
           $S_load_stat['wR_minusone']++;
-          
-          // if ($this->the_end == TRUE) {
-          // log_rd2("main_check: the end".var_export(debug_backtrace()));
-          // }
-          
+
           if ($this->trans_step != -1) {
               log_rd2("TRANS USATO ".$this->trans_step);
-              $this->rd_step = $this->trans_step;
+              $this->rd_step = $this->step = $this->trans_step; // TRACKED
+              $ret .= $this->room->show_room($this->step, $this);
               $this->trans_step = -1;
           }
           else {
@@ -647,14 +663,15 @@ class User {
           }
       }
       
-      
+      if ($this->pend_async > 0) {
+          return (FALSE);
+      }
       /* this part I suppose is read only on $this->room structure */
       if ($this->rd_step == -1) {
           log_rd2("PRE-NEWSTAT: ".$this->stat);
           
           if ($this->stat == 'room') {
               log_rd("roomma ".$this->step);
-              $curtime = time();
               if ($this->rec !== FALSE) {
                   $doc_filepath = $G_base.$G_doc_path.sprintf($G_tos_fname, $G_tos_vers, $G_lang);
                   $doc_filename = basename($doc_filepath);
@@ -696,13 +713,14 @@ class User {
                                           ($is_super ? 0 : $G_splash_timeout));
                   $ret .= sprintf('|createCookie("CO_splashdate%d", %d, 24*365, cookiepath);', $G_splash_idx, $curtime);
               }
+              $this->room->standup_update($this);
               $ret .= $this->room->show_room($this->step, $this);
               
               // TODO uncomment and test
               /* NOTE the sets went common */
               $this->rd_stat =  $this->stat;
               $this->rd_subst = $this->subst;
-              $this->rd_step =  $this->step;
+              $this->rd_step =  $this->step; // TRACKED
           }
           /***************
            *             *
@@ -746,29 +764,18 @@ class User {
                   }
                   $this->rd_stat =  $this->stat;
                   $this->rd_subst = $this->subst;
-                  $this->rd_step =  $this->step;
+                  $this->rd_step = $this->step;
               } while (0);
               
               log_rd2($this->step, 'index_rd.php: after ret set');
-              
-              if ($this->the_end == TRUE) {
-                  log_rd2("LOGOUT BYE BYE!!");
-                  log_auth($this->sess, "Explicit logout.");
-                  
-                  $this->reset();
-
-                  if ($this->subst == 'sitdown') {
-                      log_load("ROOM WAKEUP");
-                      $this->room->room_wakeup($this);
-                  }
-                  else if ($this->subst == 'standup')
-                      $this->room->room_outstandup($this);
-                  else
-                      log_rd2("LOGOUT FROM WHAT ???");
-              } /* if ($this->the_end == TRUE) { ... */
+
+              // if ($this->the_end == TRUE) { management is moved
+              // in the spush scope
           } /* if ($this->rd_step < $this->step) { */
       }  /* else of if ($this->rd_step == -1) { */
-      
+
+      if ($ret == "")
+          $ret = FALSE;
     
       return ($ret);
   }  //   function maincheck(...