fix hard cabled stream_fini response when some error occurs

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

diff --git a/web/Obj/user.phh b/web/Obj/user.phh
index ad63154..d5e82ee 100644 (file)
--- a/web/Obj/user.phh
+++ b/web/Obj/user.phh
@@ -46,6 +46,10 @@ define('USER_FLAG_S_RABB',  0x800); // done
 define('USER_FLAG_S_SOCC',  0x900); // done
 define('USER_FLAG_S_BABY',  0xa00); // done
 define('USER_FLAG_S_MOP',   0xb00); // done
+define('USER_FLAG_S_BABBO',   0xc00); // done
+define('USER_FLAG_S_RENNA',   0xd00); // done
+define('USER_FLAG_S_PUPAZ',   0xe00); // done
+define('USER_FLAG_S_VISCH',   0xf00); // done
 
 define('USER_FLAG_S_ALL',   0xf00); // done
 
@@ -461,7 +465,7 @@ class User {
 
   function reset() {
     $curtime = time();
-    log_legal($curtime, 'xxx', $this, "STAT:LOGOUT", '');
+    log_legal($curtime, $this->ip, $this, "STAT:LOGOUT", '');
 
     $tmp_sess = $this->sess;
     $this->sess = "";
@@ -647,13 +651,13 @@ class User {
       return ($ret);
   }  //   function maincheck (...
 
-  public static function stream_fini($init_string, $is_unrecoverable)
+  public static function stream_fini($transp, $init_string, $is_unrecoverable)
 {
     printf("xXx user::stream_fini\n");
 
     // FIXME: dynamic "Transport_" type
-    $tans_class = "Transport_iframe";
-    $body = $tans_class::fini($init_string, self::base_get(), static::blocking_error($is_unrecoverable));
+    $trans_class = Transport::gettype($transp);
+    $body = $trans_class::fini($init_string, self::base_get(), static::blocking_error($is_unrecoverable));
 
     // ELSE IF XHR THEN:
     // return (static::blocking_error($is_unrecoverable));