From 6e45da59d1ef3f8291d11764769fe48479b798ac Mon Sep 17 00:00:00 2001
From: martinlanghoff <martinlanghoff>
Date: Mon, 16 Jan 2006 02:54:56 +0000
Subject: [PATCH] auth/db and password-generation - required strings.

---
 lang/en/auth.php   |  5 ++---
 lang/en/moodle.php | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lang/en/auth.php b/lang/en/auth.php
index 9f42d013771..88e94f125b0 100644
--- a/lang/en/auth.php
+++ b/lang/en/auth.php
@@ -30,7 +30,7 @@ $string['auth_dbfielduser'] = 'Name of the field containing usernames';
 $string['auth_dbhost'] = 'The computer hosting the database server.';
 $string['auth_dbname'] = 'Name of the database itself';
 $string['auth_dbpass'] = 'Password matching the above username';
-$string['auth_dbpasstype'] = 'Specify the format that the password field is using.  MD5 encryption is useful for connecting to other common web applications like PostNuke';
+$string['auth_dbpasstype'] = '<p>Specify the format that the password field is using. MD5 encryption is useful for connecting to other common web applications like PostNuke.</p> <p>Use \'internal\' if you want to the external DB to manage usernames & email addresses, but Moodle to manage passwords. If you use \'internal\', you <i>must</i> provide a populated email address field in the external DB, and you must execute auth/db/cron.php regularly. Moodle will send an email to new users with a temporary password.</p>'; 
 $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 <a href=\"../lib/adodb/readme.htm#drivers\">ADOdb documentation</a> for details)';
@@ -133,8 +133,6 @@ $string['auth_user_creation'] = 'New (anonymous) users can create user accounts
 $string['auth_usernameexists'] = 'Selected username already exists. Please choose a new one.';
 $string['authenticationoptions'] = 'Authentication options';
 $string['authinstructions'] = 'Here you can provide instructions for your users, so they know which username and password they should be using.  The text you enter here will appear on the login page.  If you leave this blank then no instructions will be printed.';
-$string['createpassword'] = 'Create if missing';
-$string['createchangepassword'] = 'Create if missing - force change';
 $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';
@@ -144,6 +142,7 @@ $string['forcechangepassword_help'] = 'Force users to change password on their n
 $string['forcechangepasswordfirst_help'] = 'Force users to change password on their first login to Moodle.';
 $string['guestloginbutton'] = 'Guest login button';
 $string['instructions'] = 'Instructions';
+$string['internal'] = 'Internal';
 $string['md5'] = 'MD5 encryption';
 $string['passwordhandling'] = 'Password field handling';
 $string['plaintext'] = 'Plain text';
diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index 3b97812445a..f1656b77b6d 100644
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -848,6 +848,28 @@ $string['newsitems'] = 'news items';
 $string['newsitemsnumber'] = 'News items to show';
 $string['newuser'] = 'New user';
 $string['newusers'] = 'New users';
+$string['newusernewpasswordtext'] = 'Hi $a->firstname,
+
+A new account has been created for you at \'$a->sitename\' 
+and you have been issued with a new temporary password.
+
+Your current login information is now:
+   username: $a->username
+   password: $a->newpassword
+             (you will have to change your password 
+              when you login for the first time)
+
+To start using \'$a->sitename\', login at 
+   $a->link
+
+In most mail programs, this should appear as a blue link
+which you can just click on.  If that doesn\'t work,
+then cut and paste the address into the address
+line at the top of your web browser window.
+
+Cheers from the \'$a->sitename\' administrator,
+$a->signoff';
+$string['newusernewpasswordsubj'] = 'New user account';
 $string['next'] = 'Next';
 $string['no'] = 'No';
 $string['nobody'] = 'Nobody';