From b272e50f8862e523618a0b07323cb4a5d987ef09 Mon Sep 17 00:00:00 2001
From: Pierre Cadeot <pierre.cadeot@ac-reunion.fr>
Date: Thu, 11 Mar 2021 11:11:11 +0400
Subject: [PATCH 1/2] =?UTF-8?q?fixes=20#31883=20les=20annonces=20avec=20la?=
 =?UTF-8?q?=20categorie=20'sans=20categorie'=20sont=20dor=C3=A9navant=20co?=
 =?UTF-8?q?rrectement=20remont=C3=A9es=20par=20l'api=20edispatcher/message?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Cadoles/EdispatcherBundle/Controller/ApiController.php  | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php b/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
index 54d5c7ce..22f19324 100755
--- a/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
+++ b/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
@@ -407,7 +407,6 @@ EOL
             }
             $categorielabel="";
             if ($compteur==0) {
-                if ($alert->getAlertcategory()->getLabel()!="sans categorie")
                     if ($flag=="") {
                         $categorielabel="<div style='float:left;width: 102.5%;padding: 4px;padding-left: 4px;color:white;background-color: #$bgcolor;position:relative;top: -16px;left: -11px;'><img src='$iconeurl' width='24em'>&nbsp;".$alert->getAlertcategory()->getLabel()."</div></br>";
                         $tmp["message"]     = "$categorielabel<h4>".$alert->getTitle()."</h4>".$alert->getContent();
@@ -415,7 +414,6 @@ EOL
             }
             else
             {
-                if ($alert->getAlertcategory()->getLabel()!="sans categorie")
                     if ($flag=="") {
                         $categorielabel="<img src='$iconeurl' width='16em' ><span style='font-weight: bold'> ".$alert->getAlertcategory()->getLabel()."</span> : ";
                         $tmp["message"]     = $categorielabel.$alert->getTitle()."".$alert->getContent();

From 0ceffe2fa3603f6604322f02f8b25fedae5e7c3c Mon Sep 17 00:00:00 2001
From: Pierre Cadeot <pierre.cadeot@ac-reunion.fr>
Date: Thu, 11 Mar 2021 11:44:38 +0400
Subject: [PATCH 2/2] =?UTF-8?q?fixes=20#31884=20url=20des=20icones=20de=20?=
 =?UTF-8?q?cat=C3=A9gories=20d'annonces=20pr=C3=A9fix=C3=A9es=20par=20//?=
 =?UTF-8?q?=20plutot=20que=20https://?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Cadoles/EdispatcherBundle/Controller/ApiController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php b/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
index 22f19324..19e213d5 100755
--- a/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
+++ b/src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
@@ -376,7 +376,8 @@ EOL
             return new Response(json_encode($output), 400);
         }
 
-        $weburl="https://".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
+	# fixe #31884 "https://" => "//"
+        $weburl="//".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
         $serializer = new Serializer(array(new DateTimeNormalizer()));
 
         if ($action == null) {