X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=72bd5003a1a968be4bd0ecb11c61035b13f266e5;hb=40b5a7235f7f8b76269b46e198fb7a03e64a86e8;hp=76e3c72bd3a4028ee9b20d017f8572d4d4dd37e1;hpb=4504fa6c9ae69cbe9322e28fba9d98d1a6c08cc1;p=brisk.git

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index 76e3c72..72bd500 100644
--- a/web/briskin5/Obj/briskin5.phh
+++ b/web/briskin5/Obj/briskin5.phh
@@ -32,6 +32,7 @@ define('BIN5_PROXY_PATH', PROXY_PATH."/bin5");
 
 require_once('rules.phh');
 
+// FOR TORNEO TURN IT TO BIN5_TOURNAMENT_TOGETHER17
 define('BIN5_TOURNAMENT_CURRENT', BIN5_TOURNAMENT_NO_DRAW);
 
 $mlang_bin5_bin5 = array(
@@ -83,10 +84,12 @@ function multoval($mult)
 
 function dom_select_rules()
 {
+    GLOBAL $G_lang;
+
     $ret = "<select id='select_rules'>\n";
     foreach (rules_keys() as $key) {
-        $value = rules_id2descr($key);
-        $ret .= sprintf("<option value='%d'>%s</option>\n", $key, $value);
+        $value = rules_id2descr($key, $G_lang);
+        $ret .= sprintf("<option value='%d'%s>%s</option>\n", $key, ($key == BIN5_TOURNAMENT_CURRENT ? " selected='selected'" : ""), $value);
     }
     $ret .= "</select>\n";
 
@@ -262,6 +265,7 @@ class Bin5_table extends Table {
 
     function spawn(&$from)
     {
+        GLOBAL $G_lang;
         if (($thiz =& new Bin5_table()) == FALSE)
             return (FALSE);
 
@@ -569,7 +573,7 @@ class Bin5_table extends Table {
             $this->mazzo = $match_data['mazzo_next'];
             $this->mult  = $match_data['mult_next'];
             $this->match_id = $match_id;
-            $this->game_init(&$bri->user);
+            $this->game_init($bri->user);
 
             /* reload of the page with the new layout */
             for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
@@ -584,7 +588,7 @@ class Bin5_table extends Table {
                 $user_cur->comm[$user_cur->step % COMM_N] = "";
                 $user_cur->step_inc();
 
-                $user_cur->comm[$user_cur->step % COMM_N] = show_table(&$bri, &$user_cur, $user_cur->step+1, TRUE, FALSE);
+                $user_cur->comm[$user_cur->step % COMM_N] = show_table($bri, $user_cur, $user_cur->step+1, TRUE, FALSE);
                 $user_cur->step_inc();
             }
             return (TRUE);
@@ -603,6 +607,8 @@ class Bin5_table extends Table {
 
     function rules_change(&$bri, $user, $rules_id_s)
     {
+        GLOBAL $G_lang;
+
         //
         //  Rules: update version following loaded tcode
         //
@@ -657,7 +663,7 @@ class Bin5_table extends Table {
             if ($i < BIN5_PLAYERS_N) {
                 // FIXME_LANG
                 $msg = sprintf("<b>L'utente <i>%s</i> voleva già usare le %s.</b>",
-                               xcape($user_cur->name), xcape(rules_id2descr($user_cur->rules_get())));
+                               xcape($user_cur->name), xcape(rules_id2descr($user_cur->rules_get(), $G_lang)));
                 break;
             }
 
@@ -669,7 +675,7 @@ class Bin5_table extends Table {
             if ($rules_tot < BIN5_PLAYERS_N) {
                 // FIXME_LANG
                 $msg = sprintf("<b>L'utente <i>%s</i> vorrebbe usare le %s.</b>",
-                               xcape($user->name), xcape(rules_id2descr($rules_id)));
+                               xcape($user->name), xcape(rules_id2descr($rules_id, $G_lang)));
                 break;
             }
 
@@ -680,7 +686,7 @@ class Bin5_table extends Table {
             $rules_name = rules_id2name($rules_id);
             $this->rules = new $rules_name($this);
 
-            // $this->game_init(&$bri->user);
+            // $this->game_init($bri->user);
 
             /* reload of the page with the new layout */
             for ($i = 0 ; $i < BIN5_PLAYERS_N ; $i++) {
@@ -697,7 +703,7 @@ class Bin5_table extends Table {
                 $user_cur->comm[$user_cur->step % COMM_N] = "";
                 $user_cur->step_inc();
 
-                $user_cur->comm[$user_cur->step % COMM_N] = show_table(&$bri, &$user_cur, $user_cur->step+1, TRUE, FALSE);
+                $user_cur->comm[$user_cur->step % COMM_N] = show_table($bri, $user_cur, $user_cur->step+1, TRUE, FALSE);
                 $user_cur->step_inc();
             }
             return (TRUE);
@@ -942,7 +948,7 @@ class Bin5_user extends User {
     protected function page_sync($sess, $page)
     {
         log_rd2("PAGE_SYNC");
-        printf("xXx BIN5_USER::PAGE_SYNC\n");
+        // printf("xXx BIN5_USER::PAGE_SYNC\n");
         return (sprintf('xstm.stop(); window.onbeforeunload = null; window.onunload = null; document.location.assign("%s");', $page));
     }
 
@@ -999,8 +1005,8 @@ class Bin5_user extends User {
           if ($this->stat == 'table') {
               log_load("RESYNC");
               /* NOTE: $this->room is associated with the current $bri object */
-              printf("xXx CLASS NAME [%s]\n", get_class($this->room));
-              $ret = show_table(&$this->room, $this, $this->step, FALSE, FALSE);
+              // printf("xXx CLASS NAME [%s]\n", get_class($this->room));
+              $ret = show_table($this->room, $this, $this->step, FALSE, FALSE);
           }
           log_rd2("NEWSTAT: ".$this->stat);
 
@@ -1017,11 +1023,11 @@ class Bin5_user extends User {
                       if ($this->rd_stat != $this->stat) {
                           $to_stat = $this->stat;
                           log_load("RESYNC");
-                          printf("xXx BIN5_USER::MAINCHECK\n");
+                          // printf("xXx BIN5_USER::MAINCHECK\n");
                           return ($this->page_sync($this->sess, ($to_stat == "table" ? "index.php" : "../index.php"), $this->table, $this->table_token));
                       }
                       log_rd2("lost history, refresh from scratch");
-                      printf("xXx LOST HISTORY!\n");
+                      // printf("xXx LOST HISTORY!\n");
                       $this->rd_step = -1;
                       break;
                   }
@@ -1112,7 +1118,7 @@ class Bin5 {
             $user[$table->player[$i]]->table_token = $table_token;
             $this->user[$i] = Bin5_user::spawn($user[$table->player[$i]], $this, $table_idx, $i, $get, $post, $cookie);
         }
-        $this->table[0] = Bin5_table::spawn(&$table);
+        $this->table[0] = Bin5_table::spawn($table);
 
         log_main("TABLE_OLD_WIN - Bin5:".$this->table[0]->old_asta_win);
 
@@ -1195,7 +1201,7 @@ class Bin5 {
                     ($user_cur->stat == 'table' && ($user_cur->subst == 'shutdowned' || $user_cur->subst == 'shutdowner')))
                     continue;
 
-                if ($user_cur->lacc + EXPIRE_TIME_RD < ($curtime - $delta)) { // Auto logout dell'utente
+                if ($user_cur->lacc + (($user_cur->ping_req ? 1.5 : 1.0) * EXPIRE_TIME_RD) < ($curtime - $delta)) { // Auto logout dell'utente
                     log_rd2($user_cur->sess." bin5 AUTO LOGOUT.");
 
                     if ($user_cur->stat == 'table') {
@@ -1205,7 +1211,7 @@ class Bin5 {
                         $user_cur->the_end = TRUE;
 
                         /* se gli altri utenti non erano d'accordo questo utente viene bannato */
-                        $remcalc = $this->table[0]->exitlock_calc(&$this->user, $user_cur->table_pos);
+                        $remcalc = $this->table[0]->exitlock_calc($this->user, $user_cur->table_pos);
                         if ($remcalc < 3) {
                             require_once("${G_base}Obj/hardban.phh");
                             Hardbans::add(($user_cur->is_auth() ? $user_cur->name : FALSE),
@@ -1398,7 +1404,7 @@ class Bin5 {
     {
         GLOBAL $G_ban_list, $G_black_list;
 
-        printf("NEW_SOCKET (root): %d\n", intval($new_socket));
+        // printf("NEW_SOCKET (root): %d\n", intval($new_socket));
 
         $enc = get_encoding($header);
         if (isset($header['User-Agent'])) {
@@ -1425,7 +1431,7 @@ class Bin5 {
         case "":
         case "index.php":
             ob_start();
-            bin5_index_main($transp_type, $header_out, $addr, $get, $post, $cookie);
+            bin5_index_main($transp_type, $header, $header_out, $addr, $get, $post, $cookie);
             $content = ob_get_contents();
             ob_end_clean();
 
@@ -1453,9 +1459,10 @@ class Bin5 {
 
             break;
         case "index_rd.php":
+        case "index_rd_wss.php":
             if (($transp  = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
                 $transp = "iframe";
-            if ($transp == 'websocket')
+            if ($transp == 'websocket' || $transp == 'websocketsec')
                 $enc = 'plain';
 
             do {
@@ -1477,7 +1484,7 @@ class Bin5 {
                 if (($prev = $user->rd_socket_get()) != NULL) {
                     $s_a_p->socks_unset($user->rd_socket_get());
                     fclose($user->rd_socket_get());
-                    printf("CLOSE AND OPEN AGAIN ON IFRA2\n");
+                    // printf("CLOSE AND OPEN AGAIN ON IFRA2\n");
                     $user->rd_socket_set(NULL);
                 }
 
@@ -1500,7 +1507,7 @@ class Bin5 {
 
                 $s_a_p->socks_set($new_socket, $user, NULL);
                 $user->rd_socket_set($new_socket);
-                printf(" - qui ci siamo - ");
+                // printf(" - qui ci siamo - ");
                 return TRUE;
             } while (FALSE);
 
@@ -1555,7 +1562,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
     $table_pos = $user->table_pos;
 
     $ret = "table_init();";
-    $ret .= $table->exitlock_show(&$bri->user, $table_pos);
+    $ret .= $table->exitlock_show($bri->user, $table_pos);
     if (!$is_again) {
         /* GENERAL STATUS */
         $user_rules = $user->rules_get();
@@ -1588,7 +1595,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
     }
     /* NOTIFY FOR THE CARD MAKER */
     if ($is_transition) { //  && $user->subst ==  "asta" superfluo
-        $ret .= show_table_info(&$bri, &$table, $table_pos);
+        $ret .= show_table_info($bri, $table, $table_pos);
         $ret .= "setTimeout(preload_images, 500, g_preload_img_arr, g_imgct);";
     }
     else {
@@ -1598,7 +1605,7 @@ function show_table(&$bri, &$user, $sendstep, $is_transition, $is_again)
         $ret .= table_welcome($user);
 
     if ($is_transition && !$is_again) { // just sit, play cow
-        $ret .= playsound("cow.mp3");
+        $ret .= playsound("cow");
     }
 
 
@@ -1796,7 +1803,7 @@ function show_table_info(&$bri, &$table, $table_pos)
 
     // TAG: POINTS_MANAGEMENT
     $pnt_min = $table->points_n - MAX_POINTS < 0 ? 0 : $table->points_n - MAX_POINTS;
-    $noty = sprintf('<p>%s.</p>\n', xcape(ucfirst(rules_id2descr($table->rules->id_get()))));
+    $noty = sprintf('<p>%s.</p>\n', xcape(ucfirst(rules_id2descr($table->rules->id_get(), $G_lang))));
     $noty .= sprintf('<table class=\"points\"><tr><th></th>');
 
     // Names.