From: Matteo Nastasi (mop) <nastasi@alternativeoutput.it>
Date: Tue, 20 Aug 2013 06:30:22 +0000 (+0200)
Subject: force uncompress when websocket streaming and updated version
X-Git-Tag: v4.9.1
X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=brisk.git;a=commitdiff_plain;h=7a66f3d9cc106069ebad86fabfd1c7be4e3e8407

force uncompress when websocket streaming and updated version
---

diff --git a/TODO.txt b/TODO.txt
index 568cf21..fd9ece4 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -4,6 +4,9 @@
   FEATURES |
  ----------+
    - WEBSOCKET TRANSPORT
+     . refactoring $enc attribute management
+     DONE . reintroduced $enc = 'plain' for websocket
+     DONE . fallback for not correct WS version
      DONE . fini of ws stream
      DONE . reactivate compression
      DONE . fix xynt_test01
diff --git a/web/Obj/brisk.phh b/web/Obj/brisk.phh
index 9c026f0..090aa8d 100644
--- a/web/Obj/brisk.phh
+++ b/web/Obj/brisk.phh
@@ -141,12 +141,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.9.0";
+$G_brisk_version = "4.9.1";
 
 /* MLANG: ALL THE INFO STRINGS IN brisk.phh */
-$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: aggiunto WebSocket come sistema preferenziale di comunicazione.',
+$root_wellarr = array( 'it' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NOVITA\'</b>: aggiunto WebSocket come sistema preferenziale di comunicazione e corretti un paio di bug.',
                                        '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>: added WebSocket as preferential communication system.',
+                       'en' => array ( 'Brisk (Ver. '.$G_brisk_version.'), <b>NEWS</b>: added WebSocket as preferential communication system and fixed a couple of bugs.',
                                        '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' => '
@@ -2344,12 +2344,14 @@ class Room
 
           break;
       case "index_rd_ifra.php":
-          // $enc = 'plain';
+          if (($transp  = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
+              $transp = "iframe";
+          if ($transp == 'websocket')
+              $enc = 'plain';
+
           do {
               if (!isset($cookie['sess'])
                   || (($user = $this->get_user($cookie['sess'], $idx)) == FALSE)) {
-                  if (($transp  = gpcs_var('transp', $get, $post, $cookie)) === FALSE)
-                      $transp = "iframe";
                   
                   $content = User::stream_fini($transp, $s_a_p->rndstr, TRUE);