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

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 68b686d..fcabab7 100644
--- 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
@@ -180,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;
@@ -233,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)); 
@@ -296,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();
 
     /*
@@ -615,7 +619,7 @@ class User {
       
       $ret = FALSE;
       $curtime = time();
-      
+
       /* Nothing changed, return. */
       if ($this->rd_step == $this->step)
           return (FALSE);
@@ -751,19 +755,16 @@ class User {
                   log_rd2("LOGOUT BYE BYE!!");
                   log_auth($this->sess, "Explicit logout.");
                   
-                  if ($this->the_end == TRUE) {
-                      $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) { ... */
+                  $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->rd_step < $this->step) { */
       }  /* else of if ($this->rd_step == -1) { */