X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=22b75d14bebb56674a0859ffcab00a9dcd809ea3;hb=9ffc7e5dc05fdd25cc273661ba8dc394c5d5518b;hp=a9813e509cce76df457af8286a434d44c85ebae4;hpb=380e4f95319a328524a764956fb802d991864bf7;p=brisk.git diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index a9813e5..22b75d1 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -2,7 +2,7 @@ /* * brisk - briskin5.phh * - * Copyright (C) 2006-2011 Matteo Nastasi + * Copyright (C) 2006-2012 Matteo Nastasi * mailto: nastasi@alternativeoutput.it * matteo.nastasi@milug.org * web: http://www.alternativeoutput.it @@ -477,13 +477,15 @@ class Bin5_user extends User { } */ - function spawn($from, &$bri, $table, $table_pos) + function spawn($from, &$bri, $table, $table_pos, $get, $post, $cookie) { - GLOBAL $CO_bin5_pref_ring_endauct; - if (($thiz = new Bin5_user()) == FALSE) return (FALSE); - + + if (($CO_bin5_pref_ring_endauct = gpcs_var("CO_bin5_pref_ring_endauct", $get, $post, $cookie)) === FALSE) { + $CO_bin5_pref_ring_endauct = ""; + } + $thiz->parentcopy($from); /* NOTE: at this moment idx and table_pos fields have the same value @@ -498,7 +500,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->table_orig = $table; $thiz->table = 0; $thiz->table_pos = $table_pos; @@ -718,10 +720,8 @@ class Bin5_user extends User { return ($ret); } -public static function stream_fini($is_unrecoverable) + public static function stream_fini($init_string, $is_unrecoverable) { - GLOBAL $G_four_rnd_string; - printf("xXx user::stream_fini\n"); // IF IFRAME THEN: @@ -737,7 +737,7 @@ window.onload = function () { if (http_streaming != \"ready\") { http_streaming. "); - $body .= sprintf("\n", $G_four_rnd_string); + $body .= sprintf("\n", $init_string); $body .= sprintf("