pre-merge into master

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

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index fdd578f..10edf1b 100644 (file)
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -503,7 +503,7 @@ class Bin5_user extends User {
        } 
     */
     
-    function spawn($from, &$bri, $table, $table_pos, $get, $post, $cookie)
+    static function spawn($from, &$bri, $table, $table_pos, $get, $post, $cookie)
     {
         if (($thiz = new Bin5_user()) == FALSE)
             return (FALSE);
@@ -525,7 +525,7 @@ class Bin5_user extends User {
         
         log_wr("Bin5 constructor");
         
-        $this->privflags  = ($CO_bin5_pref_ring_endauct == "true" ? BIN5_USER_FLAG_RING_ENDAUCT : 0) | 0;
+        $thiz->privflags  = ($CO_bin5_pref_ring_endauct == "true" ? BIN5_USER_FLAG_RING_ENDAUCT : 0) | 0;
 
         $thiz->table_orig = $table;
         $thiz->table      = 0;
@@ -803,29 +803,6 @@ class Bin5 {
 
     var $delay_mgr;
 
-    static function page_manager($room, $header_out, $path, $method, $addr, $get, $post, $cookie) 
-    {
-        switch ($path) {
-        case "":
-        case "index.php":
-            ob_start();
-            bin5_index_main($room, $header_out, $addr, $get, $post, $cookie);
-            $content = ob_get_contents();
-            ob_end_clean();
-            
-            force_no_cache($header_out);
-
-            $pgflush = new PageFlush($new_socket, $curtime, 20, $header_out, $content);
-            
-            if ($pgflush->try_flush($curtime) == FALSE) {
-                // Add $pgflush to the pgflush array
-                array_push($pages_flush, $pgflush);
-            }
-            break;
-        }
-        return TRUE;
-    }
-
     function Bin5 ($room, $table_idx, $table_token, $get, $post, $cookie) {
         $this->user = array();
         $this->table = array();
@@ -1176,6 +1153,8 @@ class Bin5 {
 
     static function request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, $path, $addr, $get, $post, $cookie)
     {
+        GLOBAL $G_black_list;
+
         printf("NEW_SOCKET (root): %d\n", intval($new_socket));
         
         $enc = get_encoding($header);
@@ -1207,7 +1186,7 @@ class Bin5 {
             $content = ob_get_contents();
             ob_end_clean();
         
-            $s_a_p->pendpage_try_addflush($enc, $new_socket, 20, $header_out, $content);
+            $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
             return TRUE;
         
         break;
@@ -1227,7 +1206,7 @@ class Bin5 {
             else {
                 $content = "Bin5 Load data error";
             }
-            $s_a_p->pendpage_try_addflush($enc, $new_socket, 20, $header_out, $content);
+            $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
             return TRUE;
             
             break;
@@ -1240,7 +1219,7 @@ class Bin5 {
                     || (($user = $bri->get_user($cookie['sess'], $idx)) == FALSE)) {
 
                     $content = Bin5_user::stream_fini($transp_type, $s_a_p->rndstr, TRUE);
-                    $s_a_p->pendpage_try_addflush($enc, $new_socket, 20, $header_out, $content);
+                    $s_a_p->pendpage_try_addflush($new_socket, 20, $enc, $header_out, $content);
 
                     return TRUE;
                     break;
@@ -1269,7 +1248,7 @@ class Bin5 {
                 fflush($new_socket);
                 
                 
-                $s_a_p->socks_set($new_socket, $user);
+                $s_a_p->socks_set($new_socket, $user, NULL);
                 $user->rd_socket_set($new_socket);
                 printf(" - qui ci siamo - ");
                 return TRUE;