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

Author: AngelFQC

public/documentation/installation_guide.html

@@ -516,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 build-essential
+ sudo apt install libxapian-dev catdoc html2text unrtf ghostscript poppler-utils build-essential php-dev
  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

public/main/cron/user_import/resend_email_with_new_password.php

@@ -69,10 +69,10 @@
  null,
  PERSON_NAME_EMAIL_ADDRESS
  );
- $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('Your registration on').' '.api_get_setting('siteName');
- $emailbody = sprintf(get_lang('Dear %s,'), api_get_person_name($user['FirstName'], $user['LastName']))."\n\n".get_lang('You are registered to')." ".api_get_setting('siteName')." ".get_lang('with the following settings:')."\n\n".get_lang('Username')." : ".$user['UserName']."\n".get_lang('Password')." : ".$user['Password']."\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('is')." : ".api_get_path(WEB_PATH)." \n\n".get_lang('In case of trouble, contact us.')."\n\n".get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Administrator')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('E-mail')." : ".api_get_setting('emailAdministrator');
- $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
- $email_admin = api_get_setting('emailAdministrator');
+ $emailsubject = '['.api_get_setting('site_name').'] '.sprintf(get_lang('Your registration on %s'), api_get_setting('site_name'));
+ $emailbody = sprintf(get_lang('Dear %s,'), api_get_person_name($user['FirstName'], $user['LastName']))."\n\n".get_lang('You are registered to')." ".api_get_setting('site_name')." ".get_lang('with the following settings:')."\n\n".get_lang('Username')." : ".$user['UserName']."\n".get_lang('Password')." : ".$user['Password']."\n\n".get_lang('Address')." ".api_get_setting('site_name')." ".get_lang('is')." : ".api_get_path(WEB_PATH)." \n\n".get_lang('In case of trouble, contact us.')."\n\n".get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administrator_name'), api_get_setting('administrator_surname'))."\n".get_lang('Administrator')." ".api_get_setting('site_name')."\nT. ".api_get_setting('administrator_phone')."\n".get_lang('E-mail')." : ".api_get_setting('administrator_email');
+ $sender_name = api_get_person_name(api_get_setting('administrator_name'), api_get_setting('administrator_surname'), null, PERSON_NAME_EMAIL_ADDRESS);
+ $email_admin = api_get_setting('administrator_email');
  @api_mail_html(
  $recipient_name,
  $user['Email'],

public/main/inc/ajax/user_manager.ajax.php

@@ -206,7 +206,7 @@
  PERSON_NAME_EMAIL_ADDRESS
  );
 
- $subject = '['.api_get_setting('siteName').'] '.get_lang('Your registration on').' '.api_get_setting('siteName');
+ $subject = '['.api_get_setting('siteName').'] '.sprintf(get_lang('Your registration on %s'), api_get_setting('site_name'));
  $emailAdmin = api_get_setting('emailAdministrator');
  $sender_name = api_get_person_name(
  api_get_setting('administratorName'),

public/main/inc/lib/document.lib.php

@@ -3263,6 +3263,9 @@ public static function addDocument(
 
  // Document already exists
  if (null !== $document) {
+ // Keep the contextual tree consistent: set ResourceLink.parent when needed.
+ self::syncResourceLinkParentForContext($document, $parentResource, $courseEntity, $session, $group);
+
  return $document;
  }
 
@@ -3281,6 +3284,9 @@ public static function addDocument(
  $em->persist($document);
  $em->flush();
 
+ // Ensure contextual hierarchy (course/session/group) uses ResourceLink.parent.
+ self::syncResourceLinkParentForContext($document, $parentResource, $courseEntity, $session, $group);
+
  $repo = Container::getDocumentRepository();
  if (!empty($content)) {
  $repo->addFileFromString($document, $title, 'text/html', $content, true);
@@ -3318,4 +3324,108 @@ public static function addDocument(
 
  return false;
  }
+
+ private static function syncResourceLinkParentForContext(
+ CDocument $child,
+ $parentResource,
+ $courseEntity,
+ $session,
+ $group
+ ): void {
+ // Only set a parent link when the parent is another document (folder).
+ if (!$parentResource instanceof CDocument) {
+ return; // Root items must keep rl.parent = NULL
+ }
+
+ if (!method_exists($child, 'getResourceNode') || !method_exists($parentResource, 'getResourceNode')) {
+ return;
+ }
+
+ $childNode = $child->getResourceNode();
+ $parentNode = $parentResource->getResourceNode();
+
+ if (!$childNode instanceof ResourceNode || !$parentNode instanceof ResourceNode) {
+ return;
+ }
+
+ try {
+ $em = Database::getManager();
+
+ $childLink = self::findResourceLinkForContext($em, $childNode, $courseEntity, $session, $group);
+ $parentLink = self::findResourceLinkForContext($em, $parentNode, $courseEntity, $session, $group);
+
+ if (!$childLink instanceof ResourceLink || !$parentLink instanceof ResourceLink) {
+ // If a link is missing, we don't hard-fail the import.
+ error_log('[IMPORT] ResourceLink not found for context when syncing parent.', [
+ 'childNodeId' => method_exists($childNode, 'getId') ? $childNode->getId() : null,
+ 'parentNodeId' => method_exists($parentNode, 'getId') ? $parentNode->getId() : null,
+ ]);
+
+ return;
+ }
+
+ $currentParent = method_exists($childLink, 'getParent') ? $childLink->getParent() : null;
+
+ // Avoid useless flushes
+ if ($currentParent && method_exists($currentParent, 'getId') && method_exists($parentLink, 'getId')) {
+ if ((int) $currentParent->getId() === (int) $parentLink->getId()) {
+ return;
+ }
+ }
+
+ $childLink->setParent($parentLink);
+ $em->persist($childLink);
+ $em->flush();
+ } catch (\Throwable $e) {
+ error_log('[IMPORT] Failed to sync ResourceLink.parent for context: '.$e->getMessage());
+ }
+ }
+
+ private static function findResourceLinkForContext(
+ $em,
+ ResourceNode $node,
+ $courseEntity,
+ $session,
+ $group
+ ): ?ResourceLink {
+ try {
+ $qb = $em->createQueryBuilder()
+ ->select('rl')
+ ->from(ResourceLink::class, 'rl')
+ ->andWhere('rl.resourceNode = :node')
+ ->setParameter('node', $node);
+
+ // Course context
+ if ($courseEntity) {
+ $qb->andWhere('rl.course = :course')->setParameter('course', $courseEntity);
+ } else {
+ $qb->andWhere('rl.course IS NULL');
+ }
+
+ // Session context
+ if ($session) {
+ $qb->andWhere('rl.session = :session')->setParameter('session', $session);
+ } else {
+ $qb->andWhere('rl.session IS NULL');
+ }
+
+ // Group context
+ if ($group) {
+ $qb->andWhere('rl.group = :group')->setParameter('group', $group);
+ } else {
+ $qb->andWhere('rl.group IS NULL');
+ }
+
+ $qb->setMaxResults(1);
+
+ /** @var ResourceLink|null $link */
+ $link = $qb->getQuery()->getOneOrNullResult();
+
+ return $link;
+ } catch (\Throwable $e) {
+ error_log('[IMPORT] Failed to find ResourceLink for context: '.$e->getMessage());
+
+ return null;
+ }
+ }
 }

public/main/inc/lib/myspace.lib.php

@@ -3015,17 +3015,17 @@ function (array &$user) {
  $addedto = '';
  if ($sendMail) {
  foreach ($users as $index => $user) {
- $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('Your registration on').' '.api_get_setting('siteName');
+ $emailsubject = '['.api_get_setting('site_name').'] '.sprintf(get_lang('Your registration on %s'), api_get_setting('site_name'));
  $emailbody = get_lang('Dear').' '.
  api_get_person_name($user['First name'], $user['Last name']).",\n\n".
- get_lang('You are registered to')." ".api_get_setting('siteName')." ".get_lang('with the following settings:')."\n\n".
+ get_lang('You are registered to')." ".api_get_setting('site_name')." ".get_lang('with the following settings:')."\n\n".
  get_lang('Username')." : $user[UserName]\n".
  get_lang('Pass')." : $user[Password]\n\n".
- get_lang('The address of')." ".api_get_setting('siteName')." ".get_lang('is')." : ".api_get_path(WEB_PATH)." \n\n".
+ get_lang('The address of')." ".api_get_setting('site_name')." ".get_lang('is')." : ".api_get_path(WEB_PATH)." \n\n".
  get_lang('In case of trouble, contact us.')."\n\n".
  get_lang('Sincerely').",\n\n".
  api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".
- get_lang('Administrator')." ".api_get_setting('siteName')."\nT. ".
+ get_lang('Administrator')." ".api_get_setting('site_name')."\nT. ".
  api_get_setting('administratorTelephone')."\n".get_lang('E-mail')." : ".api_get_setting('emailAdministrator');
 
  api_mail_html(

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

@@ -1175,7 +1175,7 @@ public static function update_user(
 
  if (!empty($email) && $send_email) {
  $recipient_name = api_get_person_name($firstname, $lastname, null, PERSON_NAME_EMAIL_ADDRESS);
- $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('Your registration on').' '.api_get_setting('siteName');
+ $emailsubject = '['.api_get_setting('site_name').'] '.sprintf(get_lang('Your registration on %s'), api_get_setting('site_name'));
  $sender_name = api_get_person_name(
  api_get_setting('administratorName'),
  api_get_setting('administratorSurname'),

public/main/install/index.php

@@ -70,6 +70,58 @@
 Container::$session = new HttpSession();
 
 require_once 'install.lib.php';
+
+$envFile = api_get_path(SYMFONY_SYS_PATH).'.env';
+$versionInfo = require __DIR__.'/version.php';
+$installerVersion = $versionInfo['new_version'] ?? null;
+
+if (file_exists($envFile)) {
+ $dotenv = new Dotenv();
+ try {
+ // Load .env without crashing if incomplete
+ $dotenv->loadEnv($envFile);
+ } catch (\Throwable $e) {
+ // Ignore and let the wizard continue
+ }
+
+ $appInstalled = (($_ENV['APP_INSTALLED'] ?? getenv('APP_INSTALLED') ?? '') === '1');
+
+ if ($appInstalled) {
+ // Try to read DB version; fail soft if DB is unreachable
+ $dbVersion = null;
+ try {
+ $dbHost = $_ENV['DATABASE_HOST'] ?? 'localhost';
+ $dbUser = $_ENV['DATABASE_USER'] ?? '';
+ $dbPass = $_ENV['DATABASE_PASSWORD'] ?? '';
+ $dbName = $_ENV['DATABASE_NAME'] ?? '';
+ $dbPort = (int) ($_ENV['DATABASE_PORT'] ?? 3306);
+
+ connectToDatabase($dbHost, $dbUser, $dbPass, $dbName, $dbPort);
+ $dbVersion = get_config_param_from_db('chamilo_database_version');
+ } catch (\Throwable $e) {
+ // Leave $dbVersion as null
+ }
+
+ // If DB version is >= installer version, block the wizard
+ if ($installerVersion && $dbVersion && version_compare($dbVersion, $installerVersion, '>=')) {
+ header('HTTP/1.1 409 Conflict');
+ echo '<!doctype html><meta charset="utf-8"><title>Chamilo already installed</title>';
+ echo '<div style="font-family:system-ui;max-width:760px;margin:64px auto;padding:24px;border:1px solid #e5e7eb;border-radius:12px">';
+ echo '<h1>Chamilo is already installed</h1>';
+ echo '<p>Database version: <strong>'.htmlspecialchars($dbVersion).'</strong>. '
+ .'Installer version: <strong>'.htmlspecialchars($installerVersion).'</strong>.</p>';
+ echo '<p>The install wizard is disabled because the platform is already installed and up-to-date.</p>';
+ echo '<p>If you need a fresh install, set <code>APP_INSTALLED=0</code> or remove <code>.env</code> first.</p>';
+ echo '</div>';
+ exit;
+ }
+
+ // If DB version < installer version, let the wizard run (upgrade path)
+ // If we could not read DB version (null), also allow the wizard (conservative).
+ }
+ // If APP_INSTALLED != 1, allow a fresh install
+}
+
 $httpRequest = Request::createFromGlobals();
 $installationLanguage = 'en_US';
 

public/main/install/install.lib.php

@@ -467,7 +467,7 @@ function display_requirements(
  $timezone = checkPhpSettingExists('date.timezone');
 
  $phpVersion = phpversion();
- $isVersionPassed = version_compare($phpVersion, REQUIRED_PHP_VERSION, '<=') <= 1;
+ $isVersionPassed = version_compare($phpVersion, REQUIRED_PHP_VERSION, '>=');
 
  $extensions = [];
  $extensions[] = [
@@ -1800,17 +1800,55 @@ function checkCanCreateFile(string $file): bool
  */
 function isUpdateAvailable(): bool
 {
- $dotenv = new Dotenv();
  $envFile = api_get_path(SYMFONY_SYS_PATH) . '.env';
- $dotenv->loadEnv($envFile);
+ if (!file_exists($envFile)) {
+ return false; // No .env -> fresh install
+ }
+
+ $dotenv = new Dotenv();
+ try {
+ $dotenv->loadEnv($envFile);
+ } catch (\Throwable $e) {
+ // If .env cannot be parsed, play safe: no update banner
+ return false;
+ }
+
+ // Must be an installed platform
+ if (($_ENV['APP_INSTALLED'] ?? '') !== '1') {
+ return false;
+ }
 
- // Check if APP_INSTALLED is set and equals '1'
- if (isset($_ENV['APP_INSTALLED']) && $_ENV['APP_INSTALLED'] === '1') {
+ // Compare DB version vs installer version
+ $versionInfo = require __DIR__.'/version.php';
+ $installerVersion = $versionInfo['new_version'] ?? null;
+
+ if (!$installerVersion) {
+ // If we cannot know installer version, do not show update banner
+ return false;
+ }
+
+ $dbVersion = null;
+ try {
+ connectToDatabase(
+ $_ENV['DATABASE_HOST'] ?? 'localhost',
+ $_ENV['DATABASE_USER'] ?? '',
+ $_ENV['DATABASE_PASSWORD'] ?? '',
+ $_ENV['DATABASE_NAME'] ?? '',
+ (int) ($_ENV['DATABASE_PORT'] ?? 3306)
+ );
+ $dbVersion = get_config_param_from_db('chamilo_database_version');
+ } catch (\Throwable $e) {
+ // If DB is unreachable but platform is marked installed, allow upgrade path
+ // so the UI can guide the admin.
  return true;
  }
 
- // If APP_INSTALLED is not found or not set to '1', assume the application is not installed
- return false;
+ if (empty($dbVersion)) {
+ // No version recorded -> offer upgrade path to normalize state
+ return true;
+ }
+
+ return version_compare($dbVersion, $installerVersion, '<');
 }
 
 /**

public/main/my_space/user_edit.php

@@ -155,7 +155,7 @@
  );
 
  if (!empty($email) && $send_mail) {
- $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('Your registration on').' '.api_get_setting('siteName');
+ $emailsubject = '['.api_get_setting('site_name').'] '.sprintf(get_lang('Your registration on %s'), api_get_setting('site_name'));
  $portal_url = api_get_path(WEB_PATH);
  if (api_is_multiple_url_enabled()) {
  $access_url_id = api_get_current_access_url_id();
@@ -167,11 +167,11 @@
 
  $emailbody = get_lang('Dear')." ".
  stripslashes(api_get_person_name($userInfo['firstname'], $userInfo['lastname'])).",\n\n".
- get_lang('You are registered to')." ".api_get_setting('siteName')." ".
+ get_lang('You are registered to')." ".api_get_setting('site_name')." ".
  get_lang('with the following settings:')."\n\n".
  get_lang('Username')." : ".$username."\n".
  get_lang('Pass')." : ".stripslashes($password)."\n\n".
- get_lang('The address of')." ".api_get_setting('siteName')." ".
+ get_lang('The address of')." ".api_get_setting('site_name')." ".
  get_lang('is')." : ".$portal_url."\n\n".
  get_lang('In case of trouble, contact us.')."\n\n".
  get_lang('Sincerely').",\n\n".
@@ -180,7 +180,7 @@
  api_get_setting('administratorSurname')
  )."\n".
  get_lang('Administrator')." ".
- api_get_setting('siteName')."\nT. ".
+ api_get_setting('site_name')."\nT. ".
  api_get_setting('administratorTelephone')."\n".
  get_lang('E-mail')." : ".api_get_setting('emailAdministrator');
 

public/main/template/default/mail/subject_subscription_to_session_confirmation.html.twig

@@ -1 +1 @@
-{{ '[' ~ _s.site_name ~ '] ' ~ 'Your registration on'|get_lang ~ ' ' ~ _s.site_name }}
+{{ '[' ~ _s.site_name ~ '] ' ~ 'Your registration on %s'|trans({'%s', _s.site_name})}}