From 94ebe9a4283a56fd32765c051640fae9400c91ae Mon Sep 17 00:00:00 2001
From: Lang <langlasz@gmail.com>
Date: Sun, 29 Jan 2017 18:04:58 +0100
Subject: [PATCH] bugfix ssl module

---
 app/config/config.yml                                      | 2 +-
 src/Jotunheimr/UserBundle/Resources/views/layout.html.twig | 1 +
 src/Mine/SeekerBundle/Controller/GameController.php        | 3 ++-
 .../SeekerBundle/Resources/public/js/mine-user-list.js     | 1 +
 .../SeekerBundle/Resources/public/js/mine-user-list/app.js | 7 ++++++-
 src/Mine/SeekerBundle/Resources/views/Game/index.html.twig | 1 +
 .../SeekerBundle/Resources/views/Recent/facebook.html.twig | 3 +--
 7 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/config/config.yml b/app/config/config.yml
index 3d87036..8d41c0e 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -41,7 +41,7 @@ twig:
     debug:            "%kernel.debug%"
     strict_variables: "%kernel.debug%"
     globals:
-        version: "0.37.18 (beta7)"
+        version: "0.42.21 (beta8)"
         facebook_api: "%facebook.api%"
         facebook_scope: "%facebook.scope%"
         facebook_api_version: "%facebook.version%"
diff --git a/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig b/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
index dc2409f..4e71ba6 100644
--- a/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
+++ b/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
@@ -35,6 +35,7 @@
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/JQuery-Snowfall/1.7.4/snowfall.jquery.min.js"
             type="text/javascript"></script>
+
     <script type="text/javascript">
         $(function () {
             $(document).snowfall({deviceorientation: true, round: true, minSize: 5, maxSize: 8});
diff --git a/src/Mine/SeekerBundle/Controller/GameController.php b/src/Mine/SeekerBundle/Controller/GameController.php
index 1f0e400..65b6d91 100644
--- a/src/Mine/SeekerBundle/Controller/GameController.php
+++ b/src/Mine/SeekerBundle/Controller/GameController.php
@@ -10,7 +10,7 @@ use Symfony\Component\HttpFoundation\Request;
 
 class GameController extends Controller
 {
-    public function indexAction()
+    public function indexAction(Request $request)
     {
 //        $apiClient = new ApiClient('xoxp-107639806167-107029084564-115427085733-cccaa4f96c89c87ce680c7f22acfd001');
 //
@@ -35,6 +35,7 @@ class GameController extends Controller
 
         return $this->render('MineSeekerBundle:Game:index.html.twig', array(
             'env' => $this->container->getParameter('kernel.environment'),
+            'ssl' => $request->isSecure() ? 'true' : 'false',
         ));
     }
 
diff --git a/src/Mine/SeekerBundle/Resources/public/js/mine-user-list.js b/src/Mine/SeekerBundle/Resources/public/js/mine-user-list.js
index ef5d3cc..9b0ff61 100644
--- a/src/Mine/SeekerBundle/Resources/public/js/mine-user-list.js
+++ b/src/Mine/SeekerBundle/Resources/public/js/mine-user-list.js
@@ -6,6 +6,7 @@ let mineUserList = document.getElementById('mine-user-list');
 
 ReactDOM.render(
     <MineUserList env={mineUserList.dataset.env}
+                  ssl={mineUserList.dataset.ssl}
                   webPlayerName={mineUserList.dataset.webPlayerName}/>,
     mineUserList
 );
diff --git a/src/Mine/SeekerBundle/Resources/public/js/mine-user-list/app.js b/src/Mine/SeekerBundle/Resources/public/js/mine-user-list/app.js
index d68eaeb..ec0af08 100644
--- a/src/Mine/SeekerBundle/Resources/public/js/mine-user-list/app.js
+++ b/src/Mine/SeekerBundle/Resources/public/js/mine-user-list/app.js
@@ -9,6 +9,7 @@ class MineUserList extends React.Component {
 
         this.state = {
             env: props.env,
+            ssl: props.ssl,
             webPlayerName: props.webPlayerName,
             services: services,
             session: null,
@@ -86,7 +87,11 @@ class MineUserList extends React.Component {
     }
 
     getProfilePicture(id) {
-        let avatarNbr = Math.floor(Math.random() * 5) + 1;
+        let avatarNbr = 5;
+
+        if (id !== null) {
+            avatarNbr = id.substr(-1) > 5 ? 5 : id.substr(-1);
+        }
 
         return id !== null ?
             <img src={"http://graph.facebook.com/" + id + "/picture?type=square&width=130&height=130"}
diff --git a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig
index cf6ef4e..6df9f60 100644
--- a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig
+++ b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig
@@ -67,6 +67,7 @@
         {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
             <div id="mine-user-list"
                  data-env="{{ env }}"
+                 data-ssl="{{ ssl }}"
                  data-web-player-name="{{ app.user.username is defined ? app.user.username : '' }}">
             </div>
         {% endif %}
diff --git a/src/Mine/SeekerBundle/Resources/views/Recent/facebook.html.twig b/src/Mine/SeekerBundle/Resources/views/Recent/facebook.html.twig
index 863525f..16f5c65 100644
--- a/src/Mine/SeekerBundle/Resources/views/Recent/facebook.html.twig
+++ b/src/Mine/SeekerBundle/Resources/views/Recent/facebook.html.twig
@@ -7,11 +7,10 @@
                 cookie: true,
                 status: true,
                 version: '{{ facebook_api_version }}',
-
             });
 
             /** trigger jQuery when Facebook SKD loads */
-            $(document).trigger('fb-load');
+//            $(document).trigger('fb-load');
 //            $(document).bind('fb-load', function () {
 //                TODO
 //            });