If you leave these blank, then defaults will be used.
In either case, the user will be able to edit all of these fields after they log in.'; +$string['auth_dbextrafields'] = 'These fields are optional. You can choose to pre-fill some Moodle user fields with information from the external database fields that you specify here.
If you leave these blank, then defaults will be used.
In either case, the user will be able to edit all of these fields after they log in.'; $string['auth_dbfieldpass'] = 'Name of the field containing passwords'; $string['auth_dbfielduser'] = 'Name of the field containing usernames'; $string['auth_dbhost'] = 'The computer hosting the database server.'; @@ -14,15 +16,17 @@ $string['auth_dbtable'] = 'Name of the table in the database'; $string['auth_dbtitle'] = 'Use an external database'; $string['auth_dbtype'] = 'The database type (See the ADOdb documentation for details)'; $string['auth_dbuser'] = 'Username with read access to the database'; +$string['auth_editlock'] = 'Lock value'; +$string['auth_editlock_expl'] = '
Lock value: If enabled, will prevent Moodle users and admins from editing the field directly. Use this option if you are maintaining this data in the external auth system.
'; $string['auth_emaildescription'] = 'Email confirmation is the default authentication method. When the user signs up, choosing their own new username and password, a confirmation email is sent to the user\'s email address. This email contains a secure link to a page where the user can confirm their account. Future logins just check the username and password against the stored values in the Moodle database.'; $string['auth_emailtitle'] = 'Email-based authentication'; -$string['auth_fctitle'] = 'Use a FirstClass server'; +$string['auth_fccreators'] = 'List of groups whose members are allowed to create new courses. Separate multiple groups with \';\'. Names must be spelled exactly as on FirstClass server. System is case-sensitive.'; $string['auth_fcdescription'] = 'This method uses a FisrtClass server to check whether a given username and password is valid.'; -$string['auth_fchost'] = 'The FirstClass server address. Use the IP number or DNS name.'; $string['auth_fcfppport'] = 'Server port (3333 is the most common)'; -$string['auth_fcuserid'] = "Userid for FirstClass account with privilege 'Subadministrator' set."; +$string['auth_fchost'] = 'The FirstClass server address. Use the IP number or DNS name.'; $string['auth_fcpasswd'] = 'Password for the account above.'; -$string['auth_fccreators'] = "List of groups whose members are allowed to create new courses. Separate multiple groups with ';'. Names must be spelled exactly as on FirstClass server. System is case-sensitive."; +$string['auth_fctitle'] = 'Use a FirstClass server'; +$string['auth_fcuserid'] = 'Userid for FirstClass account with privilege \'Subadministrator\' set.'; $string['auth_imapdescription'] = 'This method uses an IMAP server to check whether a given username and password is valid.'; $string['auth_imaphost'] = 'The IMAP server address. Use the IP number, not DNS name.'; $string['auth_imapport'] = 'IMAP server port number. Usually this is 143 or 993.'; @@ -30,22 +34,37 @@ $string['auth_imaptitle'] = 'Use an IMAP server'; $string['auth_imaptype'] = 'The IMAP server type. IMAP servers can have different types of authentication and negotiation.'; $string['auth_ldap_bind_dn'] = 'If you want to use bind-user to search users, specify it here. Someting like \'cn=ldapuser,ou=public,o=org\''; $string['auth_ldap_bind_pw'] = 'Password for bind-user.'; +$string['auth_ldap_bind_settings'] = 'Bind settings'; $string['auth_ldap_contexts'] = 'List of contexts where users are located. Separate different contexts with \';\'. For example: \'ou=users,o=org; ou=others,o=org\''; -$string['auth_ldap_create_context'] = 'If you enable user creation with email confirmation, specify the context where users are created. This context should be different from other users to prevent security issues. You don\'t need to add this context to ldap_context-variable, Moodle will search for users from this context automatically.'; +$string['auth_ldap_create_context'] = 'If you enable user creation with email confirmation, specify the context where users are created. This context should be different from other users to prevent security issues. You don\'t need to add this context to ldap_context-variable, Moodle will search for users from this context automatically.If you leave these fields blank, then nothing will be transferred from LDAP and Moodle defaults will be used instead.
In either case, the user will be able to edit all of these fields after they log in.'; +$string['auth_ldapextrafields'] = 'These fields are optional. You can choose to pre-fill some Moodle user fields with information from the LDAP fields that you specify here.
If you leave these fields blank, then nothing will be transferred from LDAP and Moodle defaults will be used instead.
In either case, the user will be able to edit all of these fields after they log in.'; $string['auth_ldaptitle'] = 'Use an LDAP server'; $string['auth_manualdescription'] = 'This method removes any way for users to create their own accounts. All accounts must be manually created by the admin user.'; $string['auth_manualtitle'] = 'Manual accounts only'; @@ -56,14 +75,21 @@ $string['auth_nntpport'] = 'Server port (119 is the most common)'; $string['auth_nntptitle'] = 'Use an NNTP server'; $string['auth_nonedescription'] = 'Users can sign in and create valid accounts immediately, with no authentication against an external server and no confirmation via email. Be careful using this option - think of the security and administration problems this could cause.'; $string['auth_nonetitle'] = 'No authentication'; -$string['auth_pamtitle'] = 'PAM (Pluggable Authentication Modules)'; $string['auth_pamdescription'] = 'This method uses PAM to access the native usernames on this server. You have to install PHP4 PAM Authentication in order to use this module.'; +$string['auth_pamtitle'] = 'PAM (Pluggable Authentication Modules)'; +$string['auth_passwordwillexpire'] = 'Your password will expire in $a days. Do you want change your password now?'; +$string['auth_passwordisexpired'] = 'Your password is expired. Do you want change your password now?'; $string['auth_pop3description'] = 'This method uses a POP3 server to check whether a given username and password is valid.'; $string['auth_pop3host'] = 'The POP3 server address. Use the IP number, not DNS name.'; $string['auth_pop3mailbox'] = 'Name of the mailbox to attempt a connection with. (usually INBOX)'; $string['auth_pop3port'] = 'Server port (110 is the most common, 995 is common for SSL)'; $string['auth_pop3title'] = 'Use a POP3 server'; $string['auth_pop3type'] = 'Server type. If your server uses certificate security, choose pop3cert.'; +$string['auth_updatelocal'] = 'Update local data'; +$string['auth_updatelocal_expl'] = '
Update local data: If enabled, the field will be updated (from external auth) every time the user logs in or there is a user synchronization. Fields set to update locally should be locked.
'; +$string['auth_updateremote'] = 'Update external data'; +$string['auth_updateremote_expl'] = 'Update external data: If enabled, the external auth will be updated when the user record is updated. Fields should be unlocked to allow edits.
'; +$string['auth_updateremote_ldap'] = 'Note: Updating external LDAP data requires that you set binddn and bindpw to a bind-user with editing privileges to all the user records. It currently does not preserve multi-valued attributes, and will remove extra values on update.
'; $string['auth_user_create'] = 'Enable user creation'; $string['auth_user_creation'] = 'New (anonymous) users can create user accounts on the external authentication source and confirmed via email. If you enable this , remember to also configure module-specific options for user creation.'; $string['auth_usernameexists'] = 'Selected username already exists. Please choose a new one.'; @@ -72,10 +98,16 @@ $string['authinstructions'] = 'Here you can provide instructions for your users, $string['changepassword'] = 'Change password URL'; $string['changepasswordhelp'] = 'Here you can specify a location at which your users can recover or change their username/password if they\'ve forgotten it. This will be provided to users as a button on the login page and their user page. if you leave this blank the button will not be printed.'; $string['chooseauthmethod'] = 'Choose an authentication method: '; +$string['forcechangepassword'] = 'Force change password'; +$string['forcechangepassword_help'] = 'Force users to change password on their next login to Moodle.'; +$string['forcechangepasswordfirst_help'] = 'Force users to change password on their first login to Moodle.'; $string['guestloginbutton'] = 'Guest login button'; $string['instructions'] = 'Instructions'; $string['md5'] = 'MD5 encryption'; $string['plaintext'] = 'Plain text'; $string['showguestlogin'] = 'You can hide or show the guest login button on the login page.'; +$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.'; ?> diff --git a/lang/en/block_course_list.php b/lang/en/block_course_list.php index 570f6794c2a..2be986b4e00 100644 --- a/lang/en/block_course_list.php +++ b/lang/en/block_course_list.php @@ -1,4 +1,4 @@ - diff --git a/lang/en/block_online_users.php b/lang/en/block_online_users.php index bae12c3feea..356a0ae70c1 100644 --- a/lang/en/block_online_users.php +++ b/lang/en/block_online_users.php @@ -1,4 +1,4 @@ - diff --git a/lang/en/chat.php b/lang/en/chat.php index 47b6dd70744..d82b00d3798 100644 --- a/lang/en/chat.php +++ b/lang/en/chat.php @@ -1,4 +1,4 @@ -userfrom has posted a new entry in your -dialogue entry for \'$a->dialogue\' - -You can see it appended to your dialogue entry: - +$string['dialoguemail'] = '$a->userfrom has posted a new entry in your + +dialogue entry for \'$a->dialogue\' + + + +You can see it appended to your dialogue entry: + + + $a->url'; -$string['dialoguemailhtml'] = '$a->userfrom has posted a new entry in your -dialogue entry for \'$a->dialogue\'I've been working on it, in some way or other, for several years. It - started in the 90's when I was webmaster at Curtin + started in the 90's when I was webmaster at Curtin University of Technology and a system administrator of their WebCT installation. I encountered many frustrations with the WebCT beast and developed an itch that needed scratching - there had to be a better way (no, not Blackboard diff --git a/lang/en/docs/coding.html b/lang/en/docs/coding.html index a64537b73ab..cdd53a4a5ce 100755 --- a/lang/en/docs/coding.html +++ b/lang/en/docs/coding.html @@ -74,13 +74,13 @@ meaningful lowercase English words. If you really need more than one word then run them together, but keep them short as possible. Use plural names for arrays of objects. -
GOOD: $quiz
- GOOD: $errorstring
-GOOD: $assignments (for an array of objects)
- GOOD: $i (but only in little loops)
+GOOD: $quiz
+ GOOD: $errorstring
+GOOD: $assignments (for an array of objects)
+ GOOD: $i (but only in little loops)
- BAD: $Quiz
- BAD: $aReallyLongVariableNameWithoutAGoodReason
+ BAD: $Quiz
+ BAD: $aReallyLongVariableNameWithoutAGoodReason
BAD: $error_stringConstants should always be in upper case, @@ -93,7 +93,7 @@ GOOD: $assignments (for an array of objects)
lowercase words, and start with the name of the module to avoid conflicts between modules. Words should be separated by underscores. Parameters should always have sensible defaults if possible. Note there is no space between the function name and - the following (brackets).
+ the following (brackets).
function forum_set_display_mode($mode=0) {
global $USER, @@ -123,11 +123,11 @@ GOOD: $assignments (for an array of objects)
}Strings should be defined using single quotes - where possible, for increased speed.
+ where possible, for increased speed.
$var = 'some text without any - variables';
- $var = "with special characters like a new line \n";
- $var = 'a very, very long string with a '.$single.' variable in it';
+ variables';
+ $var = "with special characters like a new line \n";
+ $var = 'a very, very long string with a '.$single.' variable in it';
$var = "some $text with $many variables $within it";Comments should use two or three slashes @@ -148,37 +148,37 @@ GOOD: $assignments (for an array of objects) $rates = get_records("forum_ratings", "post", $postid)) - {
if (
+ {
// Process each rating in turn
foreach ($rates as $rate) - {
+ {
....etcSpace should be used liberally - don't be afraid to spread things out a little to gain some clarity. Generally, there should be one space between brackets and normal statements, but no space between - brackets and variables or functions: @@ -199,7 +199,7 @@ GOOD: $assignments (for an array of objects)
+ brackets and variables or functions:
foreach ($objects as $key => - $thing) {
+ $thing) {
process($thing); -
- }
-
+
+ }
+
if ($x == $y) - {
+ {
$a - = $b;
+ = $b;
} else if ($x == - $z) {
+ $z) {
$a - = $c;
- } else {
+ = $c;
+ } else {
$a - = $d;
+ = $d;
}
Boolean fields should be implemented as small integer fields (eg INT4) containing 0 or 1, to allow for later expansion of values if necessary. Most tables should have a timemodified field (INT10) which is updated with a current timestamp obtained with the PHP time() function. -
+
Version: $Id$