X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=blobdiff_plain;f=web%2FObj%2Fbrisk.phh;h=45e5fd1136c9383df2156ceafaab0c9e99da82ac;hb=b5dae179f26df4000dc48a09acb49d5098265d25;hp=a171273782a7f67b33ce115c68d427d4db0638a3;hpb=6d8db1ee47d3c0bb14133d3ab2e0a6bdc7ed60a0;p=brisk.git

diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index a171273..45e5fd1 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -152,12 +152,12 @@ $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 = "4.18.5";
+$G_brisk_version = "5.1.3";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: Puffin riattivato, accessi da cloud disattivati, corretto bug sulla gestione di puffin, riabilitato blocco dei proxy.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: comando /info e doppio click sugli utenti registrati, nuovi utenti apprendisti, info su numero di mani e di partite.',
                                        'Se vuoi iscriverti alla <a target="_blank" href="mailto:ml-briscola+subscribe@milug.org">Mailing List</a>, cliccala!' ),
-                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: Puffin re-enabled, cloud accesses disabled, fixed puffin mgmt bug, re-enabled proxy access block.',
+                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: ENcomando /info e doppio click sugli utenti registrati, nuovi utenti apprendisti.',
                                        'If you want to subscribe our <a target="_blank" href="ml-briscola+subscribe@milug.org">Mailing List</a>, click it!' ) );
 
 $G_room_help = array( 'it' => '
@@ -1693,7 +1693,20 @@ class Brisk
           $jret = json_encode(array("ret" => $ret, "mesg" => $mesg));
       }
       else {
-          $jret = json_encode(array("ret" => 0, "mesg" => "", "guar" => $guar_login));
+          $jret = json_encode(array("ret" => 0,
+                                    "mesg" => "",
+                                    "login" => $user_login,
+                                    // FIXME: state internationalization
+                                    "state" =>
+                                    ($user_item->type & USER_FLAG_TY_APPR ? "Apprendista" :
+                                     ($user_item->type & USER_FLAG_TY_CERT ? "Certificato" :
+                                      ($user_item->type & (USER_FLAG_TY_NORM | USER_FLAG_TY_SUPER) ?
+                                       "Normale" : "Stato sconosciuto"))),
+                                    "guar" => ($user_item->type & USER_FLAG_TY_APPR ?
+                                               "" : $guar_login),
+                                    "match" => (versions_cmp($user_tos_vers, "1.4") < 0 ? "non autorizzato" : $user_item->match_cnt) ,
+                                    "game" => (versions_cmp($user_tos_vers, "1.4") < 0 ? "non autorizzato" : $user_item->game_cnt),
+                                    "friend" => "unknown"));
       }
 
       return $jret;
@@ -2156,7 +2169,9 @@ class Brisk
         $to_user = sprintf('chatt_sub("%s",[%d,"%s"],"%s");', $dt, $user->flags, xcape($user->name), xcape("== chat ban =="));
       }
       else {
-          if ( TRUE && (! $user->is_auth()) ) {
+          // TEMPORARY DISABLED UNTIL test user option will be available
+          // if ( TRUE && (!$user->is_auth() || $user->is_appr()) ) {
+          if (!$user->is_auth()) {
               $to_user = nickserv_msg($dt, xcape("Visto l'elevato numero di molestatori che ultimamente hanno preso dimora su Brisk abbiamo deciso"));
               $to_user .= nickserv_msg($dt, xcape("di disattivare temporaneamente la chat in room per i non registrati, non ce ne vogliate e buone feste."));
               if (FALSE) {
@@ -2713,9 +2728,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 {
@@ -2781,7 +2797,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;