Permalink
Browse files

security MDL-18807 Changed language strings: Thanks for the new strin…

…gs Helen
  • Loading branch information...
1 parent f15d29f commit f05b8d8bbc89863151a3c61992985e9295368d25 Sam Hemelryk committed Nov 18, 2009
Showing with 10 additions and 7 deletions.
  1. +2 −1 admin/report/security/lib.php
  2. +1 −2 lang/en_utf8/admin.php
  3. +5 −3 lang/en_utf8/report_security.php
  4. +2 −1 lib/db/upgrade.php
@@ -771,7 +771,8 @@ function report_security_check_passwordsaltmain($detailed=false) {
}
if ($detailed) {
- $result->details = get_string('check_passwordsaltmain_details', 'report_security');
+ $docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
+ $result->details = get_string('check_passwordsaltmain_details', 'report_security', $docspath);
}
return $result;
View
@@ -591,8 +591,7 @@
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.8.11_release_notes\' target=\'_blank\'>Moodle 1.8.11 release</a> notes for full details.</p>';
$string['upgrade1811noticesubject'] = 'Moodle 1.8.11 upgrade security notices';
-$string['upgrade1811salt'] = '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 Moodle security report for more information on this topic. The security report can be accessed by logging into your site as an administrator and go to Site Administration - Security - Site policies';
+$string['upgrade1811salt'] = '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['upgradingdata'] = 'Upgrading data';
$string['upgradinglogs'] = 'Upgrading logs';
$string['upwards'] = 'upwards';
@@ -123,9 +123,11 @@
$string['check_passwordsaltmain_warning'] = 'No password salt has been set';
$string['check_passwordsaltmain_ok'] = 'Password salt is OK';
$string['check_passwordsaltmain_weak'] = 'Password salt is weak';
-$string['check_passwordsaltmain_details'] = '<p>It is strongly recommended that a password salt is set as it greatly reduces the risk of password theft.<br />To set a password salt add the following to your config.php file.</p><code>\$CFG->passwordsaltmain = \'a_very_long_random_string_of_characters#@6&*1\';</code>
-<p>The random string of characters should be a mix of letters, numbers and other characters.</p>
-<p>When changing main salt make sure that you include the old value in config.php, there may be 20 alternative salts. Without the old value in alternative salts list users will not be able to login and will have to use password reset.<br /><code>\$CFG->passwordsaltalt1 = \'previous_main_salt\';</code><br /></p>';
+$string['check_passwordsaltmain_details'] = '<p>Setting a password salt greatly reduces the risk of password theft.</p>
+<p>To set a password salt, add the following line to your config.php file:</p>
+<code>\$CFG->passwordsaltmain = \'some long random string here with lots of characters\';</code>
+<p>The random string of characters should be a mix of letters, numbers and other characters. A string length of at least 40 characters is recommended.</p>
+<p>Please refer to the <a href=\"$a\" target=\"_blank\">password salting documentation</a> if you wish to change the password salt. Once set, do NOT delete your password salt otherwise you will no longer be able to login to your site!</p>';
$string['check_riskadmin_detailsok'] = '<p>Please verify the following list of system administrators:</p>$a';
$string['check_riskadmin_detailswarning'] = '<p>Please verify the following list of system administrators:</p>$a->admins
View
@@ -784,7 +784,8 @@ function xmldb_main_upgrade($oldversion=0) {
$messagesubject = get_string('upgrade1811noticesubject', 'admin');
$message = addslashes(get_string('upgrade1811notice', 'admin'));
if (empty($CFG->passwordmainsalt)) {
- $message .= "\n".get_string('upgrade1811salt', 'admin');
+ $docspath = $CFG->docroot.'/'.str_replace('_utf8', '', current_language()).'/report/security/report_security_check_passwordsaltmain';
+ $message .= "\n".get_string('upgrade1811salt', 'admin', $docspath);
}
notify($message, 'notifysuccess');

0 comments on commit f05b8d8

Please sign in to comment.