pendpage_try_addflush signature changed

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

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 804c6ee..ad293ed 100644 (file)
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -695,6 +695,16 @@ class Delay_Manager
     }
 }
 
+class Client_prefs {
+    var $listen;
+
+    function Client_prefs($listen)
+    {
+        $this->listen = $listen;
+    }
+}
+
+
 class Room
 {
     static $delta_t;
@@ -916,14 +926,20 @@ class Room
     
     $ret = sprintf('gst.st = %d; ',  $user_step);
 
-    if ($user->flags & USER_FLAG_ISOLAUTH) {
-      $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); ';
-    }
-    else if ($user->flags & USER_FLAG_LISTAUTH) {
-      $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
-    }
-    else {
-      $ret .= 'list_set(\'all\', false, \'\' ); ';
+    // for test: $prefs = new Client_prefs(USER_FLAG_LISTAUTH >> 2);
+    $prefs = new Client_prefs(($user->flags & USER_FLAG_MAP_AUTH) >> 2);
+    $ret .= sprintf('prefs_load(\'%s\', false, false);', json_encode($prefs));
+
+    if(false) {
+        if ($user->flags & USER_FLAG_ISOLAUTH) {
+            $ret .= 'list_set(\'isolation\', false, \''.$mlang_brisk['tit_onisol'][$G_lang].'\' ); ';
+        }
+        else if ($user->flags & USER_FLAG_LISTAUTH) {
+            $ret .= 'list_set(\'auth\', false, \''.$mlang_brisk['tit_onauth'][$G_lang].'\' ); ';
+        }
+        else {
+            $ret .= 'list_set(\'all\', false, \'\' ); ';
+        }
     }
 
     if ($user->subst == 'standup')
@@ -2199,17 +2215,24 @@ class Room
           $content = ob_get_contents();
           ob_end_clean();
 
-          $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+          fprintf(STDERR, "\n\nCONTENT [%s]\n\n", $content);
+          $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
           return TRUE;
 
           break;
       case "index_wr.php":
+          //
+          // Enhance required: in the POST case, after the header you must get content
+          //                   from the socket, waiting if necessary
+          //
+
+          fprintf(STDERR, "\n\nDENTRO QUI\n\n");
           ob_start();
           index_wr_main($this, $addr, $get, $post, $cookie);
           $content = ob_get_contents();
           ob_end_clean();
           
-          $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+          $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
           return TRUE;
 
           break;
@@ -2222,7 +2245,7 @@ class Room
                   
                   $content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);
 
-                  $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
+                  $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
                   return TRUE;
 
                   break;