Merge remote-tracking branch 'upstream/master' into GH-6207

Author: christianbeeznest

assets/locales/lo.json

@@ -41,6 +41,7 @@ <h2>1. Requirements</h2>
       <li>zip</li>
       <li>zlib</li>
       <li>ldap</li>
+      <li>apcu (optional)</li>
       <li>redis (optional)</li>
       <li>xapian (optional)</li>
   </ul>
@@ -114,7 +115,7 @@ <h3>3.1. Software stack</h3>
 <pre>
 sudo -s
 apt update && apt -y upgrade
-apt -y install apache2 libapache2-mod-php8.3 mariadb-client mariadb-server redis-server php8.3-{bcmath,curl,exif,gd,iconv,intl,ldap,mbstring,mysql,opcache,soap,xml,zip,redis}
+apt -y install apache2 libapache2-mod-php8.3 mariadb-client mariadb-server redis-server php8.3-{apcu,bcmath,curl,exif,gd,iconv,intl,ldap,mbstring,mysql,opcache,soap,xml,zip,redis}
 a2enmod rewrite
 cd /var/www/
 mkdir chamilo
@@ -515,7 +516,7 @@ <h2>7. Xapian text indexation</h2>
   This is probably not supported for Windows setups (untested), but it should work on Linux and macOS.<br>
   To install Xapian (a requirement to use the internal search engine), follow the instructions below.<br>
   <pre>
-      sudo apt install libxapian-dev catdoc html2text unrtf ghostscript poppler-utils
+      sudo apt install libxapian-dev catdoc html2text unrtf ghostscript poppler-utils build-essential
       cd /tmp
       wget https://oligarchy.co.uk/xapian/1.4.25/xapian-bindings-1.4.25.tar.xz
       # use 1.4.25 because this matches the version of the libxapian-dev package on Ubuntu 25.04
@@ -524,7 +525,7 @@ <h2>7. Xapian text indexation</h2>
       ./configure
       make install
       cd /etc/php/8.3/mods-available
-      cat "extension=xapian.so" &gt;&gt; xapian.ini
+      echo "extension=xapian.so" &gt;&gt; xapian.ini
       cd /etc/php/8.3/apache2/conf.d
       ln -s ../../mods-available/xapian.ini 26-xapian.ini
       systemctl restart apache2

public/documentation/installation_guide.html

@@ -686,7 +686,7 @@ function ($email) {
         $form->addHtml('<div id="final_button" style="display: none">');
         $form->addLabel(
             null,
-            Display::return_message(get_lang('You confirm that you really want to subscribe to this plateform.'), 'info', false)
+            Display::return_message(get_lang('You confirm that you really want to subscribe to this platform.'), 'info', false)
         );
         $form->addButton('submit', get_lang('Register'), '', 'primary');
         $form->addHtml('</div>');
@@ -937,7 +937,7 @@ function ($email) {
 
             Display::addFlash(
                 Display::return_message(
-                    get_lang('You need confirm your account via e-mail to access the platform'),
+                    get_lang('You need to confirm your account via e-mail to access the platform'),
                     'warning'
                 )
             );

public/main/auth/registration.php

@@ -1551,11 +1551,29 @@ public static function displayTypeMenu(Exercise $objExercise)
                 // Add all other non-open question types.
                 $allTypes = self::getQuestionTypeList();
 
-                // The task explicitly mentions NOT including free-answer questions.
-                // So we only exclude FREE_ANSWER here.
+                // Exclude the classic open question types from the filter list
+                // as the system cannot provide immediate feedback on these.
                 if (isset($allTypes[FREE_ANSWER])) {
                     unset($allTypes[FREE_ANSWER]);
                 }
+                if (isset($allTypes[ORAL_EXPRESSION])) {
+                    unset($allTypes[ORAL_EXPRESSION]);
+                }
+                if (isset($allTypes[ANNOTATION])) {
+                    unset($allTypes[ANNOTATION]);
+                }
+                if (isset($allTypes[MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY])) {
+                    unset($allTypes[MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY]);
+                }
+                if (isset($allTypes[UPLOAD_ANSWER])) {
+                    unset($allTypes[UPLOAD_ANSWER]);
+                }
+                if (isset($allTypes[ANSWER_IN_OFFICE_DOC])) {
+                    unset($allTypes[ANSWER_IN_OFFICE_DOC]);
+                }
+                if (isset($allTypes[PAGE_BREAK])) {
+                    unset($allTypes[PAGE_BREAK]);
+                }
 
                 // Append remaining types, without overriding the original ones.
                 foreach ($allTypes as $typeId => $def) {

public/main/exercise/question.class.php

@@ -445,10 +445,30 @@ function confirm_your_choice() {
         // Start from all known types.
         $allTypes = $question_list;
 
-        // Exclude the classic open question type from the filter list.
+        // Exclude the classic open question types from the filter list
+        // as the system cannot provide immediate feedback on these.
         if (isset($allTypes[FREE_ANSWER])) {
             unset($allTypes[FREE_ANSWER]);
         }
+        if (isset($allTypes[ORAL_EXPRESSION])) {
+            unset($allTypes[ORAL_EXPRESSION]);
+        }
+        if (isset($allTypes[ANNOTATION])) {
+            unset($allTypes[ANNOTATION]);
+        }
+        if (isset($allTypes[MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY])) {
+            unset($allTypes[MULTIPLE_ANSWER_TRUE_FALSE_DEGREE_CERTAINTY]);
+        }
+        if (isset($allTypes[UPLOAD_ANSWER])) {
+            unset($allTypes[UPLOAD_ANSWER]);
+        }
+        if (isset($allTypes[ANSWER_IN_OFFICE_DOC])) {
+            unset($allTypes[ANSWER_IN_OFFICE_DOC]);
+        }
+        if (isset($allTypes[PAGE_BREAK])) {
+            unset($allTypes[PAGE_BREAK]);
+        }
+
 
         // Append remaining non-open types (do not override base ones).
         foreach ($allTypes as $key => $item) {

public/main/exercise/question_pool.php

@@ -714,7 +714,7 @@ public static function return_icon(
         // it checks if there is an SVG version. If so, it uses it.
         // When moving this to production, the return_icon() calls should
         // ask for the SVG version directly
-        $svgIcons = api_get_setting('icons_mode_svg');
+        $svgIcons = 'true';
         if ('true' == $svgIcons && false == $return_only_path) {
             $svgImage = substr($image, 0, -3).'svg';
             if (is_file($code_path.$theme.'svg/'.$svgImage)) {

public/main/inc/lib/display.lib.php

@@ -5598,7 +5598,7 @@ public static function sendUserConfirmationMail(User $user)
             $url .= '&s='.$sessionToRedirect;
         }
         $mailSubject = get_lang('Registration confirmation');
-        $mailBody = get_lang('To complete your platform registration you need confirm your account by clicking the following link')
+        $mailBody = get_lang('To complete your platform registration you need to confirm your account by clicking the following link')
             .PHP_EOL
             .Display::url($url, $url);
 

public/main/inc/lib/usermanager.lib.php

@@ -958,7 +958,8 @@ private function getItemsHealthCheck(): array
         // Check if dsn or email is defined :
         $mailDsn = $this->settingsManager->getSetting('mail.mailer_dsn', true);
         $mailSender = $this->settingsManager->getSetting('mail.mailer_from_email', true);
-        if ((empty($mailDsn) || 'null://null' == $mailDsn) && empty($mailSender)) {
+        $nameSender = $this->settingsManager->getSetting('mail.mailer_from_name', true);
+        if ((empty($mailDsn) || 'null://null' == $mailDsn) || empty($mailSender) || empty($nameSender)) {
             $items[] = [
                 'className' => 'item-health-check-mail-settings text-error',
                 'url' => '/admin/settings/mail',

src/CoreBundle/Controller/Admin/IndexBlocksController.php

@@ -687,11 +687,6 @@ public static function getExistingSettings(): array
                     'title' => 'Hide logout button',
                     'comment' => 'Hide the logout button. This is usually only interesting when using an external login/logout method, for example when using Single Sign On of some sort.',
                 ],
-                [
-                    'name' => 'icons_mode_svg',
-                    'title' => 'SVG icons mode',
-                    'comment' => 'By enabling this option, all icons that have an SVG version will prefer the SVG format to PNG. This will give a much better icons quality but some icons might still have some rendering size issue, and some browsers might not support it.',
-                ],
             ],
             'language' => [
                 [

src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php

@@ -113,17 +113,13 @@ public static function getPlatformLogoPath(
             }
             $themeDir = Template::getThemeDir($theme);
             $customLogoPath = $themeDir.\sprintf('images/header-logo-custom%s.png', $accessUrlId);
-
-            $svgIcons = api_get_setting('icons_mode_svg');
-            if ('true' === $svgIcons) {
-                $customLogoPathSVG = substr($customLogoPath, 0, -3).'svg';
-                if (file_exists(api_get_path(SYS_PUBLIC_PATH).\sprintf('css/%s', $customLogoPathSVG))) {
-                    if ($getSysPath) {
-                        return api_get_path(SYS_PUBLIC_PATH).\sprintf('css/%s', $customLogoPathSVG);
-                    }
-
-                    return api_get_path(WEB_CSS_PATH).$customLogoPathSVG;
+            $customLogoPathSVG = substr($customLogoPath, 0, -3).'svg';
+            if (file_exists(api_get_path(SYS_PUBLIC_PATH).\sprintf('css/%s', $customLogoPathSVG))) {
+                if ($getSysPath) {
+                    return api_get_path(SYS_PUBLIC_PATH).\sprintf('css/%s', $customLogoPathSVG);
                 }
+
+                return api_get_path(WEB_CSS_PATH).$customLogoPathSVG;
             }
             if (file_exists(api_get_path(SYS_PUBLIC_PATH).\sprintf('css/%s', $customLogoPath))) {
                 if ($getSysPath) {