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

 use LeadersLinked\Mapper\CompanyUserMapper;
 use LeadersLinked\Form\Feed\CreateForm;
 use LeadersLinked\Hydrator\ObjectPropertyHydrator;
 use LeadersLinked\Model\Feed;
 use LeadersLinked\Mapper\FeedMapper;
-use LeadersLinked\Library\Image;
 use LeadersLinked\Mapper\GroupMapper;
 use LeadersLinked\Mapper\UserMapper;
 use LeadersLinked\Mapper\CommentMapper;
 use LeadersLinked\Mapper\ConnectionMapper;
 use LeadersLinked\Mapper\CompanyFollowerMapper;
 use LeadersLinked\Form\Feed\CommentForm;
 use LeadersLinked\Model\Comment;
 use LeadersLinked\Form\Feed\CreateGroupCompanyForm;
 use LeadersLinked\Model\CompanyUser;
 use LeadersLinked\Model\FastSurvey;
-use LeadersLinked\Model\VideoConvert;
-use LeadersLinked\Mapper\VideoConvertMapper;
 use LeadersLinked\Mapper\CompanyMapper;
 use LeadersLinked\Model\Company;
 use LeadersLinked\Model\Group;
 use LeadersLinked\Mapper\GroupMemberMapper;
 use LeadersLinked\Model\GroupMember;
 use LeadersLinked\Mapper\AbuseReportMapper;
 use LeadersLinked\Mapper\UserBlockedMapper;
 use LeadersLinked\Model\AbuseReport;
 use LeadersLinked\Model\User;
 use LeadersLinked\Library\Storage;
+use LeadersLinked\Model\VideoConvert;
+use LeadersLinked\Mapper\VideoConvertMapper;
 class FeedController extends AbstractActionController
+     *
      * @var \Laminas\Mvc\I18n\Translator
      */
     private $translator;
-    /**
-     *
-     * @var \LeadersLinked\Library\Storage
-     */
     private  $storage;
         $this->adapter      = $adapter;
         $this->cache        = $cache;
         $this->logger       = $logger;
         $this->config       = $config;
         $this->translator   = $translator;
-        $this->storage = Storage::getInstance($this->config, $this->adapter);
+    }
     /**
+     *
         if ($request->isGet()) {
             $currentUserPlugin = $this->plugin('currentUserPlugin');
+            $currentUser = $currentUserPlugin->getUser();
-            $currentUser = $currentUserPlugin->getUser();
+            $storage = \LeadersLinked\Library\Storage::getInstance($this->config, $this->adapter);
             $feedMapper = FeedMapper::getInstance($this->adapter);
             $feed = $feedMapper->fetchOneByUuidAndNetworkId($id, $currentUser->network_id);
             if (!$feed) {
                 $user = $userMapper->fetchOne($record->user_id);
                 if($user && $user->status == User::STATUS_ACTIVE) {
                     array_push($items, [
-                        'first_name' => $user->first_name,
+                        'first_name'    => $user->first_name,
-                        'last_name' => $user->last_name,
+                        'last_name'     => $user->last_name,
-                        'email' => $user->email,
+                        'email'         => $user->email,
-                        'image' => $this->storage->getUserImage($user),
+                        'image'         => $storage->getUserImage($user),
-                        'reaction' => $record->reaction,
+                        'reaction'      => $record->reaction,
                     ]);
+                }
             $feed->status = Feed::STATUS_PUBLISHED;
             $feed->total_comments    = 0;
             $feed->total_shared     = 0;
+            $storage = Storage::getInstance($this->config, $this->adapter);
+            $storage->setCurrentFilename('file');
-            $files = $this->getRequest()->getFiles()->toArray();
+            $files = $this->getRequest()->getFiles()->toArray();
             $type = '';
-            $filename = '';
-            if (isset($files['file']) && empty($files['file']['error'])) {
+            if (isset($files['file']) && empty($files['file']['error'])) {
-                $tmp_filename  = $files['file']['tmp_name'];
+                $feed_tmp_filename  = $files['file']['tmp_name'];
-                $filename      = \LeadersLinked\Library\Functions::normalizeStringFilename($files['file']['name']);
+                $feed_filename      = \LeadersLinked\Library\Functions::normalizeStringFilename($files['file']['name']);
-                $mime_type = mime_content_type($tmp_filename);
+                $mime_type = mime_content_type($feed_tmp_filename);
                 if ($mime_type == 'image/jpg' || $mime_type == 'image/jpeg' || $mime_type == 'image/png') {
-                    $type = Feed::TYPE_IMAGE;
+                    $file_type = Storage::FILE_TYPE_IMAGE;
                 } else if ($mime_type == 'video/quicktime' ||  $mime_type == 'video/webm' || $mime_type == 'video/mpeg' || $mime_type == 'video/mpg' || $mime_type == 'video/mp4') {
-                    $type = Feed::TYPE_VIDEO;
+                    $file_type = Storage::FILE_TYPE_VIDEO;
                 } else if ($mime_type == 'application/pdf') {
+                    $file_type = Storage::FILE_TYPE_DOCUMENT;
                     $type = Feed::TYPE_DOCUMENT;
+            }
+                }
+                $feed = $feedMapper->fetchOne($feed->id);
-                $feed = $feedMapper->fetchOne($feed->id);
+                $storage = Storage::getInstance($this->config, $this->adapter);
+                $storage->setFiles($this->getRequest()->getFiles()->toArray());
-                if($type) {
+                if($storage->setCurrentFilename('file')) {
-                    $target_path    = $this->storage->getPathFeed();
-                    $storage        = Storage::getInstance($this->config, $this->adapter);
+                    $file_type          = $storage->getFileType();
+                    $source_filename    = $storage->getTmpFilename();
-                    $target_path    = $storage->getPathHabitContent();
+                    $filename           = $storage->getFilename();
-                    if ($type == Feed::TYPE_DOCUMENT) {
+                    if ($file_type == Storage::FILE_TYPE_DOCUMENT) {
+                        $target_filename = $storage->composePathToFilename(Storage::TYPE_FEED, $feed->uuid, $filename);
-                        if($storage->moveAndPutFile($tmp_filename, $target_path, $feed->uuid,  $filename)) {
-                            $feed->file_type = $type;
+                        if ($storage->putFile($source_filename,$target_filename)) {
+                            $feed->file_type = $file_type;
+                            $feed->file_name = $filename;
+                            $feedMapper->update($feed);
+                        }
+                    } else if ($file_type == Storage::FILE_TYPE_IMAGE) {
-                            $feed->file_name = $filename;
+                        $filename = $storage->getFilenamePNG();
-                            $feedMapper->update($feed);
+                        $target_filename = $storage->composePathToFilename(Storage::TYPE_FEED, $feed->uuid, $filename);
-                        }
+                        list($target_width, $target_height) = explode('x', $this->config['leaderslinked.image_sizes.feed_image_size']);
-                    } else if ($type == Feed::TYPE_IMAGE) {
-                        $crop_to_dimensions = false;
+                        if($storage->uploadImageResize($source_filename, $target_filename, $target_width, $target_height)) {
-                        list($target_width, $target_height) = explode('x', $this->config['leaderslinked.image_sizes.feed_image_size']);
-                        $image = Image::getInstance($this->config);
-                        $filename = substr($filename, 0, strrpos($filename, '.'))  . '.png';
-                        $full_tmp_filename = $image->uploadProcessChangeSize($tmp_filename, $filename, $target_width, $target_height, $crop_to_dimensions);
+                            $feed->file_type = $file_type;
+                            $feed->file_name = $filename;
+                            $feedMapper->update($feed);
+                        }
-                        if($full_tmp_filename) {
+                    } else if ($file_type == Storage::FILE_TYPE_VIDEO) {
-                            if($storage->putFile($target_path, $feed->uuid,  $full_tmp_filename)) {
-                                $feed->file_type = $type;
-                                $feed->file_name = $filename;
-                                $feedMapper->update($feed);
-                            }
-                        }
-                    }
-                    if ($type == Feed::TYPE_VIDEO) {
-                        try {
-                            $poster_filename    = substr($filename, 0, strrpos($filename, '.')).  '.jpg';
-                            $tmp_poster         = sys_get_temp_dir()  . DIRECTORY_SEPARATOR . $poster_filename;
-                            \LeadersLinked\Library\Video::extractPoster($tmp_filename, $tmp_poster);
+                        $source_filename    = $storage->getTmpFilename();
-                            if($storage->moveAndPutFile($tmp_poster, $target_path, $feed->uuid,  $poster_filename) && $storage->moveAndPutFile($tmp_filename, $target_path, $feed->uuid,  $filename)) {
+                        $filename           = $storage->getFilename();
+                        $target_filename    = $storage->composePathToFilename(Storage::TYPE_FEED, $feed->uuid, $filename);
+                        if($storage->moveUploadedFile($source_filename, $target_filename )) {
+                            $feed->file_type = $file_type;
+                            $feed->file_name = $filename;
-                                $feed->file_type = $type;
+                            $filename           = $storage->getFilenamePNG();
-                                $feed->file_name = $filename;
+                            $source_filename    = $target_filename;
+                            $target_filename    = $storage->composePathToFilename(Storage::TYPE_FEED, $feed->uuid, $filename);
                                 if($feedMapper->update($feed)) {
-                                    $videoConvert               = new \LeadersLinked\Model\VideoConvert();
+                            if($storage->extractPosterFromVideo($source_filename, $target_filename)) {
-                                    $videoConvert->uuid         = $feed->uuid;
                                     $videoConvert->filename     = $filename;
-                                    $videoConvert->type         = \LeadersLinked\Model\VideoConvert::TYPE_FEED;
+                                $feed->file_image_preview = $filename;
+                            }
                                     $videoConvertMapper = \LeadersLinked\Mapper\VideoConvertMapper::getInstance($this->adapter);
                                     $videoConvertMapper->insert($videoConvert);
         $feedMapper = FeedMapper::getInstance($this->adapter);
         $feed = $feedMapper->fetchOneAnyStatus($feed_id);
         $storage = \LeadersLinked\Library\Storage::getInstance($this->config, $this->adapter);
             $item['feed_delete_reaction_url'] =  '';
             $item['feed_share_url'] = '';
             $item['feed_share_external_url'] = '';
             $item['feed_increment_external_counter_url'] = '';
-            $item['feed_vote_url'] = $fastSurveyVote ? '' : $this->url()->fromRoute('feed/vote',  ['id' => $feed->uuid]);
+            $item['feed_vote_url'] = $fastSurveyVote ? '' : $this->url()->fromRoute('feed/vote',  ['id' => $feed->uuid], ['force_canonical' => true]);
         } else {
             $item['feed_save_reaction_url'] =  $this->url()->fromRoute('feed/save-reaction',  $params,  ['force_canonical' => true]);
                 $companyMapper = CompanyMapper::getInstance($this->adapter);
                 $company = $companyMapper->fetchOne($feed->company_id);
                 $item['owner_url'] = $this->url()->fromRoute('company/view', ['id' => $company->uuid],  ['force_canonical' => true]);
-                $item['owner_image'] = $this->storage->getCompanyImage($company);
+                $item['owner_image'] = $storage->getCompanyImage($company);
                 $item['owner_name'] = $company->name;
             } else if ($feed->type == Feed::TYPE_GROUP) {
                 $groupMapper = GroupMapper::getInstance($this->adapter);
                 $group = $groupMapper->fetchOne($feed->group_id);
                 $item['owner_url'] = '';
                 $userMapper = UserMapper::getInstance($this->adapter);
                 $user = $userMapper->fetchOne($feed->user_id);
                 $item['owner_url'] = $this->url()->fromRoute('profile/view', ['id' => $user->uuid]);
-                $item['owner_image'] = $this->storage->getUserImage($user);
+                $item['owner_image'] = $storage->getUserImage($user);
                 $item['owner_name'] = $user->first_name . ' ' . $user->last_name;
         if ($feed->posted_or_shared == Feed::SHARED) {
             $item['owner_url'] = $this->url()->fromRoute('profile/view', ['id' => $user->uuid],['force_canonical' => true]);
-            $item['owner_image'] = $this->storage->getUserImage($user);
+            $item['owner_image'] = $storage->getUserImage($user);
             $item['owner_name'] = $user->first_name . ' ' . $user->last_name;
             $item['owner_description'] =  $owner_description;
         } else {
             $item['owner_description'] = $feed->description;
+        }
         $item['owner_feed_type'] = $feed->type;
         $item['owner_shared'] = $feed->total_shared;
         $item['owner_external_shared'] = $feed->total_external_shared;
         $item['owner_comments'] = $feed->total_comments;
-        $item['owner_time_elapse'] = Functions::timeAgo($feed->added_on, $now);
         $item['owner_time_elapse'] = Functions::timeAgo($feed->added_on, $now);
-        if ($feed->file_type == Feed::FILE_TYPE_IMAGE) {
-            $path = $this->storage->getPathFeed();
-            $item['owner_file_image'] = $this->storage->getGenericImage($path,  $feed->uuid, $feed->file_name);
+        $path = $storage->getPathFeed();
         if ($feed->file_type == Storage::FILE_TYPE_IMAGE) {
-        if ($feed->file_type == Feed::FILE_TYPE_DOCUMENT) {
+            $item['owner_file_image'] = $storage->getGenericImage($path,  $feed->uuid, $feed->file_name);
+        }
+        if ($feed->file_type == Storage::FILE_TYPE_DOCUMENT) {
+            $item['owner_file_document'] = $storage->getGenericFile($path,  $feed->uuid, $feed->file_name);
-            $path = $this->storage->getPathFeed();
+        }
-            $item['owner_file_document'] = $this->storage->getGenericFile($path,  $feed->uuid, $feed->file_name);
+        if ($feed->file_type == Storage::FILE_TYPE_VIDEO) {
         if ($feed->file_type == Feed::FILE_TYPE_VIDEO) {
             $path = $this->storage->getPathFeed();
-            $item['owner_file_image_preview'] = $item['owner_file_image'] = $this->storage->getGenericImage($path,  $feed->uuid, $feed->file_image_preview);
+            $item['owner_file_image_preview'] = $item['owner_file_image'] = $storage->getGenericImage($path,  $feed->uuid, $feed->file_image_preview);
-            $item['owner_file_video']  = $this->storage->getGenericFile($path,  $feed->uuid, $feed->file_name);
+            $item['owner_file_video']  = $storage->getGenericFile($path,  $feed->uuid, $feed->file_name);
         }
-        if ($feed->posted_or_shared == Feed::SHARED) {
-            $sharedFeed = $feedMapper->fetchOneAnyStatus($feed->shared_feed_id);
+        if ($feed->posted_or_shared == Feed::SHARED) {
+            $sharedFeed = $feedMapper->fetchOneAnyStatus($feed->shared_feed_id);
-            $item['shared_description'] = $sharedFeed->description;
-            $item['shared_time_elapse'] = Functions::timeAgo($sharedFeed->added_on, $now);
             $item['shared_description'] = $sharedFeed->description;
-            if ($sharedFeed->file_type == Feed::FILE_TYPE_IMAGE) {
+            $item['shared_time_elapse'] = Functions::timeAgo($sharedFeed->added_on, $now);
                 $path = $this->storage->getPathFeed();
-                $item['shared_file_image'] = $this->storage->getGenericImage($path, $sharedFeed->uuid, $sharedFeed->file_name);
+            if ($sharedFeed->file_type == Storage::FILE_TYPE_IMAGE) {
-            }
+                $item['shared_file_image'] = $storage->getGenericImage($path, $sharedFeed->uuid, $sharedFeed->file_name);
             if ($sharedFeed->file_type == Feed::FILE_TYPE_DOCUMENT) {
-                $path = $this->storage->getPathFeed();
+            if ($sharedFeed->file_type == Storage::FILE_TYPE_DOCUMENT) {
                 $companyMapper = CompanyMapper::getInstance($this->adapter);
                 $sharedCompany = $companyMapper->fetchOne($feed->company_id);
                 $item['shared_url'] = $this->url()->fromRoute('company/view', ['id' => $sharedCompany->uuid]);
-                $item['shared_image'] = $this->storage->getCompanyImage($sharedCompany);
+                $item['shared_image'] = $storage->getCompanyImage($sharedCompany);
                 $item['shared_name'] = $sharedCompany->name;
             } else if ($feed->group_id) {
                 $groupMapper = GroupMapper::getInstance($this->adapter);
                 $sharedGroup = $groupMapper->fetchOne($feed->group_id);
                 $item['shared_url'] = '';
-                $item['shared_image'] = $this->storage->getGroupImage($sharedGroup);
+                $item['shared_image'] = $storage->getGroupImage($sharedGroup);

Proyectos de Subversion LeadersLinked - Services

(root)/module/LeadersLinked/src/Controller/FeedController.php – Rev 334 → 345