Permalink
Browse files

MDL-43481 lib: minor cleanups to commands

And remove unused strings - thanks to Simon Coggins!
  • Loading branch information...
danpoltawski committed Jan 7, 2014
1 parent 6d07969 commit 25294dd46603f295eaedfa67d13902b310b4170b
Showing with 3 additions and 4 deletions.
  1. +0 −1 lang/en/admin.php
  2. +3 −3 lib/tests/moodlelib_test.php
View
@@ -1101,7 +1101,6 @@
$string['upgrade197notice'] = '<p>Moodle 1.9.7 contains a number of security fixes to user passwords and backups to protect the user data on your site. As a result some of your settings and permissions relating to backups may have changed.<br />
See the <a href="http://docs.moodle.org/dev/Moodle_1.9.7_release_notes" target="_blank">Moodle 1.9.7 release notes</a> for full details.</p>';
$string['upgrade197noticesubject'] = 'Moodle 1.9.7 upgrade security notices';
$string['upgrade197salt'] = 'To reduce the risk of password theft, you are strongly recommended to set a password salt.<br />See the <a href="{$a}" target="_blank">password salting documentation</a> for details.';
$string['upgradingdata'] = 'Upgrading data';
$string['upgradinglogs'] = 'Upgrading logs';
$string['upgradingversion'] = 'Upgrading to new version';
@@ -2181,7 +2181,7 @@ public function test_password_is_legacy_hash() {
* Test function validate_internal_user_password().
*/
public function test_validate_internal_user_password() {
// Otherwise test bcrypt hashes.
// Test bcrypt hashes.
$validhashes = array(
'pw' => '$2y$10$LOSDi5eaQJhutSRun.OVJ.ZSxQZabCMay7TO1KmzMkDMPvU40zGXK',
'abc' => '$2y$10$VWTOhVdsBbWwtdWNDRHSpewjd3aXBQlBQf5rBY/hVhw8hciarFhXa',
@@ -2216,7 +2216,7 @@ public function test_hash_internal_user_password() {
$user->password = $hash;
$this->assertTrue(validate_internal_user_password($user, $password));
// Otherwise they should not be in md5 format.
// They should not be in md5 format.
$this->assertFalse(password_is_legacy_hash($hash));
// Check that cost factor in hash is correctly set.
@@ -2249,7 +2249,7 @@ public function test_update_internal_user_password() {
// Update the password.
update_internal_user_password($user, 'password');
// Otherwise password should have been updated to a bcrypt hash.
// Password should have been updated to a bcrypt hash.
$this->assertFalse(password_is_legacy_hash($user->password));
}

0 comments on commit 25294dd

Please sign in to comment.