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

Author: ywarnier

.env.dist

@@ -43,20 +43,7 @@ APP_ENABLE_API_ENTRYPOINT=false
 ###< chamilo ###
 
 ###> symfony/mailer ###
-MAILER='{{MAILER}}'
-SMTP_HOST='{{SMTP_HOST}}'
-SMTP_PORT='{{SMTP_PORT}}'
-SMTP_AUTH='{{SMTP_AUTH}}'
-SMTP_USER='{{SMTP_USER}}'
-SMTP_PASS='{{SMTP_PASS}}'
-SMTP_SECURE='{{SMTP_SECURE}}'
-SMTP_CHARSET='{{SMTP_CHARSET}}'
-SMTP_UNIQUE_REPLY_TO='{{SMTP_UNIQUE_REPLY_TO}}'
-SMTP_DEBUG='{{SMTP_DEBUG}}'
-
-MAILER_DSN='{{MAILER_DSN}}'
-MAILER_FROM_EMAIL='{{MAILER_FROM_EMAIL}}'
-MAILER_FROM_NAME='{{MAILER_FROM_NAME}}'
+# MAILER_DSN='null://null'
 ###< symfony/mailer ###
 
 ###> nelmio/cors-bundle ###
@@ -86,3 +73,49 @@ THEME_FALLBACK='{{THEME_FALLBACK}}'
 PACKAGER='{{PACKAGER}}'
 DEFAULT_TEMPLATE='{{DEFAULT_TEMPLATE}}'
 ADMIN_CHAMILO_ANNOUNCEMENTS_DISABLE='{{ADMIN_CHAMILO_ANNOUNCEMENTS_DISABLE}}'
+
+###> azure blob storage as filesystem ###
+# AZURE_STORAGE_CONNECTION_STRING='DefaultEndpointsProtocol=https;AccountName=azurechamilo;AccountKey=ACCOUNTKEY==;EndpointSuffix=core.windows.net'
+# AZURE_STORAGE_ASSET_CONTAINER='asset-container-name'
+# AZURE_STORAGE_ASSET_PREFIX='optional/prefix'
+# AZURE_STORAGE_ASSET_CACHE_CONTAINER='asset-cache-container-name'
+# AZURE_STORAGE_ASSET_CACHE_PREFIX='optional/prefix'
+# AZURE_STORAGE_RESOURCE_CONTAINER='resources-container-name'
+# AZURE_STORAGE_RESOURCE_PREFIX='optional/prefix'
+# AZURE_STORAGE_RESOURCE_CACHE_CONTAINER='resources-cache-container-name'
+# AZURE_STORAGE_RESOURCE_CACHE_PREFIX='optional/prefix'
+# AZURE_STORAGE_THEMES_CONTAINER='themes-container-name'
+# AZURE_STORAGE_THEMES_PREFIX='optional/prefix'
+###< azure blob storage as filesystem ###
+
+###> aws s3 storage as filesystem ###
+# AWS_S3_STORAGE_VERSION='latest'
+# AWS_S3_STORAGE_REGION='region-id' # 'eu-central-1' for example
+# AWS_S3_STORAGE_ACCESS_KEY='s3-key'
+# AWS_S3_STORAGE_ACCESS_SECRET='s3-secret'
+# AWS_S3_STORAGE_ASSET_BUCKET='assets-bucket-name'
+# AWS_S3_STORAGE_ASSET_PREFIX='path/prefix' # Optional path prefix, you can set empty string
+# AWS_S3_STORAGE_ASSET_CACHE_BUCKET='asset-cache-bucket-name'
+# AWS_S3_STORAGE_ASSET_CACHE_PREFIX='path/prefix' # Optional path prefix, you can set empty string
+# AWS_S3_STORAGE_RESOURCE_BUCKET='resources-bucket-name'
+# AWS_S3_STORAGE_RESOURCE_PREFIX='path/prefix' # Optional path prefix, you can set empty string
+# AWS_S3_STORAGE_RESOURCE_CACHE_BUCKET='resource-cache-bucket-name'
+# 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 as filesystem ###
+
+###> google cloud storage as filesystem ###
+# GOOGLE_STORAGE_CLOUD_PROJECT_ID=''
+# GOOGLE_STORAGE_KEY_FILE_PATH=%kernel.project_dir%/config/storage_keys/project-id-12345678.json
+# GOOGLE_STORAGE_ASSET_BUCKET='assets-bucket-name'
+# GOOGLE_STORAGE_ASSET_PREFIX=''
+# GOOGLE_STORAGE_ASSET_CACHE_BUCKET='assets-cache-bucket-name'
+# GOOGLE_STORAGE_ASSET_CACHE_PREFIX=''
+# GOOGLE_STORAGE_RESOURCE_BUCKET='resources-bucket-name'
+# GOOGLE_STORAGE_RESOURCE_PREFIX=''
+# GOOGLE_STORAGE_RESOURCE_CACHE_BUCKET='resources-cache-bucket-name'
+# GOOGLE_STORAGE_RESOURCE_CACHE_PREFIX=''
+# GOOGLE_STORAGE_THEMES_BUCKET='themes-bucket-name'
+# GOOGLE_STORAGE_THEMES_PREFIX=''
+###< google cloud storage as filesystem ###

.github/workflows/behat.yml

@@ -154,7 +154,6 @@ jobs:
                   cd ..
                   sed -i "s/APP_ENV='dev'/APP_ENV='prod'/g" .env
                   sed -i "s/APP_DEBUG='1'/APP_DEBUG='0'/g" .env
-                  sed -i "s/MAILER_DSN=sendmail:\/\/default/MAILER_DSN=null:\/\/null/g" .env
                   sudo php bin/console cache:clear
                   sudo chmod -R 777 var public
 

assets/vue/AppInstaller.vue

@@ -210,63 +210,18 @@
         />
 
         <input
-          v-model="installerData.stepData.fromEmail"
-          name="fromEmail"
+          v-model="installerData.stepData.mailerFromEmail"
+          name="mailerFromEmail"
           type="hidden"
         />
         <input
-          v-model="installerData.stepData.fromName"
-          name="fromName"
+          v-model="installerData.stepData.mailerFromName"
+          name="mailerFromName"
           type="hidden"
         />
         <input
-          v-model="installerData.stepData.mailer"
-          name="mailer"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpHost"
-          name="smtpHost"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpPort"
-          name="smtpPort"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpAuth"
-          name="smtpAuth"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpSecure"
-          name="smtpSecure"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpUniqueReplyTo"
-          name="smtpUniqueReplyTo"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpCharset"
-          name="smtpCharset"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpDebug"
-          name="smtpDebug"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpUser"
-          name="smtpUser"
-          type="hidden"
-        />
-        <input
-          v-model="installerData.stepData.smtpPass"
-          name="smtpPass"
+          v-model="installerData.stepData.mailerDsn"
+          name="mailerDsn"
           type="hidden"
         />
 
@@ -310,18 +265,9 @@ const installerData = ref(window.installerData)
 
 if (!installerData.value.stepData) {
   installerData.value.stepData = {
-    fromEmail: "",
-    fromName: "",
-    mailer: "",
-    smtpHost: "",
-    smtpPort: "",
-    smtpAuth: "",
-    smtpUser: "",
-    smtpPass: "",
-    smtpSecure: "",
-    smtpCharset: "",
-    smtpUniqueReplyTo: "",
-    smtpDebug: "",
+    mailerFromEmail: "",
+    mailerFromName: "",
+    mailerDsn: "",
   }
 }
 

assets/vue/components/course/NextCourseSequence.vue

@@ -26,12 +26,17 @@
 
             <p class="mt-2 text-sm font-semibold">
               <span
+                v-if="course.status"
                 @click="goToCourse(course.id)"
-                :class="
-                  course.status
-                    ? 'text-green-700 cursor-pointer hover:underline'
-                    : 'text-red-700 cursor-pointer hover:underline'
-                "
+                class="text-green-700 cursor-pointer hover:underline"
+              >
+                {{ course.name }}
+              </span>
+
+              <span
+                v-else
+                class="text-red-700 cursor-not-allowed opacity-60"
+                :title="t('Course is locked due to prerequisites')"
               >
                 {{ course.name }}
               </span>

assets/vue/components/course/ShortCutList.vue

@@ -2,16 +2,26 @@
   <div class="course-tool">
     <BaseAppLink
       :url="url"
+      :target="props.shortcut.target || '_self'"
+      rel="noopener"
       class="course-tool__link"
     >
       <img
+        v-if="shortcut.customImageUrl"
         :alt="shortcut.title"
-        :src="shortcut.customImageUrl || `/img/tools/${shortcut.type}.png`"
+        :src="shortcut.customImageUrl"
         class="course-tool__icon"
       />
+      <i
+        v-else
+        class="mdi-file-link bg-gradient-to-b from-gray-50 to-gray-25 course-tool__icon mdi"
+        :title="shortcut.title"
+      ></i>
     </BaseAppLink>
     <BaseAppLink
       :url="url"
+      :target="props.shortcut.target || '_self'"
+      rel="noopener"
       class="course-tool__title"
     >
       {{ shortcut.title }}