From 33c61bb618841cffcfa1048d5d5d93b48e3192ae Mon Sep 17 00:00:00 2001 From: afornerot Date: Fri, 23 Oct 2020 13:27:07 +0200 Subject: [PATCH] refonte sonde --- .../Controller/SecurityController.php | 8 -- .../CoreBundle/Controller/SondeController.php | 74 +++++++++++++++++++ .../CoreBundle/Resources/config/routing.yml | 5 ++ .../Resources/views/File/view.html.twig | 1 - .../Resources/views/Sonde/sonde.html.twig | 3 + .../CoreBundle/Resources/views/base.html.twig | 4 +- sso/filtres/ninegate.ini | 2 + 7 files changed, 86 insertions(+), 11 deletions(-) create mode 100644 src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php create mode 100644 src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Sonde/sonde.html.twig diff --git a/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php b/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php index 20b6629c..b6091fea 100644 --- a/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php +++ b/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php @@ -147,14 +147,6 @@ class SecurityController extends Controller } } - // Calcul Service - /* - $user = $em->getRepository('CadolesCoreBundle:User')->calculateServices($user, $attributes); - - // Attributs calculés - $attributes = $em->getRepository('CadolesCoreBundle:User')->calculateAttributes($user, $attributes); - */ - // Sauvegarde des attributes en session $this->get('session')->set('attributes', $attributes); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php new file mode 100644 index 00000000..176e34c1 --- /dev/null +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php @@ -0,0 +1,74 @@ +getUser(); + if($user) $loginsonde=crypt($user->getUsername(),"dkywqZPYNHtWDnSxACjXVcIsFuaiQT"); + else $loginsonde=""; + + // Calcul du profil + $profilsonde="visiteur"; + if($user) { + $profilsonde="utilisateur"; + $attributes=$this->get('session')->get('attributes'); + if(isset($attributes["ENTPersonProfils"])) $profilsonde=$attributes["ENTPersonProfils"]; + } + + // Calcul de la provenance + $e = explode('.', $_SERVER["REMOTE_ADDR"]); + $s = sizeof($e); + if(($e[0]=="172"&&$e[1]=="30")||($e[0]=="172"&&$e[1]=="16")||($e[0]=="10"&&($e[1]=="77"||$e[1]=="93"||$e[1]=="94"))) + $provenancesonde='interne'; + else + $provenancesonde='externe'; + + // Calcul du service associé à la page + $request = $this->get('request_stack')->getMasterRequest(); + $usage=$request->query->get('usage'); + $route = $request->attributes->get('_route'); + + if($route=="cadoles_core_user_file_list"||$route=="cadoles_core_home") + $usagesonde="nosonde"; + elseif($route=="cadoles_portal_user_page_view") { + if($usage=="group") $usagesonde="collaboratif"; + elseif($usage=="user") $usagesonde="collaboratif"; + else $usagesonde="portail"; + } + elseif(stripos($route,"cadoles_portal_user_calendar")!==false) + $usagesonde="calendrier"; + elseif(stripos($route,"cadoles_portal_user_project")!==false) + $usagesonde="calendrier"; + elseif(stripos($route,"cadoles_portal_user_blog")!==false) + $usagesonde="collaboratif"; + elseif(stripos($route,"cadoles_core_user_file")!==false) + $usagesonde="fichier"; + else + $usagesonde="portail"; + + + $urlsonde=""; + if($usagesonde!="nosonde") { + $url=$this->getParameter("widsonde_url"); + $app=$this->getParameter("alias"); + $urlsonde = $url."?appli=$app&profil=$profilsonde&login=$loginsonde&provenance=$provenancesonde&usage=$usagesonde&route=$route&fgdebug=$fgdebug"; + } + + return $this->render('CadolesCoreBundle:Sonde:sonde.html.twig',['urlsonde' => $urlsonde]); + } + + +} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml index 91412bff..7d3c8d84 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml @@ -45,6 +45,11 @@ cadoles_core_redirect: path: /user/redirect/{route}/{id} defaults: { _controller: CadolesCoreBundle:Security:redirect } +#== Sonde ================================================================================================================ +cadoles_core_sonde: + path: /sonde + defaults: { _controller: CadolesCoreBundle:Sonde:sonde } + #== Crop Image =========================================================================================================== cadoles_core_crop01: path: /crop01 diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/view.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/view.html.twig index 73d5ef37..e30fdc29 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/view.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/File/view.html.twig @@ -65,7 +65,6 @@ widthbody=widthbody-250; if(widthbody<950) widthbody="100%"; - console.log("euhe"+widthbody); //$("#image").css({}); $("#image").css("height","auto"); $("#image").css("max-width",widthbody); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Sonde/sonde.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Sonde/sonde.html.twig new file mode 100644 index 00000000..5614c281 --- /dev/null +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Sonde/sonde.html.twig @@ -0,0 +1,3 @@ +{% if not urlsonde is empty %} + +{% endif %} \ No newline at end of file diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig index c8410877..0e08a40c 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/base.html.twig @@ -158,8 +158,8 @@ {% endblock %} - {% if activate_widsonde %} - + {% if activate_widsonde and not framed is defined %} + {{ render(path("cadoles_core_sonde")) }} {% endif %} diff --git a/sso/filtres/ninegate.ini b/sso/filtres/ninegate.ini index 446dd9c0..8556255c 100644 --- a/sso/filtres/ninegate.ini +++ b/sso/filtres/ninegate.ini @@ -6,4 +6,6 @@ lastname=sn email=mail user_groups=user_groups rne=rne +ENTPersonProfils=ENTPersonProfils +