Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Internal: Renamed "settings_current" table to just "settings" - refs #5567 #5572

Merged
merged 2 commits into from
Jul 4, 2024
Merged

Internal: Renamed "settings_current" table to just "settings" - refs #5567 #5572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf239c3
Internal: Renamed "settings_current" table to just "settings" - refs …
christianbeeznest Jun 5, 2024
5f89071
Minor: Replace table name by variable
ywarnier Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion public/main/admin/configure_extensions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
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);
ywarnier marked this conversation as resolved.
Show resolved Hide resolved
$message = '';

if (isset($_POST['activeExtension'])) {
Expand Down
2 changes: 1 addition & 1 deletion public/main/admin/languages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@

// 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);
ywarnier marked this conversation as resolved.
Show resolved Hide resolved

$id = isset($_GET['id']) ? (int) $_GET['id'] : 0;
$url = api_get_self();
Expand Down
4 changes: 2 additions & 2 deletions public/main/admin/settings.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
ywarnier marked this conversation as resolved.
Show resolved Hide resolved

$form = new FormValidator(
'settings',
Expand Down Expand Up @@ -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');
Expand Down
2 changes: 1 addition & 1 deletion public/main/admin/settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
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);
ywarnier marked this conversation as resolved.
Show resolved Hide resolved

// Setting breadcrumbs.
$interbreadcrumb[] = ['url' => api_get_path(WEB_PATH).'admin', 'name' => get_lang('Administration')];
Expand Down
2 changes: 1 addition & 1 deletion public/main/inc/ajax/admin.ajax.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
*/
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);
Expand Down
18 changes: 9 additions & 9 deletions public/main/inc/lib/api.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2760,7 +2760,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,
Expand Down Expand Up @@ -2803,7 +2803,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]);
}
Expand All @@ -2815,7 +2815,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');
}
Expand All @@ -2825,7 +2825,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);
}
Expand Down Expand Up @@ -4471,7 +4471,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'])) {
Expand Down Expand Up @@ -4510,7 +4510,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;
Expand Down Expand Up @@ -4616,7 +4616,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;
Expand Down Expand Up @@ -4747,7 +4747,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) {
Expand Down Expand Up @@ -6989,7 +6989,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);
Expand Down
2 changes: 1 addition & 1 deletion public/main/inc/lib/banner.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
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
Expand Down
2 changes: 1 addition & 1 deletion public/main/inc/lib/database.constants.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
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');
Expand Down
2 changes: 1 addition & 1 deletion public/main/inc/lib/gradebook.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function __construct()
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";
Expand Down
8 changes: 5 additions & 3 deletions public/main/inc/lib/plugin.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,9 @@ public function course_settings_updated($values = [])
*/
public function addTab($tabName, $url, $userFilter = null)
{
$sql = "SELECT * FROM settings_current
$table = Database::get_main_table(TABLE_MAIN_SETTINGS);
$sql = "SELECT *
FROM $table
WHERE
variable = 'show_tabs' AND
subkey LIKE 'custom_tab_%'";
Expand Down Expand Up @@ -791,7 +793,7 @@ public function addTab($tabName, $url, $userFilter = null)
*/
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'
Expand Down Expand Up @@ -868,7 +870,7 @@ public function manageTab($showTab, $filePath = 'index.php')
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 = ? " => [
Expand Down
2 changes: 1 addition & 1 deletion public/main/inc/lib/sub_language.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ public static function set_platform_language($language_id)
}
$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);
Expand Down
6 changes: 3 additions & 3 deletions public/main/install/install.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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
Expand Down Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion public/plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1491,7 +1491,7 @@ private function uninstallDatabase()
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'");
}

Expand Down
2 changes: 1 addition & 1 deletion public/plugin/bbb/lib/bbb_plugin.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ public function install()
*/
public function uninstall()
{
$t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
$t_settings = Database::get_main_table(TABLE_MAIN_SETTINGS);
ywarnier marked this conversation as resolved.
Show resolved Hide resolved
$t_options = Database::get_main_table(TABLE_MAIN_SETTINGS_OPTIONS);
$t_tool = Database::get_course_table(TABLE_TOOL_LIST);

Expand Down
2 changes: 1 addition & 1 deletion public/plugin/extramenufromwebservice/lib/extramenufromwebservice_plugin.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function uninstall()
'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) {
Expand Down
2 changes: 1 addition & 1 deletion public/plugin/pens/lib/PENSPlugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private function uninstallDatabase()
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'");
}

Expand Down
2 changes: 1 addition & 1 deletion src/CoreBundle/Entity/SettingsCurrent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
/**
* 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]
Expand Down
23 changes: 23 additions & 0 deletions src/CoreBundle/Migrations/Schema/V200/Version20240605103700.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
}
}
Loading