Merge branch 'GH-5567' of github.com:christianbeeznest/chamilo-lms into alpha

public/main/admin/configure_extensions.php

@@ -12,7 +12,7 @@ $this_section = SECTION_PLATFORM_ADMIN;
 api_protect_admin_script();
 $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('Administration')];
 // Database Table Definitions
-$tbl_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+$tbl_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS);
 $message = '';
 
 if (isset($_POST['activeExtension'])) {

public/main/admin/languages.php

@@ -114,7 +114,7 @@ unset($_SESSION['disabled_languages']);
 
 // setting the table that is needed for the styles management (there is a check if it exists later in this code)
 $tbl_admin_languages = Database::get_main_table(TABLE_MAIN_LANGUAGE);
-$tbl_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+$tbl_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS);
 
 $id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
 $url = api_get_self();

public/main/admin/settings.lib.php

@@ -1342,7 +1342,7 @@ function generateSettingsForm($settings, $settings_by_access_list)
 {
     global $_configuration, $settings_to_avoid, $convert_byte_to_mega_list;
     $em = Database::getManager();
-    $table_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS);
 
     $form = new FormValidator(
         'settings',
@@ -1721,7 +1721,7 @@ function searchSetting($search)
     if (empty($search)) {
         return [];
     }
-    $table_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $sql = "SELECT * FROM $table_settings_current
             WHERE category <> 'Plugins' ORDER BY id ASC ";
     $result = Database::store_result(Database::query($sql), 'ASSOC');

public/main/admin/settings.php

@@ -30,7 +30,7 @@ $_SESSION['this_section'] = $this_section;
 api_protect_admin_script();
 
 // Database table definitions.
-$table_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+$table_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS);
 
 // Setting breadcrumbs.
 $interbreadcrumb[] = ['url' => api_get_path(WEB_PATH).'admin', 'name' => get_lang('Administration')];

public/main/inc/ajax/admin.ajax.php

@@ -101,7 +101,7 @@ switch ($action) {
  */
 function version_check()
 {
-    $tbl_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $tbl_settings = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $sql = 'SELECT selected_value FROM '.$tbl_settings.' WHERE variable = "registered" ';
     $result = Database::query($sql);
     $row = Database::fetch_assoc($result);

public/main/inc/lib/api.lib.php

@@ -2773,7 +2773,7 @@ function api_get_plugin_setting($plugin, $variable)
             $variableName,
         ],
     ];
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $result = Database::select(
         'selected_value',
         $table,
@@ -2816,7 +2816,7 @@ function api_get_plugin_setting($plugin, $variable)
  */
 function api_get_settings_params($params)
 {
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
 
     return Database::select('*', $table, ['where' => $params]);
 }
@@ -2828,7 +2828,7 @@ function api_get_settings_params($params)
  */
 function api_get_settings_params_simple($params)
 {
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
 
     return Database::select('*', $table, ['where' => $params], 'one');
 }
@@ -2838,7 +2838,7 @@ function api_get_settings_params_simple($params)
  */
 function api_delete_settings_params($params)
 {
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
 
     return Database::delete($table, $params);
 }
@@ -4484,7 +4484,7 @@ function api_set_setting_option($params)
  */
 function api_set_setting_simple($params)
 {
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $url_id = api_get_current_access_url_id();
 
     if (empty($params['id'])) {
@@ -4523,7 +4523,7 @@ function api_set_setting($var, $value, $subvar = null, $cat = null, $access_url
     if (empty($var)) {
         return false;
     }
-    $t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $var = Database::escape_string($var);
     $value = Database::escape_string($value);
     $access_url = (int) $access_url;
@@ -4629,7 +4629,7 @@ function api_set_settings_category($category, $value = null, $access_url = 1, $f
         return false;
     }
     $category = Database::escape_string($category);
-    $t_s = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $t_s = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $access_url = (int) $access_url;
     if (empty($access_url)) {
         $access_url = 1;
@@ -4760,7 +4760,7 @@ function api_get_access_url($id, $returnDefault = true)
  */
 function &api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $url_changeable = 0)
 {
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $access_url = (int) $access_url;
     $where_condition = '';
     if (1 == $url_changeable) {
@@ -7002,7 +7002,7 @@ function api_get_supported_image_extensions($supportVectors = true)
  */
 function api_register_campus($listCampus = true)
 {
-    $tbl_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $tbl_settings = Database::get_main_table(TABLE_MAIN_SETTINGS);
 
     $sql = "UPDATE $tbl_settings SET selected_value='true' WHERE variable='registered'";
     Database::query($sql);

public/main/inc/lib/banner.lib.php

@@ -19,7 +19,7 @@ use Chamilo\CoreBundle\Component\Utils\ObjectIcon;
 function getCustomTabs()
 {
     $urlId = api_get_current_access_url_id();
-    $tableSettingsCurrent = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $tableSettingsCurrent = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $sql = "SELECT * FROM $tableSettingsCurrent
             WHERE
                 variable = 'show_tabs' AND

public/main/inc/lib/database.constants.inc.php

@@ -26,7 +26,7 @@ define('TABLE_MAIN_SYSTEM_ANNOUNCEMENTS', 'sys_announcement');
 define('TABLE_MAIN_SYSTEM_ANNOUNCEMENTS_GROUPS', 'announcement_rel_group');
 define('TABLE_MAIN_LANGUAGE', 'language');
 define('TABLE_MAIN_SETTINGS_OPTIONS', 'settings_options');
-define('TABLE_MAIN_SETTINGS_CURRENT', 'settings_current');
+define('TABLE_MAIN_SETTINGS', 'settings');
 define('TABLE_MAIN_SESSION', 'session');
 define('TABLE_MAIN_SESSION_CATEGORY', 'session_category');
 define('TABLE_MAIN_SESSION_COURSE', 'session_rel_course');

public/main/inc/lib/gradebook.lib.php

@@ -42,7 +42,7 @@ class Gradebook extends Model
     public static function is_active($c_id = null)
     {
         $name = 'gradebook';
-        $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+        $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
         $sql = "SELECT * from $table
                 WHERE variable='course_hide_tools' AND subkey='$name'
                 LIMIT 1";

public/main/inc/lib/plugin.class.php

@@ -714,7 +714,7 @@ class Plugin
      */
     public function addTab($tabName, $url, $userFilter = null)
     {
-        $sql = "SELECT * FROM settings_current
+        $sql = "SELECT * FROM settings
                 WHERE
                     variable = 'show_tabs' AND
                     subkey LIKE 'custom_tab_%'";
@@ -791,7 +791,7 @@ class Plugin
      */
     public function deleteTab($key)
     {
-        $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+        $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
         $sql = "SELECT *
                 FROM $table
                 WHERE variable = 'show_tabs'
@@ -868,7 +868,7 @@ class Plugin
                 echo "<script>location.href = '".Security::remove_XSS($_SERVER['REQUEST_URI'])."';</script>";
             }
         } else {
-            $settingsCurrentTable = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+            $settingsCurrentTable = Database::get_main_table(TABLE_MAIN_SETTINGS);
             $conditions = [
                 'where' => [
                     "variable = 'show_tabs' AND title = ? AND comment = ? " => [

public/main/inc/lib/sub_language.class.php

@@ -356,7 +356,7 @@ class SubLanguageManager
         }
         $language_id = intval($language_id);
         $tbl_admin_languages = Database::get_main_table(TABLE_MAIN_LANGUAGE);
-        $tbl_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+        $tbl_settings_current = Database::get_main_table(TABLE_MAIN_SETTINGS);
         $sql = "SELECT * FROM $tbl_admin_languages
                 WHERE id = $language_id";
         $result = Database::query($sql);

public/main/install/install.lib.php

@@ -1185,7 +1185,7 @@ function get_countries_list_from_array($combo = false)
 function lockSettings()
 {
     $settings = api_get_locked_settings();
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
     foreach ($settings as $setting) {
         $sql = "UPDATE $table SET access_url_locked = 1 WHERE variable  = '$setting'";
         Database::query($sql);
@@ -1197,7 +1197,7 @@ function lockSettings()
  */
 function updateDirAndFilesPermissions()
 {
-    $table = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $table = Database::get_main_table(TABLE_MAIN_SETTINGS);
     $permissions_for_new_directories = isset($_SESSION['permissions_for_new_directories']) ? $_SESSION['permissions_for_new_directories'] : 0770;
     $permissions_for_new_files = isset($_SESSION['permissions_for_new_files']) ? $_SESSION['permissions_for_new_files'] : 0660;
     // use decoct() to store as string
@@ -1589,7 +1589,7 @@ function installProfileSettings($installationProfile = '')
         installProfileSettings($params->parent);
     }
 
-    $tblSettings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+    $tblSettings = Database::get_main_table(TABLE_MAIN_SETTINGS);
 
     foreach ($settings as $id => $param) {
         $conditions = ['variable = ? ' => $param->variable];

public/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php

@@ -1491,7 +1491,7 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
         Database::query($sql);
 
         /* Delete settings */
-        $settingsTable = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+        $settingsTable = Database::get_main_table(TABLE_MAIN_SETTINGS);
         Database::query("DELETE FROM $settingsTable WHERE subkey = 'advanced_subscription'");
     }
 

public/plugin/bbb/lib/bbb_plugin.class.php

@@ -239,7 +239,7 @@ class BBBPlugin extends Plugin
      */
     public function uninstall()
     {
-        $t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+        $t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS);
         $t_options = Database::get_main_table(TABLE_MAIN_SETTINGS_OPTIONS);
         $t_tool = Database::get_course_table(TABLE_TOOL_LIST);
 

public/plugin/extramenufromwebservice/lib/extramenufromwebservice_plugin.class.php

@@ -58,7 +58,7 @@ class ExtraMenuFromWebservicePlugin extends Plugin
             'list_fonts_imports' => 'text',
         ];
 
-        $tableSettings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+        $tableSettings = Database::get_main_table(TABLE_MAIN_SETTINGS);
         $urlId = api_get_current_access_url_id();
 
         foreach ($settings as $variable) {

public/plugin/pens/lib/PENSPlugin.php

@@ -101,7 +101,7 @@ class PENSPlugin extends Plugin implements HookPluginInterface
         Database::query($sql);
 
         /* Delete settings */
-        $settingsTable = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
+        $settingsTable = Database::get_main_table(TABLE_MAIN_SETTINGS);
         Database::query("DELETE FROM $settingsTable WHERE subkey = 'plugin_pens'");
     }
 

src/CoreBundle/Entity/SettingsCurrent.php

@@ -12,7 +12,7 @@ use Symfony\Component\Validator\Constraints as Assert;
 /**
  * Platform settings.
  */
-#[ORM\Table(name: 'settings_current', options: ['row_format' => 'DYNAMIC'])]
+#[ORM\Table(name: 'settings', options: ['row_format' => 'DYNAMIC'])]
 #[ORM\Index(columns: ['access_url'], name: 'access_url')]
 #[ORM\UniqueConstraint(name: 'unique_setting', columns: ['variable', 'subkey', 'access_url'])]
 #[ORM\Entity]

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

@@ -0,0 +1,23 @@
+<?php
+
+/* For licensing terms, see /license.txt */
+
+declare(strict_types=1);
+
+namespace Chamilo\CoreBundle\Migrations\Schema\V200;
+
+use Chamilo\CoreBundle\Migrations\AbstractMigrationChamilo;
+use Doctrine\DBAL\Schema\Schema;
+
+class Version20240605103700 extends AbstractMigrationChamilo
+{
+    public function up(Schema $schema): void
+    {
+        $this->addSql('RENAME TABLE settings_current TO settings');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('RENAME TABLE settings TO settings_current');
+    }
+}