Fix : typo in wording and redirect castre mazamet

volume/www/website/conf/redirect.conf

@@ -11,4 +11,5 @@ rewrite  ^/page/presentation-talent$  https://www.talentstube.com/cv-video perma
 rewrite  ^/page/la-plateforme$  https://www.talentstube.com/ permanent;
 rewrite ^/tarifs$ https://www.talentstube.com/accompagnement-entreprise permanent;
 rewrite ^/annonce/38-charge-de-projets-developpement-h-f$  https://www.talentstube.com/annonce/38-charge-de-projets-developpement-cosmetique-h-f permanent;
-rewrite  ^/annonce/recherche/$  https://www.talentstube.com/annonce/recherche permanent;
+rewrite  ^/annonce/recherche/$  https://www.talentstube.com/annonce/recherche permanent;
+rewrite  ^/territoire/1573-communaute-d-agglomeration-castres-mazamet/$  https://www.talentstube.com/territoire/1573-castres-mazamet/ permanent;

volume/www/website/www/src/AppBundle/Controller/TalentController.php

@@ -218,12 +218,12 @@ class TalentController extends Controller
         if ($form->isSubmitted() && $form->isValid()) {
             $userCompany = $this->getUser();
             $message = $form['message']->getData();
-            $htmlView = $this->renderView('email/contact_talent.html.twig', array(
+            $htmlView = $this->renderView('email/contact_default.html.twig', array(
                 'type' => 'html',
                 'message' => $message,
                 'user' => $user{0},
             ));
-            $plainView = $this->renderView('email/contact_talent.html.twig', array(
+            $plainView = $this->renderView('email/contact_default.html.twig', array(
                 'type' => 'plain',
                 'message' => $message,
                 'user' => $user{0},
@@ -249,14 +249,16 @@ class TalentController extends Controller
         $mustLogin = true;
         if ($this->getUser() && $this->getUser()->hasRole('ROLE_TALENT')) {
             $mustLogin = false;
+            if ($this->getUser() && ($this->getUser()->getCompany()->getId() ==  $talent->getId())) {
+                $showRecommendation = false;
+            }
         }
+        
         $showRecommendation = true;
         if ($this->getUser() && !$this->getUser()->hasRole('ROLE_TALENT')) {
             $showRecommendation = false;
         }
-        if ($this->getUser() && ($this->getUser()->getCompany()->getId() ==  $talent->getId())) {
-            $showRecommendation = false;
-        }
+
         $em = $this->getDoctrine()->getManager();
         $recommendations = $em->getRepository('AppBundle:Recommendation')->findBy(
             array('isEnabled'=>true, 'status'=> 'SENDED', 'user'=> $talent->getMainUser()),

volume/www/website/www/src/AppBundle/Form/Admin/TerritoryAdminType.php

@@ -107,7 +107,7 @@ class TerritoryAdminType extends AbstractType
             'data' => $terType,
             'choices' => array(
                 'Région' => 'Région',
-                'Communauté d\'aglgomération' => 'Communauté d\'aglgomération',
+                'Communauté d\'agglomération' => 'Communauté d\'agglomération',
                 'Communauté de commune' => 'Communauté de commune',
                 'Commune' => 'Commune',
                 'Département' => 'Département',

volume/www/website/www/src/AppBundle/Security/Core/User/FOSUBUserProvider.php

@@ -146,7 +146,7 @@ class FOSUBUserProvider extends BaseFOSUBProvider
             $lastname = $data['lastName'];
 
         } else {
-            $userPhoto = 'http://graph.facebook.com/'.$data['id'].'/picture?height=200';
+            $userPhoto = 'https://graph.facebook.com/'.$data['id'].'/picture?height=200';
             if(isset($data['birthday'])){
                 $birthday = \DateTime::createFromFormat ('m/d/Y', $data['birthday']);
             } else {