usability: provide guidance for password requirements

Signed-off-by: Evan Goldenberg <evang@catalyst.net.nz>
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

htdocs/forgotpass.php

@@ -59,6 +59,7 @@ if (isset($_GET['key'])) {
             'password1' => array(
                 'type' => 'password',
                 'title' => get_string('password'),
+                'description' => get_string('yournewpassword'),
                 'rules' => array(
                     'required' => true
                 )

htdocs/lang/en.utf8/mahara.php

@@ -319,7 +319,7 @@ $string['preferredname'] = 'Display Name';
 $string['usernamedescription'] = ' ';
 $string['usernamehelp'] = 'The username you have been given to access this system.';
 $string['youaremasqueradingas'] = 'You are masquerading as %s.';
-$string['yournewpassword'] = 'Your new password';
+$string['yournewpassword'] = 'Your new password. Passwords must be at least six characters long and contain at least one digit and two letters';
 $string['yournewpasswordagain'] = 'Your new password again';
 $string['invalidsesskey'] = 'Invalid session key';
 $string['cannotremovedefaultemail'] = 'You cannot remove your primary email address';

htdocs/register.php

@@ -143,7 +143,7 @@ if (isset($key)) {
         $USER->reanimate($user->id, $authinstance->id);
 
         // A special greeting for special people
-        if (in_array($user->username, array('waawaamilk', 'Mjollnir`', 'Ned', 'richardm', 'fmarier'))) {
+        if (in_array($user->username, array('waawaamilk', 'Mjollnir`', 'Ned', 'richardm', 'fmarier', 'naveg'))) {
             $SESSION->add_ok_msg('MAMA!!! Maharababy happy to see you :D :D!');
         }
         else if ($user->username == 'htaccess') {