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

 <?php
 declare(strict_types=1);
-namespace LeadersLinked\Controller;
-use Laminas\Db\Adapter\AdapterInterface;
+namespace LeadersLinked\Controller;
 use Laminas\Mvc\Controller\AbstractActionController;
-use Laminas\Log\LoggerInterface;
-use Laminas\View\Model\JsonModel;
+use Laminas\Mvc\Controller\AbstractActionController;
 use Laminas\View\Model\JsonModel;
 use LeadersLinked\Library\Functions;
 use LeadersLinked\Mapper\CompanyUserMapper;
 use LeadersLinked\Form\Feed\CreateForm;
 use LeadersLinked\Model\FastSurveyVote;
 use LeadersLinked\Mapper\AbuseReportMapper;
 use LeadersLinked\Mapper\UserBlockedMapper;
 use LeadersLinked\Model\AbuseReport;
 use LeadersLinked\Model\User;
+use LeadersLinked\Library\S3Files;
+use LeadersLinked\Library\Storage;
 class FeedController extends AbstractActionController
         $id = $this->params()->fromRoute('id');
         $request = $this->getRequest();
         $request = $this->getRequest();
         if ($request->isGet()) {
             $currentUserPlugin = $this->plugin('currentUserPlugin');
             $currentUser = $currentUserPlugin->getUser();
             $items = [];
+            $contentReactionMapper = ContentReactionMapper::getInstance($this->adapter);
-            $contentReactionMapper = ContentReactionMapper::getInstance($this->adapter);
+            $records = $contentReactionMapper->fetchAllByFeedId($feed->id);
-            $records = $contentReactionMapper->fetchAllByFeedId($feed->id);
+            $storage = Storage::getInstance($this->config);
             foreach($records as $record)
+            {
                 $user = $userMapper->fetchOne($record->user_id);
-                $user = $userMapper->fetchOne($record->user_id);
+                if($user && $user->status == User::STATUS_ACTIVE) {
                 if($user && $user->status == User::STATUS_ACTIVE) {
                     array_push($items, [
                         'first_name' => $user->first_name,
                         'last_name' => $user->last_name,
                         'email' => $user->email,
-                        'image' => $this->url()->fromRoute('storage', ['type' => 'user', 'code' => $user->uuid, 'filename' => $user->image], ['force_canonical' => true]),
+                        'image' => $storage->getUserImage($user),
+                }
                 $companyUserMapper = CompanyUserMapper::getInstance($this->adapter);
-                $companyUser = $companyUserMapper->fetchOneByCompanyIdAndUserId($company->id, $currentUser->id);
-                //print_r($companyUser); exit;
+                $companyUser = $companyUserMapper->fetchOneByCompanyIdAndUserId($company->id, $currentUser->id);
                 if (!$companyUser || $companyUser->status != CompanyUser::STATUS_ACCEPTED) {
-            $files = $this->getRequest()->getFiles()->toArray();
-            $file_type = '';
-            $encoding = $this->params()->fromRoute('encoding');
-            if ($encoding == 'base64') {
-                $fileBase64Name = $this->params()->fromPost('file_base64_name');
+            $files = $this->getRequest()->getFiles()->toArray();
-                $fileBase64Content = $this->params()->fromPost('file_base64_content');
-                if ($fileBase64Name && $fileBase64Content) {
+            $file_type = '';
-                    try {
-                        $fileBase64Content = base64_decode($fileBase64Content);
-                        if ($fileBase64Content) {
-                            $feed_filename      = $this->normalizeString($fileBase64Name);
-                            $feed_tmp_filename = 'data' . DIRECTORY_SEPARATOR . 'tmp';
-                            if (!file_exists($feed_tmp_filename)) {
-                                mkdir($feed_tmp_filename, 0755, true);
-                            }
+            if (isset($files['file']) && empty($files['file']['error'])) {
+                $feed_tmp_filename  = $files['file']['tmp_name'];
-                            $feed_tmp_filename = 'data' . DIRECTORY_SEPARATOR . 'tmp' . DIRECTORY_SEPARATOR . $feed_filename;
-                            file_put_contents($feed_tmp_filename, $fileBase64Content);
-                            $mime_type = mime_content_type($feed_tmp_filename);
-                            //echo '$mime_type = '. $mime_type; exit;
-                            if ($mime_type == 'image/jpg' || $mime_type == 'image/jpeg' || $mime_type == 'image/png') {
-                                $file_type = Feed::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') {
-                                $file_type = Feed::FILE_TYPE_VIDEO;
-                            } else if ($mime_type == 'application/pdf') {
-                                $file_type = Feed::FILE_TYPE_DOCUMENT;
-                            }
-                        }
-                    } catch (\Exception $e) {
-                    }
-                }
-            } else {
-                if (isset($files['file']) && empty($files['file']['error'])) {
-                    $feed_tmp_filename  = $files['file']['tmp_name'];
-                    $feed_filename      = $this->normalizeString($files['file']['name']);
+                $feed_filename      = $this->normalizeString($files['file']['name']);
-                    $mime_type = mime_content_type($feed_tmp_filename);
+                $mime_type = mime_content_type($feed_tmp_filename);
-                    if ($mime_type == 'image/jpg' || $mime_type == 'image/jpeg' || $mime_type == 'image/png') {
+                if ($mime_type == 'image/jpg' || $mime_type == 'image/jpeg' || $mime_type == 'image/png') {
-                        $file_type = Feed::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') {
+                    $file_type = Feed::FILE_TYPE_IMAGE;
-                        $file_type = Feed::FILE_TYPE_VIDEO;
+                } else if ($mime_type ==  'video/quicktime' ||  $mime_type == 'video/webm' || $mime_type == 'video/mpeg' || $mime_type == 'video/mpg' || $mime_type == 'video/mp4') {
-                    } else if ($mime_type == 'application/pdf') {
+                    $file_type = Feed::FILE_TYPE_VIDEO;
-                $feed = $feedMapper->fetchOne($feed->id);
-                if ($file_type == Feed::FILE_TYPE_DOCUMENT) {
+                $feed = $feedMapper->fetchOne($feed->id);
-                    try {
-                        $target_path = $this->config['leaderslinked.fullpath.feed'] . $feed->uuid;
-                        if (!file_exists($target_path)) {
+                if ($file_type == Feed::FILE_TYPE_DOCUMENT) {
-                            mkdir($target_path, 0755, true);
+                    $storage = Storage::getInstance($this->config);
-                        }
-                        $full_filename = $target_path  . DIRECTORY_SEPARATOR . $feed_filename;
-                        if ($encoding == 'base64') {
-                            $resultMoveOrRename = rename($feed_tmp_filename, $full_filename);
-                        } else {
-                            $resultMoveOrRename = move_uploaded_file($feed_tmp_filename, $full_filename);
-                        }
+                    $target_path = $storage->getPathFeed();
-                        if ($resultMoveOrRename) {
+                    if ($storage->putFile($target_path, $feed->uuid, $feed_filename)) {
-                            $feed->file_type = $file_type;
-                            $feed->file_name = basename($feed_filename);
-                            $feedMapper->update($feed);
-                        } else {
-                            error_log('no se pudo mover o renombrar el documento : ' . $feed_tmp_filename . ' al directorio : ' . $full_filename);
                         $feed->file_type = $file_type;
-                    } catch (\Throwable $e) {
+                        $feed->file_name = $feed_filename;
-                        error_log($e->getTraceAsString());
+                        $feedMapper->update($feed);
-                    }
-                }
-                if ($file_type == Feed::FILE_TYPE_IMAGE) {
+                    }
-                    try {
-                        $target_path = $this->config['leaderslinked.fullpath.feed'] . $feed->uuid;
-                        if (!file_exists($target_path)) {
-                            mkdir($target_path, 0755, true);
-                        }
-                        list($target_width, $target_height) = explode('x', $this->config['leaderslinked.image_sizes.feed_image_size']);
+                } else if ($file_type == Feed::FILE_TYPE_IMAGE) {
+                    $image = Image::getInstance($this->config);
-                        $feed_filename = substr($feed_filename, 0, strrpos($feed_filename, '.'))  . '.png';
+                    $target_path = $image->getStorage()->getPathFeed();
-                        //$crop_to_dimensions = false;
-                        //if(Image::uploadImage($feed_tmp_filename, $target_path, $feed_filename, $target_width, $target_height, $crop_to_dimensions )) {
+                    list($target_width, $target_height) = explode('x', $this->config['leaderslinked.image_sizes.feed_image_size']);
-                        if (Image::uploadImageWithoutCompletationSize($feed_tmp_filename, $target_path, $feed_filename, $target_width, $target_height)) {
+                    $feed_filename = substr($feed_filename, 0, strrpos($feed_filename, '.'))  . '.png';
+                    $crop_to_dimensions = false;
-                            $feed->file_type = $file_type;
+                    $unlink_source = true;
                             $feed->file_name = basename($feed_filename);
-                            $feedMapper->update($feed);
+                    if(!$image->uploadImageChangeSize($feed_tmp_filename, $target_path, $feed->uuid, $feed_filename, $target_width, $target_height, $crop_to_dimensions, $unlink_source)) {
                         $feed->file_type = $file_type;
-                    } catch (\Throwable $e) {
+                        $feed->file_name = $feed_filename;
+                        $feedMapper->update($feed);
-                        error_log($e->getTraceAsString());
+                    }
+                }
+                if ($file_type == Feed::FILE_TYPE_VIDEO) {
+                    try {
+                        $full_filename = sys_get_temp_dir() . DIRECTORY_SEPARATOR . $feed_filename;
+                        rename($feed_tmp_filename, $full_filename);
+                        //extracción del cover
+                        $generate_filename = substr($feed_filename, 0, strrpos($feed_filename, '.')).  '.jpg';
+                        $generate_full_filename =  sys_get_temp_dir()  . DIRECTORY_SEPARATOR . $generate_filename;
+                        $cmd        = "/usr/bin/ffprobe -v error -of flat=s=_ -select_streams v:0 -show_entries stream=height,width,duration  $full_filename";
-                    }
+                        $response   = trim(shell_exec($cmd));
-                }
+                        $source_duration = 0;
+                        $lines = explode("\n", $response);
+                        foreach ($lines as $line) {
-                if ($file_type == Feed::FILE_TYPE_VIDEO) {
+                            $line = trim(strtolower($line));
-                    try {
-                        $target_path = $this->config['leaderslinked.fullpath.feed'] . $feed->uuid;
+                            if (strpos($line, 'duration') !== false) {
-                        if (!file_exists($target_path)) {
+                                $values = explode('=', $line);
-                            mkdir($target_path, 0755, true);
+                                $source_duration = intval(str_replace($values[1], '#', ''), 10);
-                        }
-                        $full_filename = $target_path  . DIRECTORY_SEPARATOR . $feed_filename;
-                        if ($encoding == 'base64') {
-                            $resultMoveOrRename = rename($feed_tmp_filename, $full_filename);
-                        } else {
-                            $resultMoveOrRename = move_uploaded_file($feed_tmp_filename, $full_filename);
-                        }
-                        if ($resultMoveOrRename) {
-                            // $getFromSecound = 2;
-                            //extracción del cover
-                            $generateFileName = substr($feed_filename, 0, strrpos($feed_filename, '.'));
-                            $generateFile =  $target_path  . DIRECTORY_SEPARATOR . $generateFileName .  '.jpg';
-                            $cmd        = "/usr/bin/ffprobe -v error -of flat=s=_ -select_streams v:0 -show_entries stream=height,width,duration  $full_filename";
-                            //error_log($cmd);
-                            $response   = trim(shell_exec($cmd));
-                            $source_duration = 0;
-                            $lines = explode("\n", $response);
-                            foreach ($lines as $line) {
-                                $line = trim(strtolower($line));
-                                if (strpos($line, 'duration') !== false) {
+                            }
-                                    $values = explode('=', $line);
+                        }
                                     $source_duration = intval(str_replace($values[1], '#', ''), 10);
-                                }
-                            }
-                            if ($source_duration == 0) {
-                                $second_extract = '00:00:02';
+                        if ($source_duration == 0) {
+                            $second_extract = '00:00:02';
-                            } else {
+                        } else {
-                                if ($source_duration > 10) {
-                                    $second_extract = '00:00:10';
-                                } else {
-                                    $second_extract = '00:00:02';
-                                }
-                            }
-                            $imageSize = $this->config['leaderslinked.image_sizes.feed_image_size'];
+                            if ($source_duration > 10) {
+                                $second_extract = '00:00:10';
+                            } else {
+                                $second_extract = '00:00:02';
+                            }
+                        }
+                        //$imageSize = $this->config['leaderslinked.image_sizes.feed_image_size'];
+                        //$cmd = "/usr/bin/ffmpeg -y -i $full_filename  -pix_fmt yuvj422p -deinterlace -an -ss $second_extract -f mjpeg -t 1 -r 1 -y -s $imageSize $generateFile";
+                        // $cmd = "/usr/bin/ffmpeg -y -i $full_filename  -pix_fmt yuvj422p -an -ss $second_extract -f mjpeg -t 1 -r 1 -y -s $imageSize $generateFile";
-                            //$cmd = "/usr/bin/ffmpeg -y -i $full_filename  -pix_fmt yuvj422p -deinterlace -an -ss $second_extract -f mjpeg -t 1 -r 1 -y -s $imageSize $generateFile";
+                        $cmd = "/usr/bin/ffmpeg -y -i $full_filename  -pix_fmt yuvj422p -an -ss $second_extract -f mjpeg -t 1 -r 1 -y  $generate_full_filename";
-                           // $cmd = "/usr/bin/ffmpeg -y -i $full_filename  -pix_fmt yuvj422p -an -ss $second_extract -f mjpeg -t 1 -r 1 -y -s $imageSize $generateFile";
+                        exec($cmd);
-                            $cmd = "/usr/bin/ffmpeg -y -i $full_filename  -pix_fmt yuvj422p -an -ss $second_extract -f mjpeg -t 1 -r 1 -y  $generateFile";
-                            //error_log($cmd);
+                        $storage = Storage::getInstance($this->config);
                         $target_path = $storage->getPathFeed();
-                            exec($cmd);
+                        if($storage->putFile($target_path, $feed->uuid, $generate_full_filename) || $storage->putFile($target_path, $feed->uuid, $full_filename)) {
-                            $feed->file_type = $file_type;
-                            $feed->file_name = basename($feed_filename);
-                            $feed->file_image_preview = basename($generateFile);
+                            $feed->file_type            = $file_type;
+                            $feed->file_name            = $feed_filename;
+                            $feed->file_image_preview   = $generate_filename;
+                            $feedMapper->update($feed);
+                            $videoConvert = new VideoConvert();
-                            $feedMapper->update($feed);
+                            $videoConvert->filename = $full_filename;
                             $videoConvert->type = VideoConvert::TYPE_FEED;
                             $videoConvert = new VideoConvert();
-                            $videoConvert->filename = $full_filename;
+                            $videoConvertMapper = VideoConvertMapper::getInstance($this->adapter);
      * @param int[] $abuse_report_comment_ids
      * @return array
      */
     private function renderFeed($feed_id, $now, $feedHighlighted = 0,  $user_blocked_ids  = [], $abuse_report_comment_ids = [])
+    {
         $currentUserPlugin = $this->plugin('currentUserPlugin');
         $currentUser = $currentUserPlugin->getUser();
         $currentNetworkPlugin = $this->plugin('currentNetworkPlugin');
+        }
         if ($feed->posted_or_shared == Feed::POSTED) {
+            $storage = Storage::getInstance($this->config);
             if ($feed->type == Feed::TYPE_COMPANY) {
-            if ($feed->type == Feed::TYPE_COMPANY) {
+                $companyMapper = CompanyMapper::getInstance($this->adapter);
-                $companyMapper = CompanyMapper::getInstance($this->adapter);
+                $company = $companyMapper->fetchOne($feed->company_id);
                 $company = $companyMapper->fetchOne($feed->company_id);
-                $item['owner_url'] = $this->url()->fromRoute('company/view', ['id' => $company->uuid],  ['force_canonical' => true]);
-                $item['owner_image'] = $this->url()->fromRoute('storage', ['code' => $company->uuid, 'type' => 'company', 'filename' => $company->image],['force_canonical' => true]);
+                $item['owner_url'] = $this->url()->fromRoute('company/view', ['id' => $company->uuid],  ['force_canonical' => true]);
-                $item['owner_name'] = $company->name;
-                /*
-                $companyUserMapper = CompanyUserMapper::getInstance($this->adapter);
-                $companyUser = $companyUserMapper->fetchOneByCompanyIdAndUserId($company->id, $currentUser->id);
-                if( $companyUser && $acl->isAllowed( $currentUser->usertype_id, 'my-company/feed' ) ) {
-                    $item['feed_delete_url'] = $this->url()->fromRoute('feed/delete',  $params);
+                $item['owner_image'] = $storage->getCompanyImage($company);
                 $item['owner_name'] = $company->name;
                 */
+            } else if ($feed->type == Feed::TYPE_GROUP) {
+                $groupMapper = GroupMapper::getInstance($this->adapter);
-            } else if ($feed->type == Feed::TYPE_GROUP) {
+                $group = $groupMapper->fetchOne($feed->group_id);
-                $groupMapper = GroupMapper::getInstance($this->adapter);
                 $group = $groupMapper->fetchOne($feed->group_id);
                 $item['owner_url'] = '';
-                $item['owner_image'] = $this->url()->fromRoute('storage', ['code' => $group->uuid, 'type' => 'group', 'filename' => $group->image],['force_canonical' => true]);
+                $item['owner_image'] = $storage->getGroupImage($group);
                 $item['owner_name'] = $group->name;
                 if ($group->user_id == $currentUser->id) {
                     $item['feed_delete_url'] = $this->url()->fromRoute('feed/delete',  $params,  ['force_canonical' => true]);
+                }
-                }
+            } else {
-            } else {
+                $userMapper = UserMapper::getInstance($this->adapter);
-                $userMapper = UserMapper::getInstance($this->adapter);
+                $user = $userMapper->fetchOne($feed->user_id);
                 $user = $userMapper->fetchOne($feed->user_id);
                 $item['owner_url'] = $this->url()->fromRoute('profile/view', ['id' => $user->uuid]);
-                $item['owner_image'] = $this->url()->fromRoute('storage', ['code' => $user->uuid, 'type' => 'user', 'filename' => $user->image],['force_canonical' => true]);
+                $item['owner_image'] = $storage->getUserImage($user);
         $user = $userMapper->fetchOne($feed->user_id);
+        if ($feed->posted_or_shared == Feed::SHARED) {
         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->url()->fromRoute('storage', ['code' => $user->uuid, 'type' => 'user', 'filename' => $user->image],['force_canonical' => true]);
+            $item['owner_image'] = $storage->getUserImage($user);
             $item['owner_name'] = $user->first_name . ' ' . $user->last_name;
+        $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) {
-        if ($feed->file_type == Feed::FILE_TYPE_IMAGE) {
+            $path = $storage->getPathFeed();
+            $item['owner_file_image'] = $storage->getGenericImage($path,  $feed->uuid, $feed->file_name);
+        }
-            $item['owner_file_image'] = $this->url()->fromRoute('storage', ['code' => $feed->uuid, 'type' => 'feed', 'filename' => $feed->file_name],['force_canonical' => true]);
+        if ($feed->file_type == Feed::FILE_TYPE_DOCUMENT) {
-        if ($feed->file_type == Feed::FILE_TYPE_DOCUMENT) {
+            $path = $storage->getPathFeed();
+            $item['owner_file_document'] = $storage->getGenericFile($path,  $feed->uuid, $feed->file_name);
-            $item['owner_file_document'] = $this->url()->fromRoute('storage', ['code' => $feed->uuid, 'type' => 'feed', 'filename' => $feed->file_name],['force_canonical' => true]);
+        }
-        }
+        if ($feed->file_type == Feed::FILE_TYPE_VIDEO) {
-        if ($feed->file_type == Feed::FILE_TYPE_VIDEO) {
+            $path = $storage->getPathFeed();
-            $item['owner_file_image_preview'] = $this->url()->fromRoute('storage', ['code' => $feed->uuid, 'type' => 'feed', 'filename' => $feed->file_image_preview],['force_canonical' => true]);
+            $item['owner_file_image_preview'] = $item['owner_file_image'] = $storage->getGenericImage($path,  $feed->uuid, $feed->file_image_preview);
-            $item['owner_file_video'] = $this->url()->fromRoute('storage', ['code' => $feed->uuid, 'type' => 'feed', 'filename' => $feed->file_name],['force_canonical' => true]);
-        }
             $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_description'] = $sharedFeed->description;
+            $item['shared_time_elapse'] = Functions::timeAgo($sharedFeed->added_on, $now);
-            $item['shared_time_elapse'] = Functions::timeAgo($sharedFeed->added_on, $now);
+            if ($sharedFeed->file_type == Feed::FILE_TYPE_IMAGE) {
                 $path = $storage->getPathFeed();
-            if ($sharedFeed->file_type == Feed::FILE_TYPE_IMAGE) {
+                $item['shared_file_image'] = $storage->getGenericImage($path, $sharedFeed->uuid, $sharedFeed->file_name);
+            }
-                $item['shared_file_image'] = $this->url()->fromRoute('storage', ['code' => $sharedFeed->uuid, 'type' => 'feed', 'filename' => $sharedFeed->file_name],['force_canonical' => true]);
+            if ($sharedFeed->file_type == Feed::FILE_TYPE_DOCUMENT) {
-            }
+                $path = $storage->getPathFeed();
+                $item['shared_file_document'] = $storage->getGenericFile($path, $sharedFeed->uuid, $sharedFeed->file_name);
             if ($sharedFeed->file_type == Feed::FILE_TYPE_DOCUMENT) {
-                $item['shared_file_document'] = $this->url()->fromRoute('storage', ['code' => $sharedFeed->uuid, 'type' => 'feed', 'filename' => $sharedFeed->file_name],['force_canonical' => true]);
+            if ($sharedFeed->file_type == Feed::FILE_TYPE_VIDEO) {
                 $path = $storage->getPathFeed();
-            if ($sharedFeed->file_type == Feed::FILE_TYPE_VIDEO) {
+                $item['shared_file_image_preview'] = $storage->getGenericImage($path, $sharedFeed->uuid, $sharedFeed->file_image_preview);
-                $item['shared_file_image_preview'] = $this->url()->fromRoute('storage', ['code' => $sharedFeed->uuid, 'type' => 'feed', 'filename' => $sharedFeed->file_image_preview],['force_canonical' => true]);
+                $item['shared_file_video'] = $storage->getGenericFile($path, $sharedFeed->uuid, $sharedFeed->file_name);
+            }
                 $item['shared_file_video'] = $this->url()->fromRoute('storage', ['code' => $sharedFeed->uuid, 'type' => 'feed', 'filename' => $sharedFeed->file_name],['force_canonical' => true]);
-            }
+            $item['shared_content_type'] = $sharedFeed->file_type ? $sharedFeed->file_type : '';
-            $item['shared_content_type'] = $sharedFeed->file_type ? $sharedFeed->file_type : '';
+            if ($feed->company_id) {
-            if ($feed->company_id) {
+                $companyMapper = CompanyMapper::getInstance($this->adapter);
+                $sharedCompany = $companyMapper->fetchOne($feed->company_id);
-                $companyMapper = CompanyMapper::getInstance($this->adapter);
+                $item['shared_url'] = $this->url()->fromRoute('company/view', ['id' => $sharedCompany->uuid]);
-                $sharedCompany = $companyMapper->fetchOne($feed->company_id);
+                $item['shared_image'] = $storage->getCompanyImage($sharedCompany);
-                $item['shared_url'] = $this->url()->fromRoute('company/view', ['id' => $sharedCompany->uuid]);
+                $item['shared_name'] = $sharedCompany->name;
-                $item['shared_image'] = $this->url()->fromRoute('storage', ['code' => $sharedCompany->uuid, 'type' => 'company', 'filename' => $sharedCompany->image],['force_canonical' => true]);
-                $item['shared_name'] = $sharedCompany->name;
+            } else if ($feed->group_id) {
+                $groupMapper = GroupMapper::getInstance($this->adapter);
-            } else if ($feed->group_id) {
+                $sharedGroup = $groupMapper->fetchOne($feed->group_id);
-                $groupMapper = GroupMapper::getInstance($this->adapter);
                 $sharedGroup = $groupMapper->fetchOne($feed->group_id);
                 $item['shared_url'] = '';
-                $item['shared_image'] = $this->url()->fromRoute('storage', ['code' => $sharedGroup->uuid, 'type' => 'group', 'filename' =>  $sharedGroup->image],['force_canonical' => true]);
+                $item['shared_image'] = $storage->getGroupImage($sharedGroup);
         if($feed->file_type == Feed::FILE_TYPE_FAST_SURVEY) {
             $item['comment_add_url'] = '';
             $item['comments'] = [];
         } else {
-            $item['comment_add_url'] = $this->url()->fromRoute('feed/comment', ['id' => $feed->uuid]);
+            $item['comment_add_url'] = $this->url()->fromRoute('feed/comment', ['id' => $feed->uuid],['force_canonical' => true]);
             $item['comments'] = [];
             foreach ($records as $record) {
                 $user = $userMapper->fetchOne($record->user_id);
                 if ($user->id == $currentUser->id) {
-                    $link_delete = $this->url()->fromRoute('feed/comment/delete', ['id' => $feed->uuid, 'comment' => $record->uuid]);
+                    $link_delete = $this->url()->fromRoute('feed/comment/delete', ['id' => $feed->uuid, 'comment' => $record->uuid],['force_canonical' => true]);
                 } else {
+                    $link_delete = '';
                     $link_delete = '';
                 array_push($comments , [
                     'unique' => uniqid(),
-                    'user_url' => $this->url()->fromRoute('profile/view', ['id' => $user->uuid]),
+                    'user_url' => $this->url()->fromRoute('profile/view', ['id' => $user->uuid],['force_canonical' => true]),
                     'user_name' => $user->first_name . ' ' . $user->last_name,
                     'company' => $owner,
-                    'user_image' => $this->url()->fromRoute('storage', ['type' => 'user',  'code' => $user->uuid, 'filename' =>  $user->image],['force_canonical' => true]),
+                    'user_image' => $storage->getUserImage($user),
                     'time_elapsed' => Functions::timeAgo($record->added_on, $now),
                     'comment' => $record->comment,
                     'link_abuse_report' => $user->id == $currentUser->id ? '' : $this->url()->fromRoute('helpers/abuse-report', ['type' => 'comment', 'id' => $record->uuid], ['force_canonical' => true]),
                     'link_delete' => $link_delete
                 ]);
+            }
-            $item['comments'] = $comments;
-        }
-        /*
-        echo '<pre>';
         print_r($feed);
-        print_r($item);
+            $item['comments'] = $comments;
         echo '</pre>';
         $feedMapper = FeedMapper::getInstance($this->adapter);
         $feed = $feedMapper->fetchOne($record->feed_id);
+        if ($record) {
             $storage = Storage::getInstance($this->config);
         if ($record) {
             $userMapper = UserMapper::getInstance($this->adapter);
             $user = $userMapper->fetchOne($record->user_id);
             $item['unique'] = uniqid();
-            //$item['user_image'] = $this->url()->fromRoute('storage', ['type' => 'user',  'code' => $user->uuid, 'filename' =>  $user->image],['force_canonical' => true]);
+            $item['user_image'] = $storage->getUserImage($user);
             $item['user_url'] = $this->url()->fromRoute('profile', ['id' => $user->uuid]);

Proyectos de Subversion LeadersLinked - Services

(root)/module/LeadersLinked/src/Controller/FeedController.php – Rev 247 → 283