Some cleanups

diff --git a/lang/en/auth.php b/lang/en/auth.php
index 4310a198f7bd96bff320b14349a1dccc975f1935..a2fdff25794e0aa6e3bde5a48215f874eb32e896 100644 (file)
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -95,6 +95,6 @@ $string['stdchangepassword'] = 'Use standard Change Password Page';
 $string['stdchangepassword_expl'] = 'If the external authentication system allows password changes through Moodle, switch this to Yes. This setting overrides \'Change Password URL\'.';
 $string['stdchangepassword_explldap'] = 'NOTE: It is recommended that you use LDAP over an SSL encrypted tunnel (ldaps://) if the LDAP server is remote.';
 $string['forcechangepassword'] = 'Force change password';
-$string['forcechangepassword_help'] = 'Force users to change password on their first login to Moodle.';$string['guestloginbutton'] = 'Guest login button';
+$string['forcechangepassword_help'] = 'Force users to change password on their next login to Moodle.';$string['guestloginbutton'] = 'Guest login button';
 
 ?>

diff --git a/user/edit.html b/user/edit.html
index ee99bdb00ad73c30d81d769dd54406c5a7502918..8f1074cb2e0a90b8bea4c9d2e188303c571f5bdd 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -56,16 +56,17 @@ if (isadmin()) {
         }
         echo " </td>";
         echo "</tr>\n";
-        if(!$adminself && ($CFG->{'auth_'.$user->auth.'_stdchangepassword'} || $CFG->changepassword)){
+        if(!$adminself && (isset($CFG->{'auth_'.$user->auth.'_stdchangepassword'}) || $CFG->changepassword)){
              echo "<tr>";
-             echo '<td align=right><p>'.get_string('forcepasswordchange').':</td>';
-             echo '<td><input type="checkbox" name="forcepasswordchange" />'.get_string('forcepasswordchange_help').'</td>';            
+             echo '<td align=right><p>'.get_string('forcechangepassword', 'auth').':</td>';
+             echo '<td><input type="checkbox" name="forcepasswordchange" />'.get_string('forcechangepassword_help','auth').'</td>';            
              echo "</tr>";
          }
                  
         echo "<tr><td colspan=\"2\"><hr /></td></tr>";
     }
 }
+
 ?>
 <tr valign="top">
     <td align="right"><?php print_string("firstname") ?>:</td>