Merge remote-tracking branch 'origin/master'

Author: AngelFQC

config/authentication.dist.yaml

@@ -77,8 +77,8 @@ parameters:
                 referrals: false
                 dn_string: '{user_identifier}'
                 query_string: null
-                base_dn: 'DC=cblue,DC=be'
-                search_dn: 'CN=admin,dc=cblue,dc=be'
+                base_dn: 'DC=chamilo,DC=org'
+                search_dn: 'CN=admin,dc=chamilo,dc=org'
                 search_password: 'pass'
                 filter: null
                 uid_key: 'uid'

public/documentation/installation_guide.html

@@ -40,7 +40,7 @@ <h2>1. Requirements</h2>
       <li>xml</li>
       <li>zip</li>
       <li>zlib</li>
-      <li>ldap (optional, but mandatory in dev env)</li>
+      <li>ldap</li>
       <li>redis (optional)</li>
       <li>xapian (optional)</li>
   </ul>
@@ -96,7 +96,15 @@ <h3>2.5. Installation wizard</h3>
     <h3>2.6. Sessions and Redis</h3>
     <a id="web-install-sessions" class="anchor"></a>
       In this beta version, there are known issues with sessions not getting updated fast enough, which can be solved (temporarily) by using a Redis server. Check the command line instructions for more about this. This is a temporary situation that we expect to fix before the stable release.
-
+   
+    <h3>2.7. Clean up</h3>h3>
+    <a id="web-cleanup" class="anchor"></a>
+    As recommended by the installer's last page, make sure you change permissions on the config/ dir and the .env file, and you delete the public/main/install/ folder.
+    <pre>
+        sudo chown -R root: config/ .env
+        sudo rm -r public/main/install/
+    </pre>
+    
   <h2>3. Command line installation</h2>
   <a id="cli-install" class="anchor"></a>
 
@@ -106,7 +114,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,mbstring,mysql,opcache,soap,xml,zip,redis}
+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}
 a2enmod rewrite
 cd /var/www/
 mkdir chamilo
@@ -116,7 +124,7 @@ <h3>3.1. Software stack</h3>
 rm chamilo2.0.0-beta.1.tar.gz
 cd chamilo
 touch .env
-chown -R www-data: var .env
+chown -R www-data: var/ config/ .env
 mysql -u root -e "GRANT ALL PRIVILEGES ON chamilo.* TO chamilo@localhost IDENTIFIED BY '[choose a password here]'";
 mysql -u root -e "FLUSH PRIVILEGES;"
 mysql_secure_installation
@@ -179,7 +187,7 @@ <h3>3.3. Web server</h3>
 systemctl restart apache2</pre>
     <h3>3.4. Files permissions</h3>
     <a id="cli-install-permissions" class="anchor"></a>
-    Make sure the following files and folders are writeable by the web server. Set permissions to 0770 for example:
+    Make sure the following files and folders are writeable by the web server during the installation. Set permissions to 0770 or the owner to www-data, for example:
     <ul>
         <li>var/</li>
         <li>config/</li>
@@ -202,6 +210,14 @@ <h3>3.6. Installation wizard</h3>
     You should now be able to direct your browser to your URL (e.g. <em>[http://my.chamilo.local]</em>).<br>
     Chamilo will pick it up from there and offer the installation wizard to help guide you through the rest of the process.
 
+    <h3>3.7. Clean up</h3>h3>
+    <a id="cli-cleanup" class="anchor"></a>
+    As recommended by the installer's last page, make sure you change permissions on the config/ dir and the .env file, and you delete the public/main/install/ folder.
+    <pre>
+        sudo chown -R root: config/ .env
+        sudo rm -r public/main/install/
+    </pre>
+
   <h2>4. Command line upgrade from 1.11.*</h2>
   <a id="cli-upgrade" class="anchor"></a>
     <h3>4.1. Database</h3>
@@ -263,7 +279,7 @@ <h4>6.2.1. WampServer</h4>
         <a href="https://www.wampserver.com/">Download</a> and install WampServer (accept default options if in doubt).<br>
         Restart WampServer to make these changes effective.<br>
         Open http://localhost/ in your browser. If the WampServer welcome screen with server configuration info appears, it means WampServer is working.<br>
-        Click on the WampServer icon in your status bar and go to PHP -&gt; Extensions. Make sure all the following extensions are enabled: php_curl, php_gd, php_intl, php_mbstring, php_mysqli, php_soap, php_xml, php_zip<br>
+        Click on the WampServer icon in your status bar and go to PHP -&gt; Extensions. Make sure all the following extensions are enabled: php_curl, php_gd, php_intl, php_ldap, php_mbstring, php_mysqli, php_soap, php_xml, php_zip<br>
         Edit C:\wamp64\bin\php\php8.3\php.ini, locate ";extension=sodium" and remove the ";" from the beginning of the line.<br>
         Also, update the "memory_limit" setting from "128M" to "2048M" and a few other settings as shown below.<br>
 <pre>

public/main/admin/access_urls.php

@@ -171,7 +171,7 @@
         api_get_path(WEB_CODE_PATH).'admin/access_url_edit_course_category_to_url.php'
     );
     $actions .= Display::url(
-        Display::getMdiIcon('clipboard-account', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Assign auth sources to users')),
+        Display::getMdiIcon('clipboard-account', 'ch-tool-icon', null, ICON_SIZE_MEDIUM, get_lang('Assign auth source to users')),
         "/access-url/auth-sources"
     );
 }

public/main/admin/export_exercise_results.php

@@ -79,7 +79,7 @@ function iframe_post_message(string $message, bool $ok = false): void
 // -----------------------------------------------------------------------------
 if (isset($_GET['ajax'])) {
     if (!api_is_allowed_to_edit(null, true)) {
-        send_json(['ok' => false, 'message' => get_lang('NotAllowed')], 403);
+        send_json(['ok' => false, 'message' => get_lang('Not allowed')], 403);
     }
 
     $ajax = (string) $_GET['ajax'];
@@ -413,7 +413,7 @@ function loadExercises(sessionId, courseId) {
       '<div id=\"export-overlay\">' +
         '<div class=\"box\">' +
           '<div class=\"spinner\"></div>' +
-          '<div class=\"label\">".addslashes(get_lang('Please wait this could take a while'))."</div>' +
+          '<div class=\"label\">".addslashes(get_lang('Please wait. This could take a while...'))."</div>' +
           '<div class=\"hint\">".addslashes(get_lang('Generating file, do not close this tab'))."</div>' +
         '</div>' +
       '</div>'
@@ -579,7 +579,7 @@ function deleteCookie(name) {
 // Validation
 $form->addRule('start_date', get_lang('Invalid date'), 'datetime');
 $form->addRule('end_date', get_lang('Invalid date'), 'datetime');
-$form->addRule(['start_date','end_date'], get_lang('StartDateShouldBeBeforeEndDate'), 'date_compare', 'lte');
+$form->addRule(['start_date','end_date'], get_lang('Start date must be before the end date'), 'date_compare', 'lte');
 
 // Required (session can be 0)
 $form->addRule('selected_course', get_lang('Required field'), 'required');

public/main/admin/filler.php

@@ -129,8 +129,8 @@ class="group flex items-center justify-between rounded-xl border border-gray-25
                         <span class="font-medium text-gray-90"><?php echo get_lang('Fill users'); ?></span>
                     </div>
                     <span class="rounded-md bg-primary/10 px-2 py-1 text-xs font-medium text-primary">
-          <?php echo get_lang('Run'); ?>
-        </span>
+                    <?php echo get_lang('Proceed'); ?>
+                    </span>
                 </a>
 
                 <a href="filler.php?fill=courses"
@@ -148,8 +148,8 @@ class="group flex items-center justify-between rounded-xl border border-gray-25
                         <span class="font-medium text-gray-90"><?php echo get_lang('Fill courses'); ?></span>
                     </div>
                     <span class="rounded-md bg-secondary/10 px-2 py-1 text-xs font-medium text-secondary">
-          <?php echo get_lang('Run'); ?>
-        </span>
+                    <?php echo get_lang('Proceed'); ?>
+                    </span>
                 </a>
             </div>
         </section>

public/main/inc/lib/PortfolioNotifier.php

@@ -15,7 +15,7 @@ public static function notifyTeachersAndAuthor(PortfolioComment $comment)
         $session = $item->getSession();
 
         $messageSubject = sprintf(
-            get_lang('PortfolioAlertNewCommentSubject'),
+            get_lang('[Portfolio] New comment in post %s'),
             $item->getTitle(true)
         );
         $userIdListToSend = [];

src/CoreBundle/DataFixtures/LanguageFixtures.php

@@ -552,6 +552,14 @@ public static function getLanguages(): array
                 'format' => 'title first_name last_name',
                 'sort_by' => 'first_name',
             ],
+            [
+                'original_name' => 'ພາສາລາວ',
+                'english_name' => 'lao',
+                'isocode' => 'lo',
+                'available' => 0,
+                'format' => 'title first_name last_name',
+                'sort_by' => 'first_name',
+            ],
         ];
     }
 }

src/CoreBundle/Migrations/Schema/V200/Version20251204120000.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+/* For licensing terms, see /license.txt */
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+final class Version20251204120000 extends AbstractMigrationChamilo
+{
+    public function getDescription(): string
+    {
+        return 'Languages: insert Lao (lo) if missing.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("
+            INSERT INTO language (original_name, english_name, isocode, available)
+            SELECT 'ພາສາລາວ', 'lao', 'lo', 0
+            WHERE NOT EXISTS (SELECT 1 FROM language WHERE isocode = 'lo')
+        ");
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql("DELETE FROM language WHERE isocode = 'lo'");
+    }
+}

tests/behat/README.md

@@ -14,11 +14,10 @@ java -jar /my-dir/selenium-server-standalone-3.1.0.jar
 
 - Download the Chrome driver, unzip and copy into /usr/bin
 
-Check the latest version at https://sites.google.com/a/chromium.org/chromedriver/downloads,
-then adapt the following command to the latest version. Use a version that matches your version of the Chrome browser.
+Check the latest `chromedriver` version at [https://googlechromelabs.github.io/chrome-for-testing/](https://googlechromelabs.github.io/chrome-for-testing/) that matches your configuration (linux64 for Ubuntu), then adapt the following command to the latest version. Use a version that matches your version of the Chrome browser.
 
 ```
-cd /tmp && wget https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip && unzip chromedriver_linux64.zip && sudo mv chromedriver /usr/local/bin
+cd /tmp && wget https://storage.googleapis.com/chrome-for-testing-public/143.0.7499.40/linux64/chromedriver-linux64.zip && unzip chromedriver_linux64.zip && sudo mv chromedriver /usr/local/bin
 ```
 
 ### Chamilo configuration