X-Git-Url: https://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=c8a5b002b642dc270cf5e0d64168ed73c9909411;hb=7c52d1409a827818bc2b8c361b7e28fed5dce208;hp=0b9ead0b0cbd3739a03b82b9f5b827c74e1f9321;hpb=0678cbbbbf7ba11361b8716258302e276570b73e;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 0b9ead0..c8a5b00 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -59,7 +59,7 @@ define('EXPIRE_TIME_SMAMMA', 360);
 define('EXPIRE_TIME_WAG', 10);
 define('WAKEUP_TIME', 12);
 // BAN_TIME da allineare anche in commons.js
-define('BAN_TIME', 3600);
+define('BAN_TIME', 900);
 define('GARBAGE_TIMEOUT', 5);
 define('NICKSERV', "BriskServ");
 
@@ -153,10 +153,10 @@ $mlang_brisk = array( 'btn_backstand'=> array( 'it' => 'torna in piedi',
 $G_lng = langtolng($G_lang);
 
 $G_all_points = array( 11,10,4,3,2, 0,0,0,0,0 );
-$G_brisk_version = "5.4.1";
+$G_brisk_version = "5.7.0";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: potete scegliere che regole usare per giocare dal menu "Prefs" al tavolo, descrizioni più consistenti.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: dati dai client via web-socket.',
                                        'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
                        'en' => array ( 'EN Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: puoi creare la tua rete di amicizie con /info,',
                                        'vedere cosa pensano i tuoi amici degli altri utenti e tavoli riservati per registrati e apprendisti.',
@@ -183,7 +183,7 @@ Durante la partita, se vorrete ricaricare la pagina, usate l\'apposito bottone \
 Dopo che &egrave; iniziata una partita per uscirne dovete chiedere agli altri giocatori di sbloccarla cliccando sul lucchetto. Se non si segue questa prassi, una volta usciti, non vi potrete sedere a nessun tavolo per '.floor(BAN_TIME/60).' minuti.
 <dl>
 <dt><b>Comandi della chat</b>
-<dd><b>/nick <i>&lt;nuovo_nickname&gt;</i></b> - cambio di nickname
+<!-- <dd><b>/nick <i>&lt;nuovo_nickname&gt;</i></b> - cambio di nickname -->
 <dd><b>/tav <i>&lt;frase di invito&gt;</i></b> - invito per gli altri giocatori al tavolo dove si &egrave; seduti
 <dd><b>/st <i>&lt;stato&gt;</i></b> - cambia l\'icona associata al tuo user; <i>stato</i> pu&ograve; valere: \\"normale\\", \\"fuori\\", \\"pausa\\", \\"cibo\\", \\"cane\\", \\"lavoro\\", \\"presente\\" oppure \\"sigaretta\\"
 <dd><b>/cont <i>&lt;id partita&gt;</i></b> - quando si è a un tavolo per garantiti, permette di proseguire una partita giocata in precedenza con gli stessi giocatori
@@ -938,7 +938,7 @@ class Client_prefs {
 
     function user_load($user)
     {
-        fprintf(STDERR, "QQ %s: %x\n", __FUNCTION__, $user->flags);
+        // fprintf(STDERR, "QQ %s: %x\n", __FUNCTION__, $user->flags);
         $this->listen = ($user->flags & USER_FLAG_MAP_AUTH) >> 2;
         if ($user->rec != FALSE) {
             $this->supp_comp = $user->rec->supp_comp_get();
@@ -947,7 +947,7 @@ class Client_prefs {
             $this->supp_comp = "000000000000";
         }
 
-        fprintf(STDERR, "QQ %s: LISTEN: %d\n", __FUNCTION__, $this->listen);
+        // fprintf(STDERR, "QQ %s: LISTEN: %d\n", __FUNCTION__, $this->listen);
     }
 
     function json_load($json_s)
@@ -987,11 +987,11 @@ class Client_prefs {
     function store($user, $is_save)
     {
         // save into DB
-        fprintf(STDERR, "QQ %s::%s PRE: %x\n", __CLASS__, __FUNCTION__,
-                $user->flags & (~USER_FLAG_S_ALL & ~USER_FLAG_AUTH));
+        // fprintf(STDERR, "QQ %s::%s PRE: %x\n", __CLASS__, __FUNCTION__,
+        //         $user->flags & (~USER_FLAG_S_ALL & ~USER_FLAG_AUTH));
         $user->flags_set(($this->listen << 2), USER_FLAG_MAP_AUTH);
-        fprintf(STDERR, "QQ %s::%s %x\n", __CLASS__, __FUNCTION__,
-                $user->flags);
+        // fprintf(STDERR, "QQ %s::%s %x\n", __CLASS__, __FUNCTION__,
+        //         $user->flags);
         if ($user->is_supp_custom()) {
             $user->rec->supp_comp_set($this->supp_comp);
         }
@@ -1933,7 +1933,7 @@ class Brisk
     GLOBAL $G_base, $G_alarm_passwd, $mlang_brisk, $G_lang;
     $only_you = FALSE;
 
-    fprintf(STDERR, "WE ARE HERE: [%s]\n", $mesg);
+    // fprintf(STDERR, "WE ARE HERE: [%s]\n", $mesg);
 
     // common settings
     $msg = mb_substr($mesg, 6, 128, "UTF-8");
@@ -2451,6 +2451,14 @@ class Brisk
         }
         else {
             $login_exists =  $bdb->login_exists(strtolower($name_new));
+/*
+TO ENABLE USER-LOGIN ONLY
+-            $login_exists =  $bdb->login_exists(strtolower($name_new));
++            // $login_exists =  $bdb->login_exists(strtolower($name_new));
++            // Force access with login and password
++            $idx = -3;
++            return (FALSE);
+*/
         }
     }
     else {
@@ -2558,7 +2566,7 @@ class Brisk
               $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
 
               if (isset($cookie['CO_list'])) {
-                  fprintf(STDERR, "QQ: %s CO_list: [%s]\n", __FUNCTION__, $cookie['CO_list']);
+                  // fprintf(STDERR, "QQ: %s CO_list: [%s]\n", __FUNCTION__, $cookie['CO_list']);
                   if (strcmp($cookie['CO_list'], "auth") == 0) {
                       $this->user[$idx]->flags &= ~USER_FLAG_MAP_AUTH;
                       $this->user[$idx]->flags |= USER_FLAG_LISTAUTH;
@@ -2572,11 +2580,11 @@ class Brisk
                   }
               }
           }
-          else {
-              fprintf(STDERR, "QQ: CO_list not set flags: %x\n", __FUNCTION__, $this->user[$idx]->flags);
-          }
+          // else {
+          //    fprintf(STDERR, "QQ: CO_list not set flags: %x\n", __FUNCTION__, $this->user[$idx]->flags);
+          // }
       }
-      fprintf(STDERR, "QQ %s: flag %x\n", __FUNCTION__, $this->user[$idx]->flags);
+      // fprintf(STDERR, "QQ %s: flag %x\n", __FUNCTION__, $this->user[$idx]->flags);
       if ($ghost > -1) {
         log_main("ghost: rename!");
         $ghost_user = $this->user[$ghost];
@@ -2750,12 +2758,12 @@ class Brisk
   {
       GLOBAL $G_ban_list, $G_black_list, $G_cloud_smasher;
 
-      printf("NEW_SOCKET (root): %d PATH [%s]\n", intval($new_socket), $path);
+      // printf("NEW_SOCKET (root): %d PATH [%s]\n", intval($new_socket), $path);
 
-      fprintf(STDERR, "\n\n\n PRE_BLACK [%s]\n\n\n", $addr);
+      // fprintf(STDERR, "\n\n\n PRE_BLACK [%s]\n\n\n", $addr);
       if ($this->black_check($addr)) {
           // TODO: waiting async 5 sec before close
-          fprintf(STDERR, "\n\n\n BLACK CHECK\n\n\n");
+          // fprintf(STDERR, "\n\n\n BLACK CHECK\n\n\n");
           return (FALSE);
       }
       if ($path != "" && $path != "index.php") {
@@ -2808,9 +2816,10 @@ class Brisk
 
           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 {
@@ -2829,7 +2838,7 @@ class Brisk
               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);
               }
 
@@ -2851,7 +2860,7 @@ class Brisk
 
               $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);
 
@@ -2876,7 +2885,7 @@ class Brisk
           $subs = "briskin5/";
           $subs_l = strlen($subs);
           if (!strncmp($path, $subs, $subs_l)) {
-              $ret = Bin5::request_mgr(&$s_a_p, $header, &$header_out, &$new_socket, substr($path, $subs_l) , $addr, $get, $post, $cookie);
+              $ret = Bin5::request_mgr($s_a_p, $header, $header_out, $new_socket, substr($path, $subs_l) , $addr, $get, $post, $cookie);
               return ($ret);
           }
           break;
@@ -3440,9 +3449,9 @@ function validate_name($name)
   return (FALSE);
 }
 
-function playsound($filename)
+function playsound($name)
 {
-  return (sprintf('playsound("flasou", "%s");', $filename));
+  return (sprintf('g_jukebox.play("%s");', $name));
 }
 
 function secstoword($secs)