Merge branch 'MDL-76459_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE

This commit is contained in:
Ilya Tregubov
2023-09-06 10:04:13 +08:00
3 changed files with 23 additions and 0 deletions
+2
View File
@@ -4301,6 +4301,8 @@
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
</CUSTOM_CHECK>
<CUSTOM_CHECK file="lib/upgradelib.php" function="check_db_prefix_length" level="required">
</CUSTOM_CHECK>
</CUSTOM_CHECKS>
</MOODLE>
</COMPATIBILITY_MATRIX>
+1
View File
@@ -459,6 +459,7 @@ $string['customusermenuitems'] = 'User menu items';
$string['datarootsecurityerror'] = '<p><strong>SECURITY WARNING!</strong></p><p>Your dataroot directory is in the wrong location and is exposed to the web. This means that all your private files are available to anyone in the world, and some of them could be used by a cracker to obtain unauthorised administrative access to your site!</p>
<p>You <em>must</em> move dataroot directory ({$a}) to a new location that is not within your public web directory, and update the <code>$CFG->dataroot</code> setting in your config.php accordingly.</p>';
$string['datarootsecuritywarning'] = 'Your site configuration might not be secure. Please make sure that your dataroot directory ({$a}) is not directly accessible via web.';
$string['dbprefixtoolong'] = 'Your site\'s database prefix ($CFG->prefix) is too long ({$a->current} characters). The maximum number of characters allowed is {$a->maximum}.';
$string['dbsessions'] = 'Use database for session information';
$string['debug'] = 'Debug messages';
$string['debugall'] = 'ALL: Show all reasonable PHP debug messages';
+20
View File
@@ -2487,6 +2487,26 @@ function check_igbinary322_version(environment_results $result) {
return $result;
}
/**
* This function checks that the database prefix ($CFG->prefix) is <= 10
*
* @param environment_results $result
* @return environment_results|null updated results object, or null if the prefix check is passing ok.
*/
function check_db_prefix_length(environment_results $result) {
global $CFG;
$prefixlen = strlen($CFG->prefix) ?? 0;
if ($prefixlen > 10) {
$parameters = (object)['current' => $prefixlen, 'maximum' => 10];
$result->setFeedbackStr(['dbprefixtoolong', 'admin', $parameters]);
$result->setInfo('db prefix too long');
$result->setStatus(false);
return $result;
}
return null; // All, good. By returning null we hide the check.
}
/**
* Assert the upgrade key is provided, if it is defined.
*