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

Compare commits

base: Cadoles:2acf186c9bff5c77deadaadb7d57e267106b1b85
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable
...
compare: Cadoles:27ab0758e72145d28213a566cf9053ee3d201a74
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable

7 Commits
2acf186c9b ... 27ab0758e7

Author SHA1 Message Date
afornerot 27ab0758e7 correctif fgheader 2021-03-12 11:48:26 +01:00
Pierre Cadeot 0ceffe2fa3 fixes #31884 url des icones de catégories d'annonces préfixées par // plutot que https:// 2021-03-11 11:44:38 +04:00
Pierre Cadeot b272e50f88 fixes #31883 les annonces avec la categorie 'sans categorie' sont dorénavant correctement remontées par l'api edispatcher/messages 2021-03-11 11:11:11 +04:00
Pierre Cadeot eb3ed083e7 [api edispatcher] fix #31881 2021-03-10 18:12:13 +04:00
Pierre Cadeot d0a7f05f50 fix typo 2021-03-10 17:41:27 +04:00
Pierre Cadeot 68410eeb34 api edispatcher/mxservices reponse correcte en cas d'erreur (fixes #31881) 2021-03-10 17:07:11 +04:00
Pierre Cadeot 224cc87e77 fix fa icon categorie MesRessources api/edispatcher/items 2021-03-09 13:51:05 +04:00
11 changed files with 36 additions and 52 deletions
Show Stats Expand all files Collapse all files

5
src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ThemeController.php
View File

@ -67,10 +67,7 @@ class ThemeController extends Controller
$logo=$request->query->get('logo');
if(!empty($logo)) $session->set('logo',"bundles/cadolescore/themes/$themename/".$logo);
$fgheader=$request->query->get('fgheader');
if(!empty($fgheader)) $session->set('fgheader',boolval($fgheader));
$header=$request->query->get('header');
if(!empty($header)) $session->set('header',"bundles/cadolescore/themes/$themename/".$header);

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/acpoitiers/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/black/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/gray/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/green/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/orange/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/red/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

1
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/yellow/function.html.twig
View File

@ -14,7 +14,6 @@
render(url("cadoles_core_theme_setconfig",
{
'logo':logo,
'fgheader':fgheader,
'header': header,
'heightheader': heightheader,
'colormain': colormain,

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

@ -285,7 +285,7 @@ class ApiController extends Controller
$ret_str=$ret_str."<categorie>";
$ret_str=$ret_str."<nom>Mes Ressources</nom>";
$ret_str=$ret_str."<indice>-1</indice>";
$ret_str=$ret_str."<icone>fa-user-circle</icone>";
$ret_str=$ret_str."<icone>fa-star</icone>";
$ret_str=$ret_str."</categorie>";
}
@ -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) {
@ -407,7 +408,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 +415,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();
@ -779,9 +778,9 @@ $api('$id',data);";
$debug = ob_get_clean();
//$debug=json_encode($request->query);
//return new Response(json_encode($output), 400);
if(is_null($token)||is_null($libelle)||is_null($icon)||is_null($favurl)||is_null($nom)||is_null($categorie)||is_null($callback)||is_null($action)||is_null($callbackid)){
$output["error"]="missing parameter : token - id - libelle - icon - favurl - nom - categorie - callback - action - callbackid";
return new Response(json_encode($output), 400);
}
$em = $this->getDoctrine()->getManager();
@ -789,15 +788,13 @@ $api('$id',data);";
$datasource = $em->getRepository('CadolesEdispatcherBundle:Datasource')->findOneBy(["token"=>$token]);
if (!$datasource) {
$output["error"]="no datasource session found for token = $token";
return new Response(json_encode($output), 400);
}
$login = $datasource->getUsername();
// Récupérer l'utilisateur
$user=$em->getRepository('CadolesCoreBundle:User')->findOneBy(["username"=>$login]);
if(!$user) {
$output["error"]="user not exist";
return new Response(json_encode($output), 400);
$output["error"]="user does not exist";
}
// chercher l'item
@ -805,8 +802,7 @@ $api('$id',data);";
if(!$item) {
$altitem=$em->getRepository('CadolesPortalBundle:Item')->findOneBy(["url"=>$favurl."?gestion_edispatcher=locale"]);
if(!$altitem) {
$output["error"]="item with url=$favurl(?gestion_edispatcher=locale) not exist";
return new Response(json_encode($output), 400);
$output["error"]="item with url=$favurl(?gestion_edispatcher=locale) not found";
} else {
$item = $altitem;
}
@ -814,11 +810,16 @@ $api('$id',data);";
$bookmark = $em->getRepository('CadolesPortalBundle:Bookmark')->findOneBy(["user"=>$user,"item"=>$item]);
$title="";
$subtitle="";
$output="";
if(!$bookmark) {
if ($action=="BOOKMARK_ADD") {
$subtitle="";
$message="";
if (isset($output["error"])) {
$message=$output["error"];
$success=0;
} else {
$output="";
if(!$bookmark) {
if ($action=="BOOKMARK_ADD") {
$bookmark = new Bookmark();
$bookmark->setTitle($item->getTitle());
$title=$item->getTitle();
@ -832,34 +833,30 @@ $api('$id',data);";
$bookmark->setUser($user);
$em->persist($bookmark);
$em->flush();
$success=1;
$output="<html><body>
<form id='form2submit' name='form2submit' method='POST' action='$callback'>
<input name='action' id='action' type='hidden' value='$action' />
<input name='message' id='message' type='hidden' value='$title : $subtitle a &eacute;t&eacute; ajout&eacute; &agrave; vos favoris' />
<input name='success' id='success' type='hidden' value='1' />
<input name='id' id='id' type='hidden' value='$id' />
<input name='callbackid' id='callbackid' type='hidden' value='$callbackid' />
</form>
<script>
document.form2submit.submit();
</script>
</body></html>
";
} else $success=0; // item pas en favori, mais ce n'est pas une demande d'ajout
} else {
if ($action=="BOOKMARK_DEL") {
$success=1;
$message="$title : $subtitle a &eacute;t&eacute; ajout&eacute; &agrave; vos favoris";
} else {
$success=0;
$message="item introuvable en favori mais action=DEL (retrait)";
}
} else {
if ($action=="BOOKMARK_DEL") {
$em->remove($bookmark);
$em->flush();
$success=1;
$success=1;
$message="item supprimé de vos favoris";
} else {
$success=0;
$message="item deja en favori mais action=ADD (ajout)";
}
}
}
$output="<html><body>
<form id='form2submit' name='form2submit' method='POST' action='$callback'>
<input name='action' id='action' type='hidden' value='$action' />
<input name='message' id='message' type='hidden' value='item supprimé de vos favoris' />
<input name='success' id='success' type='hidden' value='1' />
<input name='message' id='message' type='hidden' value='$message' />
<input name='success' id='success' type='hidden' value='$success' />
<input name='id' id='id' type='hidden' value='$id' />
<input name='callbackid' id='callbackid' type='hidden' value='$callbackid' />
</form>
@ -869,8 +866,7 @@ document.form2submit.submit();
</body></html>
";
} else $success=0; // item deja en favori mais demande d'ajout
}
$reponse = new Response();
$reponse->setContent($output);