Add "Illustration" entity to set the image of a resource.

config/services.yaml

@@ -24,11 +24,11 @@ parameters:
     glide_config:
         source: 'oneup_flysystem.resources_filesystem'
         cache: 'oneup_flysystem.cache_resources_filesystem'
+        #cache: 'var/cache/resource/'
 
     glide_media_filters:
         document_thumbnail_small:
-            w: 100
-            h: 100
+            w: 500
 
 services:
     # default configuration for services in *this* file
@@ -128,12 +128,12 @@ chamilo_course:
 #                model: Chamilo\CourseBundle\Entity\CCourseSetting
 #                repository: Chamilo\CourseBundle\Repository\CCourseSettingRepository
 
-doctrine_cache:
-    providers:
-        sylius_settings:
-            type: file_system
-        chamilo_settings:
-            type: file_system
+#doctrine_cache:
+#    providers:
+#        sylius_settings:
+#            type: file_system
+#        chamilo_settings:
+#            type: file_system
 
 gregwar_captcha:
     width: 200

main/auth/courses_categories.php

@@ -1,6 +1,8 @@
 <?php
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Framework\Container;
+
 /**
  * View (MVC patter) for courses categories.
  *
@@ -8,6 +10,7 @@
  *
  * @package chamilo.auth
  */
+
 if (isset($_REQUEST['action']) && Security::remove_XSS($_REQUEST['action']) !== 'subscribe') {
     $stok = Security::get_token();
 } else {
@@ -306,27 +309,29 @@ function getOptionSelect($categories, $codeType)
  *
  * @return string HTML string
  */
-function returnThumbnail($course, $registeredUser)
+function returnThumbnail($course)
 {
     $html = '';
     $title = cut($course['title'], 70);
     //$linkCourse = api_get_course_url($course['code']);
     $linkCourse = api_get_path(WEB_PATH).'course/'.$course['real_id'].'/about';
-    // course path
-    $course_path = api_get_path(SYS_COURSE_PATH).$course['directory'];
-
-    if (file_exists($course_path.'/course-pic.png')) {
-        // redimensioned image 85x85
-        $courseMediumImage = api_get_path(WEB_COURSE_PATH).$course['directory'].'/course-pic.png';
-    } else {
-        // without picture
-        $courseMediumImage = Display::return_icon(
-            'session_default.png',
-            null,
-            null,
-            null,
-            null,
-            true
+    $courseEntity = api_get_course_entity($course['real_id']);
+    //$courseMediumImage = api_get_path(WEB_COURSE_PATH).$course['directory'].'/course-pic.png';
+    $courseMediumImage = Display::return_icon(
+        'session_default.png',
+        null,
+        null,
+        null,
+        null,
+        true,
+        true
+    );
+    $repo = Container::getCourseRepository();
+    $illustration = $repo->getIllustration($courseEntity);
+    if ($illustration) {
+        $courseMediumImage = Container::getRouter()->generate(
+            'core_tool_resource',
+            ['id' => $illustration->getId()]
         );
     }
 

main/create_course/add_course.php

@@ -341,16 +341,35 @@ if ($form->validate()) {
             $params['gradebook_model_id'] = isset($course_values['gradebook_model_id']) ? $course_values['gradebook_model_id'] : null;
             $params['course_template'] = isset($course_values['course_template']) ? $course_values['course_template'] : '';
 
-            include_once api_get_path(SYS_CODE_PATH).'lang/english/trad4all.inc.php';
+            /*include_once api_get_path(SYS_CODE_PATH).'lang/english/trad4all.inc.php';
             $file_to_include = api_get_path(SYS_CODE_PATH).'lang/'.$course_language.'/trad4all.inc.php';
 
             if (file_exists($file_to_include)) {
                 include $file_to_include;
-            }
+            }*/
 
             $course_info = CourseManager::create_course($params);
 
             if (!empty($course_info)) {
+                $request = Container::getRequest();
+
+                if ($request->files->has('picture')) {
+                    $uploadFile = $request->files->get('picture');
+                    $repo = Container::getCourseRepository();
+                    $em = $repo->getEntityManager();
+
+                    // @todo add in repository
+                    $course = $repo->find($course_info['real_id']);
+                    $illustration = new \Chamilo\CoreBundle\Entity\Illustration();
+                    $illustration->setName('course_picture');
+
+                    $repo->addResourceNode($illustration, api_get_user_entity(api_get_user_id()), $course);
+                    $repo->addFileToResource($illustration, $uploadFile);
+
+                    $em->persist($illustration);
+                    $em->flush();
+                }
+
                 // update course picture
                 /*$picture = $_FILES['picture'];
                 if (!empty($picture['name'])) {
@@ -364,12 +383,10 @@ if ($form->validate()) {
                 /*$resourceFile = new \Chamilo\CoreBundle\Entity\Resource\ResourceFile();
                 $resourceFile->setName('course_image')
                 $picture['tmp_name']*/
+
                 $splash = api_get_setting('course_creation_splash_screen');
                 if ($splash === 'true') {
                     $url = Container::getRouter()->generate('chamilo_core_course_welcome', ['course' =>$course_info['code']]);
-                    /*
-                    $url .= 'course_info/start.php?'.api_get_cidreq_params($course_info['code']);
-                    $url .= '&first=1';*/
                     header('Location: '.$url);
                     exit;
                 } else {

main/inc/lib/course.lib.php

@@ -92,7 +92,7 @@ class CourseManager
         $hook = Container::instantiateHook(HookCreateCourse::class);
 
         // Check portal limits
-        $accessUrlId = api_get_current_access_url_id();
+        $accessUrlId = !empty($accessUrlId) ? (int) $accessUrlId : api_get_current_access_url_id();
         $authorId = empty($authorId) ? api_get_user_id() : (int) $authorId;
 
         if (isset($_configuration[$accessUrlId]) && is_array($_configuration[$accessUrlId])) {

src/CoreBundle/Controller/ResourceController.php

@@ -12,11 +12,13 @@ use APY\DataGridBundle\Grid\Source\Entity;
 use Chamilo\CoreBundle\Component\Utils\Glide;
 use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
 use Chamilo\CoreBundle\Entity\Resource\ResourceRight;
+use Chamilo\CoreBundle\Repository\ResourceRepository;
 use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 use Chamilo\CourseBundle\Controller\CourseControllerInterface;
 use Chamilo\CourseBundle\Controller\CourseControllerTrait;
 use Chamilo\CourseBundle\Entity\CDocument;
 use Chamilo\CourseBundle\Repository\CDocumentRepository;
+use Doctrine\ORM\EntityManager;
 use FOS\RestBundle\View\View;
 use Sylius\Bundle\ResourceBundle\Event\ResourceControllerEvent;
 use Sylius\Component\Resource\Exception\UpdateHandlingException;
@@ -400,40 +402,53 @@ class ResourceController extends BaseController implements CourseControllerInter
      *
      * @param Request             $request
      * @param CDocumentRepository $documentRepo
+     * @param Glide               $glide
      *
      * @return Response
      */
-    public function showAction(
-        Request $request,
-        CDocumentRepository $documentRepo,
-        Glide $glide
-    ): Response {
-        $file = $request->get('file');
-        $type = $request->get('type');
-        // see list of filters in config/packages/liip_imagine.yaml
-        $filter = $request->get('filter');
-        $type = !empty($type) ? $type : 'show';
+    public function getResourceFileAction(Request $request, Glide $glide): Response
+    {
+        $id = $request->get('id');
+        $em = $this->getDoctrine();
+        $resourceNode = $em->getRepository('ChamiloCoreBundle:Resource\ResourceNode')->find($id);
 
-        $criteria = [
-            'path' => "/$file",
-            'course' => $this->getCourse(),
-        ];
+        return $this->showFile($resourceNode, $glide, 'show', '');
 
-        $document = $documentRepo->findOneBy($criteria);
 
-        if (null === $document) {
-            throw new NotFoundHttpException();
-        }
+        /*
+        $fs = $documentRepo->getFileSystem();
+        $stream = $fs->readStream($filePath);
+        $response = new StreamedResponse(function () use ($stream): void {
+            stream_copy_to_stream($stream, fopen('php://output', 'wb'));
+        });
+        $disposition = $response->headers->makeDisposition(
+            $forceDownload ? ResponseHeaderBag::DISPOSITION_ATTACHMENT : ResponseHeaderBag::DISPOSITION_INLINE,
+            Transliterator::transliterate($fileName)
+        );
+        $response->headers->set('Content-Disposition', $disposition);
+        $response->headers->set('Content-Type', $mimeType ?: 'application/octet-stream');
 
-        /** @var ResourceNode $resourceNode */
-        $resourceNode = $document->getResourceNode();
+        return $response;*/
+    }
+
+    /**
+     * @param ResourceNode $resourceNode
+     * @param              $glide
+     * @param              $type
+     * @param              $filter
+     *
+     * @return StreamedResponse
+     * @throws \League\Flysystem\FileNotFoundException
+     */
+    private function showFile(ResourceNode $resourceNode, $glide, $type, $filter)
+    {
+        $fs = $this-> container->get('oneup_flysystem.resources_filesystem');
 
         $this->denyAccessUnlessGranted(
             ResourceNodeVoter::VIEW,
             $resourceNode,
             'Unauthorised access to resource'
         );
-
         $resourceFile = $resourceNode->getResourceFile();
 
         if (!$resourceFile) {
@@ -444,13 +459,9 @@ class ResourceController extends BaseController implements CourseControllerInter
         $filePath = $resourceFile->getFile()->getPathname();
         $mimeType = $resourceFile->getMimeType();
 
-        //ServerFactory
-
         switch ($type) {
             case 'download':
                 $forceDownload = true;
-                //$provider = $this->get('sonata.media.pool')->getProvider($media->getProviderName());
-                //$response = $provider->getDownloadResponse($media, $format, $this->get('sonata.media.pool')->getDownloadMode($media));
                 break;
             case 'show':
             default:
@@ -465,7 +476,6 @@ class ResourceController extends BaseController implements CourseControllerInter
                 break;
         }
 
-        $fs = $documentRepo->getFileSystem();
         $stream = $fs->readStream($filePath);
         $response = new StreamedResponse(function () use ($stream): void {
             stream_copy_to_stream($stream, fopen('php://output', 'wb'));
@@ -478,39 +488,40 @@ class ResourceController extends BaseController implements CourseControllerInter
         $response->headers->set('Content-Type', $mimeType ?: 'application/octet-stream');
 
         return $response;
+    }
 
-        /*
-
-        $configuration = $this->requestConfigurationFactory->create($this->metadata, $request);
-        $this->isGrantedOr403($configuration, ResourceActions::SHOW);
-
-        $resource = $this->findOr404($configuration);
-        $resourceNode = $resource->getResourceNode();
+    /**
+     * Shows a resource.
+     *
+     * @param Request             $request
+     * @param CDocumentRepository $documentRepo
+     * @param Glide               $glide
+     *
+     * @return Response
+     */
+    public function showAction(Request $request, CDocumentRepository $documentRepo, Glide $glide): Response
+    {
+        $file = $request->get('file');
+        $type = $request->get('type');
+        // see list of filters in config/services.yaml
+        $filter = $request->get('filter');
+        $type = !empty($type) ? $type : 'show';
 
-        $this->eventDispatcher->dispatch(ResourceActions::SHOW, $configuration, $resource);
+        $criteria = [
+            'path' => "/$file",
+            'course' => $this->getCourse(),
+        ];
 
-        $this->denyAccessUnlessGranted(
-            ResourceNodeVoter::VIEW,
-            $resourceNode,
-            'Unauthorised access to resource'
-        );
+        $document = $documentRepo->findOneBy($criteria);
 
-        $view = View::create($resource);
-
-        if ($configuration->isHtmlRequest()) {
-            $view
-                ->setTemplate($configuration->getTemplate(ResourceActions::SHOW.'.html'))
-                ->setTemplateVar($this->metadata->getName())
-                ->setData([
-                    'configuration' => $configuration,
-                    'metadata' => $this->metadata,
-                    'resource' => $resource,
-                    $this->metadata->getName() => $resource,
-                ])
-            ;
+        if (null === $document) {
+            throw new NotFoundHttpException();
         }
 
-        return $this->viewHandler->handle($configuration, $view);*/
+        /** @var ResourceNode $resourceNode */
+        $resourceNode = $document->getResourceNode();
+
+        return $this->showFile($resourceNode, $glide, $type, $filter);
     }
 
     /**

src/CoreBundle/Controller/ResourceDownloadController.php

@@ -18,8 +18,6 @@ use Symfony\Component\Routing\Annotation\Route;
  * @author Julio Montoya <gugli100@gmail.com>.
  *
  * @Route("/resource")
- *
- * @package Chamilo\CoreBundle\Controller
  */
 class ResourceDownloadController extends BaseController
 {

src/CoreBundle/Entity/CourseRelUserCatalogue.php

@@ -43,9 +43,9 @@ class CourseRelUserCatalogue
     protected $course;
 
     /**
-     * @var bool
+     * @var int
      *
-     * @ORM\Column(name="visible", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Column(name="visible", type="integer", nullable=false, unique=false)
      */
     protected $visible;
 

src/CoreBundle/Entity/Illustration.php

@@ -0,0 +1,102 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Entity;
+
+use Chamilo\CoreBundle\Entity\Resource\AbstractResource;
+use Chamilo\CoreBundle\Entity\Resource\ResourceInterface;
+use Doctrine\ORM\Mapping as ORM;
+use Gedmo\Timestampable\Traits\TimestampableEntity;
+
+/**
+ * Illustration.
+ *
+ * @ORM\Table(name="illustration")
+ * @ORM\Entity
+ */
+class Illustration extends AbstractResource implements ResourceInterface
+{
+    use TimestampableEntity;
+
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="name", type="string", length=255, nullable=false)
+     */
+    protected $name;
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @param int $id
+     *
+     * @return Illustration
+     */
+    public function setId(int $id): Illustration
+    {
+        $this->id = $id;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return Illustration
+     */
+    public function setName(string $name): Illustration
+    {
+        $this->name = $name;
+
+        return $this;
+    }
+
+    /**
+     * Resource identifier.
+     *
+     * @return int
+     */
+    public function getResourceIdentifier(): int
+    {
+        return $this->getId();
+    }
+
+    /**
+     * @return string
+     */
+    public function getResourceName(): string
+    {
+        return $this->getName();
+    }
+
+    /**
+     * @return string
+     */
+    public function getToolName(): string
+    {
+        return 'Illustration';
+    }
+}

src/CoreBundle/Entity/Resource/AbstractResource.php

@@ -24,15 +24,6 @@ abstract class AbstractResource implements ResourceInterface
      */
     abstract public function getResourceName(): string;
 
-    /**
-     * ORM\PreUpdate()
-     *
-     * @param LifecycleEventArgs $args
-     */
-    /*public function preUpdate(LifecycleEventArgs $args): void
-    {
-    }*/
-
     /**
      * @ORM\PostUpdate()
      *

src/CoreBundle/Framework/Container.php

@@ -191,16 +191,6 @@ class Container
         return self::$container->get('chamilo_core.html_editor');
     }
 
-    /**
-     * @deprecated
-     *
-     * @return \Symfony\Bundle\FrameworkBundle\Routing\Router
-     */
-    public static function getUrlGenerator()
-    {
-        return self::$container->get('router.default');
-    }
-
     /**
      * @return object|Request
      */

src/CoreBundle/Repository/ResourceRepository.php

@@ -5,6 +5,7 @@ namespace Chamilo\CoreBundle\Repository;
 
 use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\CoreBundle\Entity\Resource\AbstractResource;
+use Chamilo\CoreBundle\Entity\Resource\ResourceFile;
 use Chamilo\CoreBundle\Entity\Resource\ResourceLink;
 use Chamilo\CoreBundle\Entity\Resource\ResourceNode;
 use Chamilo\CoreBundle\Entity\Resource\ResourceRight;
@@ -14,11 +15,13 @@ use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter;
 use Chamilo\CourseBundle\Entity\CGroupInfo;
 use Chamilo\UserBundle\Entity\User;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Query\Expr\Join;
 use League\Flysystem\FilesystemInterface;
 use League\Flysystem\MountManager;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Class ResourceRepository.
@@ -57,8 +60,8 @@ class ResourceRepository extends EntityRepository
     public function __construct(EntityManager $entityManager, MountManager $mountManager, string $className)
     {
         $this->repository = $entityManager->getRepository($className);
+        // Flysystem mount name is saved in config/packages/oneup_flysystem.yaml
         $this->fs = $mountManager->getFilesystem('resources_fs');
-        $this->entityManager = $entityManager;
     }
 
     /**
@@ -108,6 +111,58 @@ class ResourceRepository extends EntityRepository
         return $this->getRepository()->findOneBy($criteria, $orderBy);
     }
 
+    /**
+     * @param AbstractResource $resource
+     *
+     * @return ResourceNode|mixed
+     */
+    public function getIllustration(AbstractResource $resource)
+    {
+        $node = $resource->getResourceNode();
+        // @todo also filter by the resource type = Illustration
+        $criteria = Criteria::create()->where(
+            Criteria::expr()->eq('name', 'course_picture')
+        );
+
+        $illustration = $node->getChildren()->matching($criteria)->first();
+
+        return $illustration;
+
+        /** @var ResourceNode $illustration */
+        //$illustration = $this->getRepository()->findOneBy(['parent' => $node, 'name' => 'course_picture']);
+        var_dump($illustration);
+    }
+
+    /**
+     * @param AbstractResource $resource
+     * @param UploadedFile     $file
+     *
+     * @return ResourceFile
+     */
+    public function addFileToResource(AbstractResource $resource, UploadedFile $file)
+    {
+        $resourceNode = $resource->getResourceNode();
+
+        if (!$resourceNode) {
+            return false;
+        }
+
+        $resourceFile = $resourceNode->getResourceFile();
+        if ($resourceFile === null) {
+            $resourceFile = new ResourceFile();
+        }
+
+        $em = $this->getEntityManager();
+
+        $resourceFile->setFile($file);
+        $resourceFile->setName($resource->getResourceName());
+        $em->persist($resourceFile);
+        $resourceNode->setResourceFile($resourceFile);
+        $em->persist($resourceNode);
+        $em->flush();
+
+        return $resourceFile;
+    }
 
 
     /**

src/CoreBundle/Resources/config/tools.yml

@@ -18,7 +18,7 @@ services:
             - 'admin'
             - 'admin.png'
             - ''
-            - [AccessUrl, Course]
+            - [AccessUrl, Course, Illustration]
             - 1
         tags:
             - {name: chamilo_core.tool}

src/CourseBundle/Controller/Home/HomeController.php

@@ -81,17 +81,8 @@ class HomeController extends ToolBaseController
             }
         }
 
-        $homeView = api_get_setting('course.homepage_view');
-
-        if ($homeView == 'activity' || $homeView == 'activity_big') {
-            $blocks = $this->renderActivityView();
-        } elseif ($homeView == '2column') {
-            $result = $this->render2ColumnView();
-        } elseif ($homeView == '3column') {
-            $result = $this->render3ColumnView();
-        } elseif ($homeView == 'vertical_activity') {
-            $result = $this->renderVerticalActivityView();
-        }
+        //$homeView = api_get_setting('course.homepage_view');
+        $blocks = $this->renderActivityView();
 
         $toolList = $result['tool_list'];
 
@@ -120,35 +111,6 @@ class HomeController extends ToolBaseController
         );
     }
 
-    /**
-     * @param string $courseCode
-     * @param string $fileName
-     *
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
-     */
-    public function getFileAction($courseCode, $fileName)
-    {
-        $courseInfo = api_get_course_info($courseCode);
-        $sessionId = $this->getRequest()->get('id_session');
-
-        $docId = \DocumentManager::get_document_id($courseInfo, "/".$fileName);
-
-        $filePath = null;
-
-        if ($docId) {
-            $isVisible = \DocumentManager::is_visible_by_id($docId, $courseInfo, $sessionId, api_get_user_id());
-            $documentData = \DocumentManager::get_document_data_by_id($docId, $courseCode);
-            $filePath = $documentData['absolute_path'];
-            \Event::event_download($filePath);
-        }
-
-        if (!api_is_allowed_to_edit() && !$isVisible) {
-            $this->abort(500);
-        }
-
-        return $this->sendFile($filePath);
-    }
-
     /**
      * @Route("/show/{iconId}", methods={"GET"})
      *
@@ -585,18 +547,6 @@ class HomeController extends ToolBaseController
         return $blocks;
     }
 
-    private function render2ColumnView()
-    {
-    }
-
-    private function render3ColumnView()
-    {
-    }
-
-    private function renderVerticalActivityView()
-    {
-    }
-
     /**
      * @return array
      */

src/CourseBundle/Resources/config/routing.yml

@@ -14,6 +14,13 @@ core_tool_document:
     requirements:
         file: .+ # allow "/" in {file}
 
+core_tool_resource:
+    path: /resources/{id}
+    defaults:
+        _controller: Chamilo\CoreBundle\Controller\ResourceController::getResourceFileAction
+    requirements:
+        file: .+ # allow "/" in {file}
+
 chamilo_course_tool_intro_create:
     path: /courses/{course}/introduction/{tool}/create/
     methods: [GET, POST]