WebSVN – LeadersLinked - Services – Diff – /module/LeadersLinked/src/Controller/MyProfilesController.php

 use LeadersLinked\Model\UserAptitude;
 use LeadersLinked\Form\UserProfile\HobbyAndInterestForm;
 use LeadersLinked\Mapper\HobbyAndInterestMapper;
 use LeadersLinked\Mapper\UserHobbyAndInterestMapper;
 use LeadersLinked\Model\UserHobbyAndInterest;
+use LeadersLinked\Library\Storage;
 class MyProfilesController extends AbstractActionController
                 $acl = $this->getEvent()->getViewModel()->getVariable('acl');
                 $allowView = $acl->isAllowed($currentUser->usertype_id, 'profile/view');
                 $allowEdit = $acl->isAllowed($currentUser->usertype_id, 'profile/my-profiles/edit');
                 $allowDelete = $acl->isAllowed($currentUser->usertype_id, 'profile/my-profiles/delete');
                 $storage = Storage::getInstance($this->config);
                 foreach ($records as $record) {
                     $item = [
                         'id' => $record->id,
                         'name' => $record->name,
-                        'image' => $this->url()->fromRoute('storage', ['type' => 'user', 'code' => $currentUser->uuid, 'filename' => $record->image],['force_canonical' => true]),
+                        'image' => $storage->getUserImage($currentUser),
                         'link_view' => $allowView ? $this->url()->fromRoute('profile/view', ['id' => $record->uuid])  : '',
                         'link_edit' => $allowEdit ? $this->url()->fromRoute('profile/my-profiles/edit', ['id' => $record->uuid])  : '',
                         'link_delete' => $allowDelete && $record->public == UserProfile::PUBLIC_NO ? $this->url()->fromRoute('profile/my-profiles/delete', ['id' => $record->uuid]) : '',
-            $image_size_cover = $this->config['leaderslinked.image_sizes.user_cover_upload'];
+            $image_size_cover = $this->config['leaderslinked.image_sizes.user_cover_upload'];
             $image_size_profile = $this->config['leaderslinked.image_sizes.user_upload'];
             $storage = Storage::getInstance($this->config);
                 $data = [
                     'following'         => $following,
                     'follower'          => $follower,
                     'user_id'           => $user->id,
                     'user_uuid'         => $user->uuid,
                     'full_name'         => trim($user->first_name . ' ' . $user->last_name),
                     'user_profile_id'   => $userProfile->id,
                     'user_profile_uuid' => $userProfile->uuid,
-                    'image'             => $this->url()->fromRoute('storage', ['type' => 'user-profile', 'code' => $currentUser->uuid, 'filename' => $userProfile->image],['force_canonical' => true]),
+                    'image'             => $storage->getUserImage($currentUser),
-                    'cover'             => $this->url()->fromRoute('storage', ['type' => 'user-cover', 'code' => $currentUser->uuid, 'filename' => $userProfile->cover],['force_canonical' => true]),
+                    'cover'             => $storage->getUserProfileCover($currentUser, $userProfile),
                     'overview'          => $userProfile->description,
+        $request = $this->getRequest();
+        if ($request->isPost()) {
-        $request = $this->getRequest();
+            $image = Image::getInstance($this->config);
-        if ($request->isPost()) {
+            $target_path = $image->getStorage()->getPathUser();
             $target_path = $this->config['leaderslinked.fullpath.user'] . $currentUser->uuid;
             if ($operation == 'delete') {
                 $this->logger->info('Se borro el image del perfil ' . ($userProfile->public == UserProfile::PUBLIC_YES ? 'público' : $userProfile->name), ['user_id' => $userProfile->user_id, 'ip' => Functions::getUserIP()]);
                 if ($userProfile->image) {
-                    if (!Image::delete($target_path, $userProfile->image)) {
+                    if (!$image->getStorage()->deleteFile($target_path, $currentUser->uuid, $userProfile->image)) {
                         return new JsonModel([
                             'data'   =>  'ERROR_UPLOAD_FILE'
                         ]);
+                    }
                     if ($userProfile->image) {
-                        if (!Image::delete($target_path, $userProfile->image)) {
+                        if (!$image->getStorage()->deleteFile($target_path, $currentUser->uuid, $userProfile->image)) {
                             return new JsonModel([
                                 'success'   => false,
                                 'data'   =>  'ERROR_THERE_WAS_AN_ERROR'
                             ]);
                     list($target_width, $target_height) = explode('x', $this->config['leaderslinked.image_sizes.user_size']);
                     $source             = $files['image']['tmp_name'];
                     $target_filename    = 'user-profile-' . uniqid() . '.png';
+                    $crop_to_dimensions = true;
-                    $crop_to_dimensions = true;
+                    $unlink_source = false;
-                    if (!Image::uploadImage($source, $target_path, $target_filename, $target_width, $target_height, $crop_to_dimensions)) {
+                    if (!$image->uploadImageChangeSize($source, $target_path, $currentUser->uuid, $target_filename, $target_width, $target_height, $crop_to_dimensions, $unlink_source)) {
                         return new JsonModel([
                             'success'   => false,
                             'data'   =>  'ERROR_THERE_WAS_AN_ERROR'
                             'data'   =>  'ERROR_THERE_WAS_AN_ERROR'
                         ]);
+                    }
+                    if ($userProfile->public == UserProfile::PUBLIC_YES) {
+                        $target_filename    = 'user-' . uniqid() . '.png';
+                        $unlink_source = true;
+                        if (!$image->uploadImageChangeSize($source, $target_path, $currentUser->uuid, $target_filename, $target_width, $target_height, $crop_to_dimensions, $unlink_source)) {
+                            return new JsonModel([
+                                'success'   => false,
+                                'data'   =>  'ERROR_THERE_WAS_AN_ERROR'
+                            ]);
                     if ($userProfile->public == UserProfile::PUBLIC_YES) {
                         $currentUser->image = $target_filename;
                         'success'   => false,
                         'data'   => $messages
                     ]);
+                }
+            }
+            $storage = Storage::getInstance($this->config);
             return new JsonModel([
                 'success'   => true,
                 'data' => [
-                    'user' => $this->url()->fromRoute('storage', ['type' => 'user', 'code' => $currentUser->uuid, 'filename' => $currentUser->image],['force_canonical' => true]),
+                    'user' => $storage->getUserImage($currentUser),
-                    'profile' => $this->url()->fromRoute('storage', ['type' => 'user-profile', 'code' => $currentUser->uuid, 'filename' => $userProfile->image],['force_canonical' => true]),
+                    'profile' => $storage->getUserProfileImage($currentUser, $userProfile),
                     'update_navbar' =>  $userProfile->public == UserProfile::PUBLIC_YES ? 1 : 0,
+                ]
             ]);
+        $request = $this->getRequest();
-        $request = $this->getRequest();
+        if ($request->isPost()) {
-        if ($request->isPost()) {
+            $image = Image::getInstance($this->config);
-            $target_path = $this->config['leaderslinked.fullpath.user'] . $currentUser->uuid;
+            $target_path = $image->getStorage()->getPathUser();
             if ($operation == 'delete') {
                 if ($userProfile->cover) {
-                    if (!Image::delete($target_path, $userProfile->cover)) {
+                    if (!$image->getStorage()->deleteFile($target_path, $currentUser->uuid, $userProfile->cover)) {
                         return new JsonModel([
                             'success'   => false,
                         ]);
+                    }
                     if ($userProfile->cover) {
-                        if (!Image::delete($target_path, $userProfile->cover)) {
+                        if (!$image->getStorage()->deleteFile($target_path, $currentUser->uuid, $userProfile->cover)) {
                             return new JsonModel([
                                 'success'   => false,
                                 'data'   =>  'ERROR_THERE_WAS_AN_ERROR'
                     list($target_width, $target_height) = explode('x', $this->config['leaderslinked.image_sizes.user_cover_size']);
                     $target_filename = 'user-cover-' . uniqid() . '.png';
                     $source = $files['cover']['tmp_name'];
+                    $crop_to_dimensions = false;
-                    $crop_to_dimensions = false;
+                    $unlink_source = true;
-                    if (!Image::uploadImage($source, $target_path, $target_filename, $target_width, $target_height, $crop_to_dimensions)) {
+                    if (!$image->uploadImageChangeSize($source, $target_path, $currentUser->uuid, $target_filename, $target_width, $target_height, $crop_to_dimensions, $unlink_source)) {
                         return new JsonModel([
                             'success'   => false,
                             'data'   =>  'ERROR_THERE_WAS_AN_ERROR'
                         'success'   => false,
                         'data'   => $messages
                     ]);
+                }
+            }
+            $storage = Storage::getInstance($this->config);
             return new JsonModel([
                 'success'   => true,
-                'data' => $this->url()->fromRoute('storage', ['type' => 'user-cover', 'code' => $currentUser->uuid, 'filename' => $userProfile->cover],['force_canonical' => true])
+                'data' => $storage->getUserProfileCover($currentUser, $userProfile)
             ]);

Proyectos de Subversion LeadersLinked - Services

(root)/module/LeadersLinked/src/Controller/MyProfilesController.php – Rev 111 → 283