Browse files

passwordsalt notice MDL-18807 Added site info to email, fixed broken …

…link and HTML mail formatting
  • Loading branch information...
1 parent 7b97970 commit d033b1288713625a733ce5fcbce5e7b5a1f6d5d1 @moodler moodler committed Nov 24, 2009
Showing with 5 additions and 5 deletions.
  1. +1 −1 lang/en_utf8/admin.php
  2. +4 −4 lib/db/upgrade.php
View
2 lang/en_utf8/admin.php
@@ -762,7 +762,7 @@
$string['updatetimezones'] = 'Update timezones';
$string['upgrade197notice'] = '<p>Moodle 1.9.7 contains a number of security fixes to user passwords and backups to protect the user information on your site.<br />
As a result some of your settings and permissions relating to backups may have changed.<br />
-Please see the <a href=\'http://docs.moodle.org/en/Moodle_1.9.7_release_notes\' target=\'_blank\'>Moodle 1.9.7 release</a> notes for full details.</p>';
+Please see the <a href=\"http://docs.moodle.org/en/Moodle_1.9.7_release_notes\" target=\"_blank\">Moodle 1.9.7 release</a> notes for full details.</p>';
$string['upgrade197noticesubject'] = 'Moodle 1.9.7 upgrade security notices';
$string['upgrade197salt'] = 'It is also now strongly recommended that you set a password salt to greatly reduce the risk of password theft.<br />Please refer to the <a href=\"$a\" target=\"_blank\">password salting documentation</a> for details.</a>';
$string['upgradeforumread'] = 'A new feature has been added in Moodle 1.5 to track read/unread forum posts.<br />To use this functionality you need to <a href=\"$a\">update your tables</a>.';
View
8 lib/db/upgrade.php
@@ -19,7 +19,7 @@
function xmldb_main_upgrade($oldversion=0) {
- global $CFG, $THEME, $USER, $db;
+ global $CFG, $THEME, $USER, $SITE, $db;
$result = true;
@@ -3206,16 +3206,16 @@ function xmldb_main_upgrade($oldversion=0) {
}
if ($result && $oldversion < 2007101561.02) {
- $messagesubject = get_string('upgrade197noticesubject', 'admin');
- $message = addslashes(get_string('upgrade197notice', 'admin'));
+ $messagesubject = s($SITE->shortname).': '.get_string('upgrade197noticesubject', 'admin');
+ $message = '<p>'.s($SITE->fullname).':</p>'.get_string('upgrade197notice', 'admin');
if (empty($CFG->passwordmainsalt)) {
$docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
$message .= "\n".get_string('upgrade197salt', 'admin', $docspath);
}
// Force administrators to change password on next login
$systemcontext = get_context_instance(CONTEXT_SYSTEM);
- $sql = "SELECT DISTINCT u.id, u.firstname, u.lastname, u.picture, u.imagealt, u.email, u.password
+ $sql = "SELECT DISTINCT u.id, u.firstname, u.lastname, u.picture, u.imagealt, u.email, u.password, u.mailformat
FROM {$CFG->prefix}role_capabilities rc
JOIN {$CFG->prefix}role_assignments ra ON (ra.contextid = rc.contextid AND ra.roleid = rc.roleid)
JOIN {$CFG->prefix}user u ON u.id = ra.userid

0 comments on commit d033b12

Please sign in to comment.