stream_fini argument missing fixed

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

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 8c51f0b..11c1d5b 100644 (file)
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -277,17 +277,17 @@ class Bin5_table extends Table {
     function asta2mult($asta_pnt)
     {
         if ($asta_pnt > 110)
-            return (5);
+            return (6);
         else if ($asta_pnt > 100)
-            return (4);
+            return (5);
         else if ($asta_pnt > 90)
-            return (3);
+            return (4);
         else if ($asta_pnt > 80)
-            return (2);
+            return (3);
         else if ($asta_pnt > 70)
-            return (1);
+            return (2);
         else
-            return (0);
+            return (1);
     }
 
     function multer($is_new)
@@ -1109,7 +1109,7 @@ class Bin5 {
                                                                      $dt, $user->flags, xcape($user->name), xcape($user_mesg));
                 $user_cur->step_inc();
             }
-            log_legal($curtime, 'xxx', $user, ($user->stat == 'room' ? 'room' : 'table '.$user->table_orig),$user_mesg);
+            log_legal($curtime, $user->ip, $user, ($user->stat == 'room' ? 'room' : 'table '.$user->table_orig),$user_mesg);
         }
     }
 
@@ -1171,8 +1171,13 @@ class Bin5 {
         printf("NEW_SOCKET (root): %d\n", intval($new_socket));
         
         $enc = get_encoding($header);
-        if (isset($header['User-Agent']) && strstr($header['User-Agent'], "MSIE")) {
-            $transp_type = "htmlfile";
+        if (isset($header['User-Agent'])) {
+            if (strstr($header['User-Agent'], "MSIE")) {
+                $transp_type = "htmlfile";
+            }
+            else {
+                $transp_type = "xhr";
+            }
         }
         else {
             $transp_type = "iframe";
@@ -1226,7 +1231,7 @@ class Bin5 {
                     || ($bri = $s_a_p->app->match_get($table_idx, $table_token)) == NULL
                     || (($user = $bri->get_user($cookie['sess'], $idx)) == FALSE)) {
 
-                    $content = Bin5_user::stream_fini($s_a_p->rndstr, TRUE);
+                    $content = Bin5_user::stream_fini($transp_type, $s_a_p->rndstr, TRUE);
                     $s_a_p->pgflush_try_add($enc, $new_socket, 20, $header_out, $content);
 
                     return TRUE;
@@ -1423,7 +1428,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
         $ret .= "setTimeout(preload_images, 500, g_preload_img_arr, g_imgct);";
     }
     if (!$is_again) 
-        $ret .= table_wellcome($user);
+        $ret .= table_welcome($user);
 
     if ($is_transition && !$is_again) { // appena seduti al tavolo, play della mucca
         $ret .= playsound("cow.mp3");
@@ -1685,7 +1690,7 @@ function show_table_info(&$bri, &$table, $table_pos)
         }
         $old_multer = $table->multer(FALSE);
         if ($old_multer > 1) {
-            $noty .= sprintf($mlang_bin5_bin5['info_omul'][$G_lang], $old_multer);
+            $noty .= sprintf($mlang_bin5_bin5['info_omul'][$G_lang], multoval($old_multer));
         }
         $noty .= "<hr><br>";
     }
@@ -1718,7 +1723,7 @@ function show_table_info(&$bri, &$table, $table_pos)
   
     $multer = $table->multer(TRUE);
     if ($multer > 1) {
-        $noty .= sprintf($mlang_bin5_bin5['info_mult'][$G_lang], $multer );
+        $noty .= sprintf($mlang_bin5_bin5['info_mult'][$G_lang], multoval($multer) );
     }
     $noty .= "<hr><br>";
     $ret .= show_notify($noty, 3000, $mlang_bin5_bin5['btn_bkgame'][$G_lang], 500, 400);
@@ -1732,7 +1737,7 @@ function show_table_info(&$bri, &$table, $table_pos)
     return ($ret);
 }
 
-function table_wellcome($user)
+function table_welcome($user)
 {
     GLOBAL $table_wellarr, $G_lang;
     $ret = "";