first step for better steps management

[brisk.git] / web / Obj / user.phh

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index b3cbf51..fcabab7 100644 (file)
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -119,6 +119,7 @@ class User {
   var $subst;      // substatus for each status   
   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 $rd_socket;  // socket handle of push stream
   var $rd_endtime; // end time for push stream
@@ -129,6 +130,7 @@ class User {
   var $rd_scristp; // current script step (for each session) 
   var $rd_kalive;  // if no message are sent after RD_KEEPALIVE_TOUT secs we send a keepalive from server
   var $rd_cache;   // place where store failed fwrite data
+  var $rd_toflush; // bool to inform about unfflushed socket
   var $rd_zls;     // zlibstream object handle if compressed stream, else FALSE
   var $rd_transp;  // class that define stream encapsulation type (iframe, xhr, ...)
   var $rd_is_chunked; // is the transport chunked or not ?
@@ -179,6 +181,7 @@ class User {
     $thiz->subst      = $subst;
     $thiz->step       = 1;
     $thiz->trans_step = -1;
+    $thiz->cl_step    = -1;
     $thiz->comm       = array();
 
     $thiz->rd_socket  = NULL;
@@ -190,6 +193,7 @@ class User {
     $thiz->rd_scristp = -1;
     $thiz->rd_kalive  = -1;
     $thiz->rd_cache   = "";
+    $thiz->td_toflush = FALSE;
     $thiz->rd_zls     = FALSE;
     $thiz->rd_transp  = NULL;
     $thiz->rd_is_chunked = FALSE;
@@ -231,6 +235,7 @@ class User {
     $this->subst      = $from->subst;
     $this->step       = $from->step;
     $this->trans_step = $from->trans_step;
+    $this->cl_step    = $from->cl_step;
     $this->comm       = array();
 
     $i_start = (1 > ($from->step - COMM_N) ? 1 : ($from->step - COMM_N)); 
@@ -294,6 +299,7 @@ class User {
     $thiz->subst      = $from->subst;
     $thiz->step       = $from->step;
     $thiz->trans_step = $from->trans_step;
+    $thiz->cl_step    = $from->cl_step;
     $thiz->comm       = array();
 
     /*
@@ -613,7 +619,7 @@ class User {
       
       $ret = FALSE;
       $curtime = time();
-      
+
       /* Nothing changed, return. */
       if ($this->rd_step == $this->step)
           return (FALSE);