From cbc5056bbb1920363bb52e860e1e325b0d45a3f0 Mon Sep 17 00:00:00 2001
From: root <root@transnum.ac-dijon.fr>
Date: Fri, 14 Jun 2019 17:05:53 +0200
Subject: [PATCH] svg

---
 .../src/Cadoles/CoreBundle/Command/data/core-init-01.sql  | 2 +-
 .../Cadoles/PortalBundle/Command/GetLimesurveyCommand.php | 4 +++-
 .../PortalBundle/Controller/PagewidgetController.php      | 8 ++++----
 .../Resources/views/Pagewidget/viewflux.html.twig         | 4 ++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
index 7c5c623c..6e997d1c 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
@@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
 (-100, 'DRAAF', '130007107');
 
 INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
-(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}xiNakN3H44Yrsb6ZrCP+/VGKob+TEyKy
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}cRMoKJrH0IA1SxjJjoTxm1QwdgncEh2g
 ', 'afornerot@cadoles.com', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
 
 
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/GetLimesurveyCommand.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/GetLimesurveyCommand.php
index 8ddbccb1..8e358d57 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/GetLimesurveyCommand.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Command/GetLimesurveyCommand.php
@@ -24,7 +24,9 @@ class jsonRPCClient
      */
     protected $curl_options = array(
         CURLOPT_CONNECTTIMEOUT => 8,
-        CURLOPT_TIMEOUT => 8
+        CURLOPT_TIMEOUT => 8,
+        CURLOPT_SSL_VERIFYHOST => false,
+        CURLOPT_SSL_VERIFYPEER => false
     );
 
     /**
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
index 65468423..46884e09 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -698,10 +698,10 @@ class PagewidgetController extends Controller
                 if($PROXYactivate) {
                     $PROXYserver    = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue();
                     $PROXYport      = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue();
-                    $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'proxy' => ['http'  => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport]));
+                    $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http'  => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport]));
                 }
                 else
-                    $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3));
+                    $clientguzzle = new \GuzzleHttp\Client(['timeout' => 3,'verify'=>false]);
     
                 try {
                     $clientguzzle->request('GET', $url);
@@ -886,10 +886,10 @@ class PagewidgetController extends Controller
             if($PROXYactivate) {
                 $PROXYserver    = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue();
                 $PROXYport      = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue();
-                $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'proxy' => ['http'  => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport]));
+                $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http'  => 'tcp://'.$PROXYserver.':'.$PROXYport,'https' => 'tcp://'.$PROXYserver.':'.$PROXYport]));
             }
             else
-                $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3));
+                $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false));
 
             try {
                 $clientguzzle->request('GET', $url);
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
index dd9368a6..94907f21 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig
@@ -69,7 +69,11 @@
 
                     <div class="cat-list-feed" onClick="showFlux({{ entity.id}},{{ flux.id }})" style="{{ stylefeed }}">{{ flux.title }}</div>
                 {% endfor %}
+            {% else %}
+                <p></p>
             {% endif %}
+        {% else %}
+            <p></p>
         {% endif %}
 
         <div class="grid clearfix">