mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-19 23:55:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-46739_main' of https://github.com/marxjohnson/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2024-11-14 09:26:43 +07:00
commit 43784b0d98
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
8 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.upgradenotes/MDL-46739-2024091010555321.yml Normal file
View File

@ -0,0 +1,10 @@
issueNumber: MDL-46739
notes:
core:
- message: >-
The {user_preferences}.value database field is now TEXT instead of CHAR.
This means that any queries with a condition on this field in a WHERE or
JOIN statement will need updating to use `$DB->sql_compare_text()`. See
the `$newusers` query in
`\core\task\send_new_users_password_task::execute` for an example.
type: changed

4
blocks/online_users/classes/fetcher.php
View File

@ -80,7 +80,7 @@ class fetcher {
$uservisibilityselect = "";
if ($CFG->block_online_users_onlinestatushiding) {
$uservisibility = ", up.value AS uservisibility";
$uservisibilityselect = "AND (" . $DB->sql_cast_char2int('up.value') . " = 1
$uservisibilityselect = "AND (" . $DB->sql_cast_char2int('up.value', true) . " = 1
OR up.value IS NULL
OR u.id = :userid)";
}
@ -97,7 +97,7 @@ class fetcher {
$lastaccess = ", MAX(u.lastaccess) AS lastaccess";
$timeaccess = ", MAX(ul.timeaccess) AS lastaccess";
if ($CFG->block_online_users_onlinestatushiding) {
$uservisibility = ", MAX(up.value) AS uservisibility";
$uservisibility = ", MAX(" . $DB->sql_cast_char2int('up.value', true) . ") AS uservisibility";
}
$params['currentgroup'] = $currentgroup;
}

19
lib/classes/task/send_new_user_passwords_task.php
View File

@ -45,7 +45,13 @@ class send_new_user_passwords_task extends scheduled_task {
global $DB;
// Generate new password emails for users - ppl expect these generated asap.
if ($DB->count_records('user_preferences', array('name' => 'create_password', 'value' => '1'))) {
if (
$DB->record_exists_select(
'user_preferences',
'name = ? AND ' . $DB->sql_compare_text('value', 2) . ' = ?',
['create_password', '1']
)
) {
mtrace('Creating passwords for new users...');
$userfieldsapi = \core_user\fields::for_name();
$usernamefields = $userfieldsapi->get_sql('u', false, '', '', false)->selects;
@ -54,10 +60,13 @@ class send_new_user_passwords_task extends scheduled_task {
$usernamefields, u.username, u.lang,
p.id as prefid
FROM {user} u
JOIN {user_preferences} p ON u.id=p.userid
WHERE p.name='create_password' AND p.value='1' AND
u.email !='' AND u.suspended = 0 AND
u.auth != 'nologin' AND u.deleted = 0");
JOIN {user_preferences} p ON u.id = p.userid
WHERE p.name = 'create_password'
AND " . $DB->sql_compare_text('p.value', 2) . " = '1'
AND u.email <> ''
AND u.suspended = 0
AND u.auth <> 'nologin'
AND u.deleted = 0");
// Note: we can not send emails to suspended accounts.
foreach ($newusers as $newuser) {

4
lib/db/install.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<XMLDB PATH="lib/db" VERSION="20241025" COMMENT="XMLDB file for core Moodle tables"
<XMLDB PATH="lib/db" VERSION="20241124" COMMENT="XMLDB file for core Moodle tables"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
>
@ -939,7 +939,7 @@
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
<FIELD NAME="userid" TYPE="int" LENGTH="10" NOTNULL="true" DEFAULT="0" SEQUENCE="false"/>
<FIELD NAME="name" TYPE="char" LENGTH="255" NOTNULL="true" SEQUENCE="false"/>
<FIELD NAME="value" TYPE="char" LENGTH="1333" NOTNULL="true" SEQUENCE="false"/>
<FIELD NAME="value" TYPE="text" NOTNULL="true" SEQUENCE="false"/>
</FIELDS>
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id"/>

12
lib/db/upgrade.php
View File

@ -1462,5 +1462,17 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2024110400.00);
}
if ($oldversion < 2024110800.02) {
// Changing type of field value on table user_preferences to text.
$table = new xmldb_table('user_preferences');
$field = new xmldb_field('value', XMLDB_TYPE_TEXT, null, null, XMLDB_NOTNULL, null, null, 'name');
// Launch change of type for field value.
$dbman->change_field_type($table, $field);
// Main savepoint reached.
upgrade_main_savepoint(true, 2024110800.02);
}
return true;
}

4
lib/moodlelib.php
View File

@ -1490,11 +1490,7 @@ function set_user_preference($name, $value, $user = null) {
} else if (is_array($value)) {
throw new coding_exception('Invalid value in set_user_preference() call, arrays are not allowed');
}
// Value column maximum length is 1333 characters.
$value = (string)$value;
if (core_text::strlen($value) > 1333) {
throw new coding_exception('Invalid value in set_user_preference() call, value is is too long for the value column');
}
if (is_null($user)) {
$user = $USER;

16
lib/tests/moodlelib_test.php
View File

@ -1495,14 +1495,14 @@ final class moodlelib_test extends \advanced_testcase {
$this->assertEquals($longvalue,
$DB->get_field('user_preferences', 'value', array('userid' => $USER->id, 'name' => '_test_long_user_preference')));
// Test > 1333 char values, coding_exception expected.
$longvalue = str_repeat('a', 1334);
try {
set_user_preference('_test_long_user_preference', $longvalue);
$this->fail('Exception expected - longer than 1333 chars not allowed as preference value');
} catch (\moodle_exception $ex) {
$this->assertInstanceOf('coding_exception', $ex);
}
// Larger preference values are allowed as of MDL-46739.
$longervalue = str_repeat('a', 1334);
set_user_preference('_test_long_user_preference', $longervalue);
$this->assertEquals($longervalue, get_user_preferences('_test_long_user_preference'));
$this->assertEquals(
$longervalue,
$DB->get_field('user_preferences', 'value', ['userid' => $USER->id, 'name' => '_test_long_user_preference'])
);
// Test invalid params.
try {

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2024110800.01; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2024110800.02; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.
$release = '5.0dev (Build: 20241108)'; // Human-friendly version name