Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

.env.dist

@@ -82,6 +82,8 @@ ADMIN_CHAMILO_ANNOUNCEMENTS_DISABLE='{{ADMIN_CHAMILO_ANNOUNCEMENTS_DISABLE}}'
 # AZURE_STORAGE_RESOURCE_CACHE_PREFIX='optional/prefix'
 # AZURE_STORAGE_THEMES_CONTAINER='themes-container-name'
 # AZURE_STORAGE_THEMES_PREFIX='optional/prefix'
+# AZURE_STORAGE_PLUGINS_CONTAINER='plugins-container-name'
+# AZURE_STORAGE_PLUGINS_PREFIX='optional/prefix'
 ###< azure blob storage as filesystem ###
 
 ###> aws s3 storage as filesystem ###
@@ -99,6 +101,8 @@ ADMIN_CHAMILO_ANNOUNCEMENTS_DISABLE='{{ADMIN_CHAMILO_ANNOUNCEMENTS_DISABLE}}'
 # AWS_S3_STORAGE_RESOURCE_CACHE_PREFIX='path/prefix' # Optional path prefix, you can set empty string
 # AWS_S3_STORAGE_THEMES_BUCKET='themes-bucket-name'
 # AWS_S3_STORAGE_THEMES_PREFIX='path/prefix' # Optional path prefix, you can set empty string
+# AWS_S3_STORAGE_PLUGINS_BUCKET='plugins-bucket-name'
+# AWS_S3_STORAGE_PLUGINS_PREFIX='path/prefix' # Optional path prefix, you can set empty string
 ###< aws s3 storage as filesystem ###
 
 ###> google cloud storage as filesystem ###
@@ -114,6 +118,8 @@ ADMIN_CHAMILO_ANNOUNCEMENTS_DISABLE='{{ADMIN_CHAMILO_ANNOUNCEMENTS_DISABLE}}'
 # GOOGLE_STORAGE_RESOURCE_CACHE_PREFIX=''
 # GOOGLE_STORAGE_THEMES_BUCKET='themes-bucket-name'
 # GOOGLE_STORAGE_THEMES_PREFIX=''
+# GOOGLE_STORAGE_PLUGINS_BUCKET='plugins-bucket-name'
+# GOOGLE_STORAGE_PLUGINS_PREFIX=''
 ###< google cloud storage as filesystem ###
 
 ###> SCIM (System for Cross-domain Identity Management) ###

config/packages/oneup_flysystem.yaml

@@ -113,6 +113,29 @@ oneup_flysystem:
                 bucket: '%env(GOOGLE_STORAGE_THEMES_BUCKET)%'
                 prefix: '%env(GOOGLE_STORAGE_THEMES_PREFIX)%'
 
+        plugins_adapter:
+            local:
+                location: '%kernel.project_dir%/var/upload/plugins'
+
+        plugins_azure_adapter:
+            azureblob:
+                client: 'MicrosoftAzure\Storage\Blob\BlobRestProxy'
+                container: '%env(AZURE_STORAGE_PLUGINS_CONTAINER)%'
+                prefix: '%env(AZURE_STORAGE_PLUGINS_PREFIX)%'
+
+        plugins_awss3_adapter:
+            awss3v3:
+                client: chamilo.storage.awss3_client
+                bucket: '%env(AWS_S3_STORAGE_PLUGINS_BUCKET)%'
+                prefix: '%env(AWS_S3_STORAGE_PLUGINS_PREFIX)%'
+                visibilityConverter: League\Flysystem\AwsS3V3\PortableVisibilityConverter
+
+        plugins_google_adapter:
+            googlecloudstorage:
+                client: 'Google\Cloud\Storage\StorageClient'
+                bucket: '%env(GOOGLE_STORAGE_PLUGINS_BUCKET)%'
+                prefix: '%env(GOOGLE_STORAGE_PLUGINS_PREFIX)%'
+
     filesystems:
         asset:
             adapter: asset_adapter
@@ -133,3 +156,8 @@ oneup_flysystem:
         themes:
             adapter: themes_adapter
             mount: themes
+
+        plugins:
+            adapter: plugins_adapter
+            mount: plugins
+            visibility: private

public/plugin/ExerciseFocused/src/ExerciseFocusedPlugin.php

@@ -69,11 +69,11 @@ public function install(): void
         $objField = new ExtraField('exercise');
         $objField->save([
             'variable' => self::FIELD_SELECTED,
-            'field_type' => ExtraField::FIELD_TYPE_CHECKBOX,
+            'value_type' => ExtraField::FIELD_TYPE_CHECKBOX,
             'display_text' => $this->get_title(),
             'visible_to_self' => true,
             'changeable' => true,
-            'filter' => false,
+            'filter' => 0,
         ]);
     }
 

public/plugin/ExerciseMonitoring/src/ExerciseMonitoringPlugin.php

@@ -2,10 +2,11 @@
 
 /* For licensing terms, see /license.txt */
 
+use Chamilo\CoreBundle\Framework\Container;
 use Chamilo\PluginBundle\ExerciseMonitoring\Entity\Log;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\ORM\Tools\ToolsException;
-use Symfony\Component\Filesystem\Filesystem;
+use League\Flysystem\FilesystemOperator;
 
 class ExerciseMonitoringPlugin extends Plugin
 {
@@ -70,22 +71,21 @@ public function install(): void
             ]
         );
 
-        $pluginDirName = api_get_path(SYS_UPLOAD_PATH).'plugins/ExerciseMonitoring';
+        /** @var FilesystemOperator $fs */
+        $fs = Container::$container->get('oneup_flysystem.plugins_filesystem');
 
-        $fs = new Filesystem();
-        $fs->mkdir(
-            $pluginDirName,
-            api_get_permissions_for_new_directories()
-        );
+        if (!$fs->directoryExists('ExerciseMonitoring')) {
+            $fs->createDirectory('ExerciseMonitoring');
+        }
 
         $objField = new ExtraField('exercise');
         $objField->save([
             'variable' => self::FIELD_SELECTED,
-            'field_type' => ExtraField::FIELD_TYPE_CHECKBOX,
+            'value_type' => ExtraField::FIELD_TYPE_CHECKBOX,
             'display_text' => $this->get_title(),
             'visible_to_self' => true,
             'changeable' => true,
-            'filter' => false,
+            'filter' => 0,
         ]);
     }
 

src/CoreBundle/DependencyInjection/Compiler/PluginEntityPass.php

@@ -23,6 +23,11 @@ public function process(ContainerBuilder $container): void
 
         foreach ($entityDirs as $dir) {
             $pluginTitle = basename(\dirname($dir));
+
+            if ('src' === $pluginTitle) {
+                $pluginTitle = basename(\dirname($dir, 2));
+            }
+
             $namespace = "Chamilo\\PluginBundle\\$pluginTitle";
 
             $driverReference = new Reference('doctrine.orm.default_attribute_metadata_driver');

src/CoreBundle/Helpers/PluginEntityLoaderHelper.php

@@ -17,7 +17,7 @@ public function __construct(
     public function getEntityDirectories(): array
     {
         $finder = new Finder();
-        $finder->directories()->in($this->pluginDir)->name('Entity')->depth('== 1');
+        $finder->directories()->in($this->pluginDir)->name('Entity')->depth('<= 2');
 
         $directories = [];
         foreach ($finder as $dir) {