Cadoles/ninegate
21
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Compare commits

base: Cadoles:4328e7b7c89006a53ba49b5d2cdbe05ed0d86cfa
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable
..
compare: Cadoles:9433a39649faa7355353ba55a8733c027b625b5d
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable

No commits in common. "4328e7b7c89006a53ba49b5d2cdbe05ed0d86cfa" and "9433a39649faa7355353ba55a8733c027b625b5d" have entirely different histories.
4328e7b7c8 ... 9433a39649

1 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

5
src/ninegate-1.0/src/Cadoles/EdispatcherBundle/Controller/ApiController.php
View File

@ -376,8 +376,7 @@ EOL
return new Response(json_encode($output), 400); return new Response(json_encode($output), 400);
} }
# fixe #31884 "https://" => "//" $weburl="https://".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
$weburl="//".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
$serializer = new Serializer(array(new DateTimeNormalizer())); $serializer = new Serializer(array(new DateTimeNormalizer()));
if ($action == null) { if ($action == null) {
@ -408,6 +407,7 @@ EOL
} }
$categorielabel=""; $categorielabel="";
if ($compteur==0) { if ($compteur==0) {
if ($alert->getAlertcategory()->getLabel()!="sans categorie")
if ($flag=="") { 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>"; $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(); $tmp["message"] = "$categorielabel<h4>".$alert->getTitle()."</h4>".$alert->getContent();
@ -415,6 +415,7 @@ EOL
} }
else else
{ {
if ($alert->getAlertcategory()->getLabel()!="sans categorie")
if ($flag=="") { if ($flag=="") {
$categorielabel="<img src='$iconeurl' width='16em' ><span style='font-weight: bold'> ".$alert->getAlertcategory()->getLabel()."</span> : "; $categorielabel="<img src='$iconeurl' width='16em' ><span style='font-weight: bold'> ".$alert->getAlertcategory()->getLabel()."</span> : ";
$tmp["message"] = $categorielabel.$alert->getTitle()."".$alert->getContent(); $tmp["message"] = $categorielabel.$alert->getTitle()."".$alert->getContent();