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

     /**
+     *
      * @var \Laminas\Db\Adapter\AdapterInterface
      */
     private $adapter;
     /**
+     *
      * @var \LeadersLinked\Cache\CacheInterface
      */
     private $cache;
     /**
+     *
      * @var \Laminas\Log\LoggerInterface
      */
     private $logger;
     /**
+     *
      * @var array
      */
     private $config;
     /**
+     *
      * @var \Laminas\Mvc\I18n\Translator
      */
     private $translator;
     /**
+     *
      * @param \Laminas\Db\Adapter\AdapterInterface $adapter
      * @param \LeadersLinked\Cache\CacheInterface $cache
      * @param \Laminas\Log\LoggerInterface LoggerInterface $logger
                 'data'   => $th->getMessage()
             ]);
+        }
+    }
     // Esta función maneja la acción de agregar un nuevo feed.
     public function addAction()
+    {
+        try {
-        try {
+            // Obtener el objeto de solicitud actual
+            $request = $this->getRequest();
             $request = $this->getRequest();
             // Recuperar el usuario y la empresa actuales usando plugins
             $currentUserPlugin = $this->plugin('currentUserPlugin');
             $currentUser = $currentUserPlugin->getUser();
             $currentNetworkPlugin = $this->plugin('currentNetworkPlugin');
             $currentNetwork = $currentNetworkPlugin->getNetwork();
             $currentCompany = $currentUserPlugin->getCompany();
-            $currentCompany = $currentUserPlugin->getCompany();
+            // Obtener el ID de MYT de la ruta
             $myt_id =  $this->params()->fromRoute('myt_id');
             $myt_id =  $this->params()->fromRoute('myt_id');
             // Verificar si la solicitud es una solicitud POST
             if (!$request->isPost()) {
                 return new JsonModel([
+                    'success' => false,
-                    'success' => false,
+                    'data' => 'ERROR_METHOD_NOT_ALLOWED'
-                    'data' => 'ERROR_METHOD_NOT_ALLOWED'
+                ]);
-                ]);
             }
+            // Combinar datos de POST y archivos
             $dataPost = array_merge($request->getPost()->toArray(), $request->getFiles()->toArray());
             $feed_content_type = empty($dataPost['feed_content_type']) ? '' :  $dataPost['feed_content_type'];
+            // Verificar si el tipo de contenido del feed es una encuesta rápida
             if ($feed_content_type == Feed::FILE_TYPE_FAST_SURVEY) {
-            if( $feed_content_type == Feed::FILE_TYPE_FAST_SURVEY) {
+                $form = new FastSurveyForm();
-                $form = new FastSurveyForm();
+                $form->setData($dataPost);
-                $form->setData($dataPost);
                 // Validar el formulario
                 if ($form->isValid()) {
-                    $dataPost = (array) $form->getData();
+                    $dataPost = (array) $form->getData();
                     $companyUserMapper = CompanyUserMapper::getInstance($this->adapter);
                     $companyUser = $companyUserMapper->fetchOwnerByCompanyId($currentCompany->id);
                     $now = $companyUserMapper->getDatebaseNow();
+                    // Hidratar los datos en un objeto FastSurvey
                     $hydrator = new ObjectPropertyHydrator();
-                    $hydrator = new ObjectPropertyHydrator();
+                    $fastSurvey = new FastSurvey();
-                    $fastSurvey = new FastSurvey();
+                    $hydrator->hydrate($dataPost, $fastSurvey);
                     $hydrator->hydrate($dataPost, $fastSurvey);
-                    $fastSurvey->network_id = $currentNetwork->id;
+                    // Asignar valores al objeto FastSurvey
-                    $fastSurvey->company_id = $currentCompany->id;
+                    $fastSurvey->network_id = $currentNetwork->id;
-                    $fastSurvey->user_id = $companyUser->id;
+                    $fastSurvey->company_id = $currentCompany->id;
-                    $fastSurvey->status = FastSurvey::STATUS_ACTIVE;
+                    $fastSurvey->user_id = $companyUser->id;
+                    $fastSurvey->status = FastSurvey::STATUS_ACTIVE;
                     $fastSurveyMapper = FastSurveyMapper::getInstance($this->adapter);
-                    $fastSurveyMapper = FastSurveyMapper::getInstance($this->adapter);
+                    $result = $fastSurveyMapper->insert($fastSurvey);
-                    $result = $fastSurveyMapper->insert($fastSurvey);
+                    if ($result) {
-                    if ($result) {
+                        // Crear un nuevo objeto Feed
                         $feed->title = '-';
                         $feed->description = '-';
                         $feed->total_comments   = 0;
                         $feed->total_shared     = 0;
                         $feed->shared_with      = Feed::SHARE_WITH_CONNECTIONS;
                         $feedMapper = FeedMapper::getInstance($this->adapter);
                         $feedMapper->insert($feed);
+                        // Registrar la acción de agregar la encuesta rápida
                         $this->logger->info('Se agrego la encuesta rápida : ' . $fastSurvey->question, ['user_id' => $currentUser->id, 'ip' => Functions::getUserIP()]);
                         $response = [
                             'success'   => true,
                             'data'   => $this->renderFeed($feed->id, $now)
                         ];
                     } else {
                         $response = [
                             'success' => false,
                             'data' => $fastSurveyMapper->getError()
                         ];
+                    }
                     return new JsonModel($response);
                 } else {
+                    // Manejar errores de validación del formulario
                     $messages = [];
                     $form_messages = (array) $form->getMessages();
                     foreach ($form_messages as $fieldname => $field_messages) {
                         $messages[$fieldname] = array_values($field_messages);
+                    }
                     return new JsonModel([
                         'success' => false,
                         'data' => $messages
                     ]);
+                }
             }
+            // Crear un nuevo formulario de feed
             $form = new CreateFeedForm($this->adapter);
+            $form->setData($dataPost);
             $form->setData($dataPost);
             // Validar el formulario
             if (!$form->isValid()) {
                 $messages = [];
-                $form_messages = (array) $form->getMessages();
-                foreach ($form_messages  as $fieldname => $field_messages)
+                $form_messages = (array) $form->getMessages();
                 foreach ($form_messages  as $fieldname => $field_messages) {
                     $messages[$fieldname] = array_values($field_messages);
+                }
                 return new JsonModel([
                     'success'   => false,
                     'data'   => $messages
                 ]);
+            }
             $companyMapper = CompanyMapper::getInstance($this->adapter);
             $now = $companyMapper->getDatebaseNow();
+            $company = $companyMapper->fetchOne($currentCompany->id);
             $company = $companyMapper->fetchOne($currentCompany->id);
+            $companyUserMapper = CompanyUserMapper::getInstance($this->adapter);
             $owner = $companyUserMapper->fetchOwnerByCompanyId($company->id);
             $companyUserMapper = CompanyUserMapper::getInstance($this->adapter);
-            $owner = $companyUserMapper->fetchOwnerByCompanyId($company->id);
+            // Establecer la prioridad del feed
             $dataPost['priority'] =  isset($dataPost['priority']) ? Feed::PRIORITY_URGENT  : '';
                 $feed->shared_with      = Feed::SHARE_WITH_CONNECTIONS;
+            }
             $feed->total_comments   = 0;
             $feed->total_shared     = 0;
+            $feedMapper = FeedMapper::getInstance($this->adapter);
-            $feedMapper = FeedMapper::getInstance($this->adapter);
             // Insertar el nuevo feed en la base de datos
-            if(!$feedMapper->insert($feed)) {
+            if (!$feedMapper->insert($feed)) {
                 return new JsonModel([
                     'success'   => false,
                     'data'   => $feedMapper->getError()
             $feed = $feedMapper->fetchOne($feed->id);
             $storage = Storage::getInstance($this->config, $this->adapter);
+            $storage->setFiles($request->getFiles()->toArray());
-            $storage->setFiles($request->getFiles()->toArray());
             // Verificar y establecer el nombre de archivo actual
-            if(!$storage->setCurrentFilename('file')) {
+            if (!$storage->setCurrentFilename('file')) {
                 return new JsonModel([
                     'success'   => false,
                     'data'   => 'ERROR_UPLOAD_FILE'
                 ]);
+            }
             $file_type = $storage->getFileType();
             $file_type = $storage->getFileType();
+            // Manejar la carga de archivos según el tipo de archivo
             if ($file_type == Feed::FILE_TYPE_DOCUMENT) {
                 $tmp_filename = $storage->getTmpFilename();
                 $filename = 'feed-' . $feed->uuid . '.pdf';
                 $target_filename = $storage->composePathToFilename(
                     Storage::TYPE_FEED,
                     $feed->uuid,
                     $filename
                 );
                 if (!$storage->putFile($tmp_filename, $target_filename)) {
                     return new JsonModel([
                         'success'   => false,
                         'data'   => 'ERROR_UPLOAD_FILE'
                     ]);
+                }
                 $feed->file_type = $file_type;
                 $feed->file_name = $filename;
-                if(!$feedMapper->update($feed)) {
+                if (!$feedMapper->update($feed)) {
                     return new JsonModel([
                         'success'   => false,
                         'data'   => 'ERROR_UPDATING_FEED'
                     ]);
                 }
+            }
             if ($file_type == Feed::FILE_TYPE_IMAGE) {
                 list($target_width, $target_height) = explode('x', $this->config['leaderslinked.image_sizes.feed_image_size']);
                 $tmp_filename = $storage->getTmpFilename();
                 $filename = 'feed-' . $feed->uuid . '.png';
                 $target_filename = $storage->composePathToFilename(
                     Storage::TYPE_FEED,
                     $feed->uuid,
                     $filename
                 );
-                if(!$storage->uploadImageResize($tmp_filename, $target_filename, $target_width, $target_height)) {
+                if (!$storage->uploadImageResize($tmp_filename, $target_filename, $target_width, $target_height)) {
                     return new JsonModel([
                         'success'   => false,
                         'data'   => 'ERROR_UPLOAD_FILE'
                     ]);
+                }
                 $feed->file_type = $file_type;
                 $feed->file_name = $filename;
-                if(!$feedMapper->update($feed)) {
+                if (!$feedMapper->update($feed)) {
                     return new JsonModel([
                         'success'   => false,
                         'data'   => 'ERROR_UPDATING_FEED'
                     ]);
+                }
+            }
             if ($file_type == Feed::FILE_TYPE_VIDEO) {
                 $tmp_filename = $storage->getTmpFilename();
                 $filename = 'feed-' . $feed->uuid . '.mp4';
                 $target_filename = $storage->composePathToFilename(
                     Storage::TYPE_FEED,
                     $feed->uuid,
                     $filename
                 );
-                if(!$storage->putFile($tmp_filename, $target_filename)) {
+                if (!$storage->putFile($tmp_filename, $target_filename)) {
                     return new JsonModel([
                         'success'   => false,
                         'data'   => 'ERROR_UPLOAD_FILE'
                     ]);
                 }
-                // Generate poster image filename
+                // Generar el nombre de archivo de la imagen del póster
                 $poster_filename = 'feed-' . $feed->uuid . '-poster.png';
                 $poster_target_filename = $storage->composePathToFilename(
                     Storage::TYPE_FEED,
                     $feed->uuid,
                     $poster_filename
                 );
-                // Extract poster from video using Storage class method
+                // Extraer la imagen del póster del video usando el método de la clase Storage
                 if (!$storage->extractPosterFromVideo($target_filename, $poster_target_filename)) {
                     return new JsonModel([
                         'success'   => false,
                         'data'   => 'ERROR_GENERATING_VIDEO_POSTER'
                     ]);
+                }
                 $feed->file_type = $file_type;
                 $feed->file_name = $filename;
                 $feed->file_image_preview = $poster_filename;
-                if(!$feedMapper->update($feed)) {
+                if (!$feedMapper->update($feed)) {
                     return new JsonModel([
                         'success'   => false,
                         'data'   => 'ERROR_UPDATING_FEED'
                     ]);
                     return new JsonModel([
                         'success'   => false,
                         'data'   => 'ERROR_INSERTING_VIDEO_CONVERT'
                     ]);
+                }
+            }
             // Devolver la respuesta con el feed renderizado
             return new JsonModel([
                 'success'   => true,
                 'data'   => $this->renderFeed($feed->id, $now)
             ]);
+        } catch (\Throwable $th) {
-        } catch (\Throwable $th) {
+            // Manejar cualquier error que ocurra durante el proceso
             return new JsonModel([
                 'success'   => false,
                 'data'   => $th->getMessage()
             ]);
+        }
-    }
+    }
     // Esta función maneja la acción del timeline, que recupera una lista paginada de feeds para la empresa actual.
     public function timelineAction()
+    {
         try {
-        try {
+            // Obtener el objeto de solicitud actual
+            $request = $this->getRequest();
             $request = $this->getRequest();
             // Recuperar el usuario y la empresa actuales usando plugins
             $currentUserPlugin = $this->plugin('currentUserPlugin');
+            $currentUser = $currentUserPlugin->getUser();
-            $currentUser = $currentUserPlugin->getUser();
+            $currentCompany = $currentUserPlugin->getCompany();
             $currentCompany = $currentUserPlugin->getCompany();
             // Verificar si la solicitud es una solicitud GET
             if (!$request->isGet()) {
                 return new JsonModel([
                     'success' => false,
+                    'data' => 'ERROR_METHOD_NOT_ALLOWED'
-                    'data' => 'ERROR_METHOD_NOT_ALLOWED'
+                ]);
                 ]);
-            }
+            // Obtener el número de página de los parámetros de consulta
             $page = (int) $this->params()->fromQuery('page');
-            $page = (int) $this->params()->fromQuery('page');
+            $myt_id = $this->params()->fromRoute('myt_id');
-            $myt_id = $this->params()->fromRoute('myt_id');
+            // Inicializar mappers para consultar la base de datos
             $queryMapper = QueryMapper::getInstance($this->adapter);
+            $feedMapper = FeedMapper::getInstance($this->adapter);
             $queryMapper = QueryMapper::getInstance($this->adapter);
+            // Verificar si se proporciona un ID de MYT específico
-            $feedMapper = FeedMapper::getInstance($this->adapter);
+            if ($myt_id) {
+                // Obtener la fecha y hora actuales de la base de datos
+                $now = $feedMapper->getDatebaseNow();
-            if ($myt_id) {
+                // Obtener el feed MYT por UUID
-                $now = $feedMapper->getDatebaseNow();
+                $myt = $feedMapper->fetchOneByUuid($myt_id);
                 $myt = $feedMapper->fetchOneByUuid($myt_id);
                 // Si no se encuentra el feed MYT, devolver un error
                 if (!$myt) {
                     return new JsonModel([
                         'success' => false,
+                        'data' => 'ERROR_MYT_NOT_FOUND'
-                        'data' => 'ERROR_MYT_NOT_FOUND'
+                    ]);
                     ]);
                 // Crear una consulta select para respuestas MYT
                 $select = $queryMapper->getSql()->select(FeedMapper::_TABLE);
                 $select->columns(['id']);
                 $select->where->equalTo('status', Feed::STATUS_PUBLISHED);
                 $select->where->equalTo('company_id', $currentCompany->id);
+                $select->where->equalTo('myt_id', $myt->id);
-                $select->where->equalTo('myt_id', $myt->id);
+                $select->where->equalTo('type', Feed::TYPE_MYT_ANSWER);
-                $select->where->equalTo('type', Feed::TYPE_MYT_ANSWER);
+                $select->order('added_on desc');
+            } else {
-                $select->order('added_on desc');
+                // Obtener la fecha y hora actuales de la base de datos
-            } else {
+                $now = $queryMapper->getDatebaseNow();
                 $now = $queryMapper->getDatebaseNow();
                 // Crear una consulta select para feeds de la empresa
                 $select = $queryMapper->getSql()->select(FeedMapper::_TABLE);
                 $select->columns(['id']);
                 $select->where->equalTo('status', Feed::STATUS_PUBLISHED);
+                $select->where->equalTo('company_id', $currentCompany->id);
-                $select->where->equalTo('company_id', $currentCompany->id);
+                $select->where->equalTo('type', Feed::TYPE_COMPANY);
-                $select->where->equalTo('type', Feed::TYPE_COMPANY);
+                $select->order('added_on desc');
                 $select->order('added_on desc');
+            // Crear un paginador para la consulta select
             $dbSelect = new \Laminas\Paginator\Adapter\DbSelect($select, $this->adapter);
+            $paginator = new \Laminas\Paginator\Paginator($dbSelect);
-            $dbSelect = new \Laminas\Paginator\Adapter\DbSelect($select, $this->adapter);
+            $paginator->setCurrentPageNumber($page ? $page : 1);
-            $paginator = new \Laminas\Paginator\Paginator($dbSelect);
+            $paginator->setItemCountPerPage(10);
-            $paginator->setCurrentPageNumber($page ? $page : 1);
+            // Inicializar un array para contener los elementos del feed renderizados
-            $paginator->setItemCountPerPage(10);
+            $items = [];
             // Obtener los elementos actuales del paginador
-            $items = [];
+            $feeds = $paginator->getCurrentItems();
             $feeds = $paginator->getCurrentItems();
             // Renderizar cada elemento del feed
+            foreach ($feeds as $feed) {
-            foreach ($feeds as $feed) {
+                $renderedFeed = $this->renderFeed($feed->id, $now);
-                $renderedFeed = $this->renderFeed($feed->id, $now);
+                if ($renderedFeed) {
-                if ($renderedFeed) {
+                    $items[] = $renderedFeed;
                     $items[] = $renderedFeed;
+            }
                         'page'     => $paginator->getCurrentPageNumber(),
                         'count'    => $paginator->getCurrentItemCount(),
+                    ]
+                ]
             ]);
         } catch (\Throwable $th) {
+            // Registrar cualquier error que ocurra durante el proceso
             $this->logger->error('Error al obtener el timeline: ' . $th->getMessage(), ['user_id' => $currentUser->id, 'ip' => Functions::getUserIP()]);
+            // Devolver una respuesta de error
             return new JsonModel([
                 'success' => false,
                 'data' => $th->getMessage()
             ]);
+        }
+    }
     public function oneFeedAction()
     {
+            }
             $items = [];
             $feedMapper = FeedMapper::getInstance($this->adapter);
             $now = $feedMapper->getDatebaseNow();
             $feed  = $feedMapper->fetchOneByUuid($feed_uuid);
             if (!$feed) {
                         'feed_title' => $feed->title,
                         'topic_title' => $feed->description
+                    ]
                 ];
             } else  if ($feed->type == 'myta') {
                 $items = $this->renderFeed($feed->id, $now, $myt_id);
                         'item' => $items,
                         'feed_title' => $feed->title,
                         'topic_title' => $feed->description
+                    ]
                 ];
             }
             /*else if ($feed->type == 'hptg') {
                 $group_uuid =  $this->params()->fromRoute('group_id');
             }*/
             return new JsonModel($response);
+        }
     }
     /**
+     *
      * @param int $feed_id
      * @param \LeadersLinked\Model\Company $company
             'feed_content_type' => $feed->file_type ? $feed->file_type : '',
             'owner_url' =>  'https://' . $network->main_hostname . '/company/view/' . $company->uuid,
             'owner_image' => $storage->getCompanyImage($company),
             'owner_name' => $company->name,
         ];
         $userMapper = \LeadersLinked\Mapper\UserMapper::getInstance($this->adapter);
         $user = $userMapper->fetchOne($feed->user_id);
         $item['owner_shared'] = $feed->total_shared;
         $item['owner_comments'] = $feed->total_comments;
-        if($feed->file_type == Feed::FILE_TYPE_FAST_SURVEY) {
+        if ($feed->file_type == Feed::FILE_TYPE_FAST_SURVEY) {
             $fastSurveyMapper = FastSurveyMapper::getInstance($this->adapter);
             $fastSurvey = $fastSurveyMapper->fetchOne($feed->fast_survey_id);
             $owner_description = [
                 'question' => $fastSurvey->question,
                 'number_of_answers' => $fastSurvey->number_of_answers,
                 'answer1' => $fastSurvey->answer1,
                 'answer2' => $fastSurvey->answer2,
                 'answer3' => $fastSurvey->answer3,
                 'answer4' => $fastSurvey->answer4,
                 'answer5' => $fastSurvey->answer5,
                 'result_type' => $fastSurvey->result_type,
             ];
-            if($fastSurvey->expire_on > $now) {
+            if ($fastSurvey->expire_on > $now) {
                 $owner_description['active'] = 1;
-                $owner_description['time_remaining'] =  Functions::getDateDiff($now, $fastSurvey->expire_on);
+                $owner_description['active'] = 1;
                 $owner_description['time_remaining'] =  Functions::getDateDiff($now, $fastSurvey->expire_on);
             } else {
-                if($fastSurvey->result_type == FastSurvey::RESULT_TYPE_PUBLIC) {
+                if ($fastSurvey->result_type == FastSurvey::RESULT_TYPE_PUBLIC) {
                     $owner_description['votes1'] = $fastSurvey->votes1;
                     $owner_description['votes2'] = $fastSurvey->votes2;
                     $owner_description['votes3'] = $fastSurvey->votes3;
                     $owner_description['votes4'] = $fastSurvey->votes4;
                     $owner_description['votes5'] = $fastSurvey->votes5;
+                }
                 $owner_description['active'] = 0;
                 $owner_description['time_remaining'] = 0;
+            }
             $item['owner_description'] =  $owner_description;
             $item['feed_delete_url'] = '';
         } else {
         if ($feed->file_type == Feed::FILE_TYPE_VIDEO) {
             $item['owner_file_image_preview'] = $storage->getGenericImage($path, $feed->uuid,  $feed->file_image_preview);
             $item['owner_file_video'] = $storage->getGenericFile($path, $feed->uuid,  $feed->file_name);
+        }
-        if($feed->file_type == Feed::FILE_TYPE_FAST_SURVEY) {
+        if ($feed->file_type == Feed::FILE_TYPE_FAST_SURVEY) {
             $item['comment_add_url'] = '';
             $item['comments'] = [];
         } else {
             $commentMapper = CommentMapper::getInstance($this->adapter);
             $records = $commentMapper->fetchAllPublishedByFeedId($feed->id);
             $comments = [];
             $comment_count = 0;
             foreach ($records as $record) {
                 $user = $userMapper->fetchOne($record->user_id);
                 $comment = [];
-                $comment['unique'] = uniqid();
-                $comment_count++;
+                $comment['unique'] = uniqid();
-                $comment['comment_index'] = $comment_count;
+                $comment_count++;
                 $user = $userMapper->fetchOne($record->user_id);
                 if ($user->id == $owner->user_id) {
                     $comment['user_image'] = $storage->getCompanyImage($company);
+                }
                 $comment['link_delete'] = $this->url()->fromRoute('feeds/comments/delete', ['id' => $feed->uuid, 'comment' => $record->uuid]);
                 $comment['link_answer_add'] = $this->url()->fromRoute('feeds/comments/answer', ['id' => $feed->uuid, 'comment' => $record->uuid]);
                 $comment['time_elapsed'] = Functions::timeAgo($record->added_on, $now);
                 $comment['comment'] = $record->comment;
                 $records2 = $commentMapper->fetchAllPublishedByCommentId($record->id);
                 $answers = [];
                 $contador = 0;
                 foreach ($records2 as $record2) {
                     $user = $userMapper->fetchOne($record2->user_id);
                     $answer = [];
                     $answer['unique'] = uniqid();
                     $user = $userMapper->fetchOne($record2->user_id);
                     if ($user->id == $owner->user_id) {
                         $answer['user_image'] = $storage->getCompanyImage($company);
                         $answer['user_url'] =  'https://' . $network->main_hostname . '/company/view/' . $company->uuid;
                         $answer['user_name'] = $company->name;
                     } else {
-                        $answer['user_image'] = $storage->getUserImage( $user);
+                        $answer['user_image'] = $storage->getUserImage($user);
                         $answer['user_url'] = 'https://' . $network->main_hostname . '/profile/view/' . $user->uuid;
                         $answer['user_name'] = $user->first_name . ' ' . $user->last_name;
+                    }
                     $answer['link_delete'] = $this->url()->fromRoute('feeds/comments/delete', ['id' => $feed->uuid, 'comment' => $record2->uuid]);
                     $answer['time_elapsed'] = Functions::timeAgo($record2->added_on, $now);
                     $answer['comment'] = $record2->comment;
                     $records2 = $commentMapper->fetchAllPublishedByCommentId($record2->id);
                     $contador++;
                     array_push($answers, $answer);
+                }
                 $comment['number_answers'] = $contador;
                 $comment['answers'] = $answers;
             $item = [];
             $item['unique'] = uniqid();
             $storage = Storage::getInstance($this->config, $this->adapter);
             $user = $userMapper->fetchOne($record->user_id);

Proyectos de Subversion LeadersLinked - Backend

(root)/module/LeadersLinked/src/Controller/FeedController.php – Rev 17287 → 17288