L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/db/upgrade: MDL-21664 - $CFG->passwordmainsalt was used rather than $CFG->passwordsaltmain

Browse Source 
Causing all admins to be warned about their salt even if they had one set
This commit is contained in:
Dan Poltawski
2010-02-19 16:47:28 +00:00
parent 5bc3ab3db0
commit ff9a1e85c9
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/access.php
+34
View File
@@ -188,10 +188,44 @@ $moodle_capabilities = array(
'legacy' => array(
'editingteacher' => CAP_ALLOW,
'admin' => CAP_ALLOW
<<<<<<< access.php
),
'clonepermissionsfrom' => 'moodle/site:restore'
),
<<<<<<< access.php
'moodle/backup:userinfo' => array(
'riskbitmask' => RISK_PERSONAL | RISK_CONFIG,
'captype' => 'write',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
'admin' => CAP_ALLOW
)
),
=======
'moodle/backup:userinfo' => array(
'riskbitmask' => RISK_PERSONAL,
'captype' => 'read',
'contextlevel' => CONTEXT_COURSE,
'legacy' => array(
'admin' => CAP_ALLOW
=======
>>>>>>> 1.75.2.23
)
),
<<<<<<< access.php
>>>>>>> 1.113
'moodle/site:restore' => array(
=======
'moodle/restore:createuser' => array(
>>>>>>> 1.75.2.23
'riskbitmask' => RISK_SPAM | RISK_PERSONAL,
lib/db/upgrade.php
+2 -2
View File
@@ -3194,7 +3194,7 @@ function xmldb_main_upgrade($oldversion=0) {
}
$message = get_string('upgrade197notice', 'admin');
if (empty($CFG->passwordmainsalt)) {
if (empty($CFG->passwordsaltmain)) {
$docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
$message .= "\n".get_string('upgrade197salt', 'admin', $docspath);
}
@@ -3208,7 +3208,7 @@ function xmldb_main_upgrade($oldversion=0) {
if ($result && $oldversion < 2007101561.02) {
$messagesubject = s($SITE->shortname).': '.get_string('upgrade197noticesubject', 'admin');
$message = '<p>'.s($SITE->fullname).' ('.s($CFG->wwwroot).'):</p>'.get_string('upgrade197notice', 'admin');
if (empty($CFG->passwordmainsalt)) {
if (empty($CFG->passwordsaltmain)) {
$docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
$message .= "\n".get_string('upgrade197salt', 'admin', $docspath);
}