garbage_timeout variable replaces file storaged value

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

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index 8beb49b..f993848 100644 (file)
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -679,23 +679,6 @@ class User {
       $ret = FALSE;
       $curtime = time();
       
-      /* if ((($curtime - $this->lacc) >  STREAM_TIMEOUT) || Room::garbage_time_is_expired($curtime)) { */
-      /*     $S_load_stat['lL_laccgarb']++; */
-          
-      /*     if (($curtime - $this->lacc) >=  STREAM_TIMEOUT) { */
-      /*         $S_load_stat['wU_lacc_upd']++; */
-      /*         $this->lacc = $curtime; */
-      /*     } */
-          
-      /*     if (Room::garbage_time_is_expired($curtime)) { */
-      /*         log_only("F"); */
-              
-      /*         $S_load_stat['wR_garbage']++; */
-      /*         log_main("pre garbage_manager TRE"); */
-      /*         $this->room->garbage_manager(FALSE); */
-      /*     } */
-      /* } */
-      
       /* Nothing changed, return. */
       if ($cur_step == $this->step) 
           return (FALSE);
@@ -710,7 +693,7 @@ class User {
           $S_load_stat['wR_minusone']++;
           
           if ($this->the_end == TRUE) { 
-              log_rd2("main_check: the end".var_export(debug_backtrace()));
+              // log_rd2("main_check: the end".var_export(debug_backtrace()));
               $is_page_streaming = TRUE;
           }
           
@@ -946,11 +929,12 @@ push(\"%s\");
 
 function stream_keepalive($with_ping)
 {
-    return (sprintf("<script id='hs%d' type='text/javascript'><!--
+    $ret =  (sprintf("<script id='hs%d' type='text/javascript'><!--
 push(%s);
 // -->
 </script>", $this->rd_scristp++, ($with_ping ? "\"act_ping();\"" : "null")));
-    
+
+    return ($ret);
 }
 
 static function base_get()