Merge branch 'master' of https://git.e-declic.net/talents-tube/website

volume/www/website/www/src/AppBundle/Controller/Api/SecurityController.php

@@ -107,18 +107,17 @@ class SecurityController extends FOSRestController
    */
   public function UpdateUser(Request $request)
   {
-    $userManager = $this->get('fos_user.user_manager');
     $companyManager = $this->get('app.company_manager');
     $usr = $this->getUser();
-    $talent = $usr->getCompany();var_dump($talent);
+    $talent = $usr->getCompany();
     if ($usr !== null){
-      $newLastName = htmlspecialchars($request->request->get('lastname'));
-      $newFirstName = htmlspecialchars($request->request->get('firstname'));
-      $phoneTalent = htmlspecialchars($request->request->get('phone'));
-      $titleTalent = htmlspecialchars($request->request->get('currentJob'));
-      $newLinkedin = htmlspecialchars($request->request->get('linkedin'));
-      $newTwitter = htmlspecialchars($request->request->get('twitter'));
-      $newWebsite = htmlspecialchars($request->request->get('website'));
+      $newLastName = htmlspecialchars($request->get('lastname'));
+      $newFirstName = htmlspecialchars($request->get('firstname'));
+      $phoneTalent = htmlspecialchars($request->get('phone'));
+      $titleTalent = htmlspecialchars($request->get('currentJob'));
+      $newLinkedin = htmlspecialchars($request->get('linkedin'));
+      $newTwitter = htmlspecialchars($request->get('twitter'));
+      $newWebsite = htmlspecialchars($request->get('website'));
 
       if (!isset($newLastName) || !isset($newFirstName) || $newLastName == null || $newFirstName == null){
         $message = 'Vous devez rentrer votre nom et votre prénom pour continuer';
@@ -135,7 +134,6 @@ class SecurityController extends FOSRestController
           $talent->setPhoneTalent($phoneTalent);
           $companyManager->updateTalent($usr);
 
-
           $status = array('status' => "success");
       }
     } else {
@@ -144,6 +142,29 @@ class SecurityController extends FOSRestController
     return new JsonResponse($status);
   }
 
+  /**
+   * @Rest\post(path="/api/update_profile_picture", name="api_update_profile_picture")
+   * @Rest\View
+   */
+  public function UpdateProfilPicture(Request $request)
+  {
+    $userManager = $this->get('fos_user.user_manager');
+    $usr = $this->getUser();
+    if ($usr !== null){
+    
+          $file = $request->files->get('file');
+          $usr->setFile($file);
+          $usr->upload();
+          
+          $userManager->updateUser($usr);
+          $status = array('status' => "success", 'file' => $usr->getPhoto());
+      
+    } else {
+        $status = array('status' => "failure", 'message' => "Vous n'êtes pas connecté.");
+    }
+    return new JsonResponse($status);
+  }
+
   /**
    * @Rest\post(path="/api/reset_password", name="reset_password")
    * @Rest\View

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

@@ -49,6 +49,7 @@ class PushController extends Controller
         
         return new JsonResponse(array('success' => true),200);
     }
+    
     /**
      * @Route("/push/delete-subscription/", name="delete-subscription")
      */

volume/www/website/www/src/AppBundle/Entity/User.php

@@ -229,6 +229,7 @@ class User extends BaseUser
         $name = md5(uniqid()) . '.' . $this->file->guessExtension();
         $this->file->move($this->getUploadRootDir(), $name);
         $this->photo = $name;
+        
     }
 
     public function getUploadDir()