X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2Fbriskin5%2FObj%2Fbriskin5.phh;h=0bbd9d9afedc3f647d257c2c928adbf5aadacb04;hb=94b406ae5451c04176ae43cad2e71f9f80d40d82;hp=c197b169d85fb41e7c94dcc278de2a68a00ed7aa;hpb=5fda451b4745af01742adaf198face3427c91f75;p=brisk.git

diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh
index c197b16..0bbd9d9 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(
@@ -67,6 +68,23 @@ $mlang_bin5_bin5 = array(
 $table_wellarr = Array( 'it' => Array ( 'Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.'),
                         'en' => Array ( 'EN Benvenuto al tavolo. Se almeno tre giocatori non sbloccano l\'uscita cliccando il lucchetto, chi esce non può risedersi a un qualunque tavolo per '.floor(BAN_TIME/60).' minuti.') );
 
+
+// FIXME - DYNAMIC WITH CACHE AND RELOAD FROM DB
+function deck_keys()
+{
+    return array('xx', 'yy');
+}
+
+function deck_id2descr($id, $lang)
+{
+    if ($id == 'xx')
+        return 'carte originali';
+    else if ($id == 'yy')
+        return 'carte strette';
+
+    return 'carte sconosciute';
+}
+
 function multoval($mult)
 {
     GLOBAL $G_lang;
@@ -88,7 +106,21 @@ function dom_select_rules()
     $ret = "<select id='select_rules'>\n";
     foreach (rules_keys() as $key) {
         $value = rules_id2descr($key, $G_lang);
-        $ret .= sprintf("<option value='%d'>%s</option>\n", $key, $value);
+        $ret .= sprintf("<option value='%d'%s>%s</option>\n", $key, ($key == BIN5_TOURNAMENT_CURRENT ? " selected='selected'" : ""), $value);
+    }
+    $ret .= "</select>\n";
+
+    echo "$ret";
+}
+
+function dom_select_deck($cur_sel)
+{
+    GLOBAL $G_lang;
+
+    $ret = "<select id='select_deck'>\n";
+    foreach (deck_keys() as $key) {
+        $value = deck_id2descr($key, $G_lang);
+        $ret .= sprintf("<option value='%s'%s>%s</option>\n", $key, ($key == $cur_sel ? " selected='selected'" : ""), $value);
     }
     $ret .= "</select>\n";
 
@@ -947,7 +979,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));
     }
 
@@ -1004,7 +1036,7 @@ 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));
+              // 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);
@@ -1022,11 +1054,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;
                   }
@@ -1200,7 +1232,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') {
@@ -1403,7 +1435,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'])) {
@@ -1483,7 +1515,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);
                 }
 
@@ -1506,7 +1538,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);
 
@@ -1604,7 +1636,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");
     }