Permalink
Browse files

Tweaks to authentication system. Database method now allows other

fields to be specified so that things like email, names etc can be
pulled in from external database when new Moodle accounts are created
  • Loading branch information...
moodler
moodler committed Nov 21, 2002
1 parent 780db23 commit 34daec9b3b8a3f4fcfe2db97e4e3b43097be6db5
Showing with 186 additions and 65 deletions.
  1. +3 −1 admin/auth.php
  2. +97 −9 auth/db/config.html
  3. +31 −0 auth/db/lib.php
  4. +4 −4 auth/imap/config.html
  5. +1 −1 auth/ldap/config.html
  6. +3 −3 auth/nntp/config.html
  7. +4 −4 auth/pop3/config.html
  8. +40 −42 lang/en/auth.php
  9. +2 −0 lang/en/moodle.php
  10. +1 −1 lib/moodlelib.php
View
@@ -104,7 +104,9 @@
require("$CFG->dirroot/auth/$auth/config.html");
echo "<tr valign=\"top\">";
- echo "<td align=right><p>guestloginbutton:</p></td>";
+ echo "<td align=right nowrap><p>";
+ print_string("guestloginbutton", "auth");
+ echo ":</p></td>";
echo "<td>";
choose_from_menu($guestoptions, "guestloginbutton", $config->guestloginbutton, "");
echo "</td>";
View
@@ -1,4 +1,4 @@
-<tr valign="top">
+<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_dbhost:</TD>
<TD>
<INPUT name=auth_dbhost TYPE=text SIZE=30 VALUE="<?=$config->auth_dbhost?>">
@@ -9,7 +9,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_dbtype:</TD>
<TD>
<? $dbtypes = array("access","ado_access", "ado", "ado_mssql", "borland_ibase", "csv", "db2", "fbsql", "firebird", "ibase", "informix72", "informix", "mssql", "mysql", "mysqlt", "oci805", "oci8", "oci8po", "odbc", "odbc_mssql", "odbc_oracle", "oracle", "postgres64", "postgres7", "postgres", "proxy", "sqlanywhere", "sybase", "vfp");
@@ -22,7 +22,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_dbname:</TD>
<TD>
<INPUT name=auth_dbname TYPE=text SIZE=30 VALUE="<?=$config->auth_dbname?>">
@@ -33,7 +33,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_dbuser:</TD>
<TD>
<INPUT name=auth_dbuser TYPE=text SIZE=30 VALUE="<?=$config->auth_dbuser?>">
@@ -44,7 +44,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_dbpass:</TD>
<TD>
<INPUT name="auth_dbpass" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbpass?>">
@@ -55,7 +55,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_dbtable:</TD>
<TD>
<INPUT name="auth_dbtable" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbtable?>">
@@ -66,7 +66,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_dbfielduser:</TD>
<TD>
<INPUT name="auth_dbfielduser" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbfielduser?>">
@@ -77,7 +77,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_dbfieldpass:</TD>
<TD>
<INPUT name="auth_dbfieldpass" TYPE="text" SIZE="30" VALUE="<?=$config->auth_dbfieldpass?>">
@@ -88,8 +88,96 @@
</TD>
</TR>
+<TR>
+ <TD ALIGN=RIGHT><P><? print_string("firstname") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_firstname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_firstname?>">
+ </TD>
+ <TD rowspan=12 VALIGN=CENTER>
+ <? print_string("auth_dbextrafields","auth") ?>
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("lastname") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_lastname" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lastname?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("email") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_email" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_email?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("phone") ?> 1:</TD>
+ <TD>
+ <INPUT name="auth_user_phone1" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone1?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("phone") ?> 2:</TD>
+ <TD>
+ <INPUT name="auth_user_phone2" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_phone2?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("department") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_department" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_department?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("address") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_address" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_address?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("city") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_city" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_city?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("country") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_country" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_country?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("description") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_description" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_description?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("idnumber") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_idnumber" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_idnumber?>">
+ </TD>
+</TR>
+
+<TR VALIGN=TOP>
+ <TD ALIGN=RIGHT><P><? print_string("language") ?>:</TD>
+ <TD>
+ <INPUT name="auth_user_lang" TYPE="text" SIZE="30" VALUE="<?=$config->auth_user_lang?>">
+ </TD>
+</TR>
+
+
<TR VALIGN=TOP>
- <TD ALIGN=RIGHT><P>auth_instructions:</TD>
+ <TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
<TD>
<TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA>
</TD>
View
@@ -32,4 +32,35 @@ function auth_user_login ($username, $password) {
}
+function auth_get_userinfo($username){
+// Reads any other information for a user from external database,
+// then returns it in an array
+
+ global $CFG;
+ $config = (array) $CFG;
+
+ ADOLoadCode($CFG->auth_dbtype);
+ $authdb = &ADONewConnection();
+ $authdb->PConnect($CFG->auth_dbhost,$CFG->auth_dbuser,$CFG->auth_dbpass,$CFG->auth_dbname);
+
+ $fields = array("firstname", "lastname", "email", "phone1", "phone2",
+ "department", "address", "city", "country", "description",
+ "idnumber", "lang");
+
+ $result = array();
+
+ foreach ($fields as $field) {
+ if ($config["auth_user_$field"]) {
+ if ($rs = $authdb->Execute("SELECT ".$config["auth_user_$field"]." FROM $CFG->auth_dbtable
+ WHERE $CFG->auth_dbfielduser = '$username'")) {
+ if ( $rs->RecordCount() == 1 ) {
+ $result["$field"] = $rs->fields[$config["auth_user_$field"]];
+ }
+ }
+ }
+ }
+
+ return $result;
+}
+
?>
View
@@ -1,4 +1,4 @@
-<tr valign="top">
+<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_imaphost:</TD>
<TD>
<INPUT name=auth_imaphost TYPE=text SIZE=30 VALUE="<?=$config->auth_imaphost?>">
@@ -9,7 +9,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_imaptype:</TD>
<TD>
<? $imaptypes = array("imap","imapssl", "imapcert", "imaptls");
@@ -21,7 +21,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_imapport:</TD>
<TD>
<INPUT name=auth_imapport TYPE=text SIZE=6 VALUE="<?=$config->auth_imapport?>">
@@ -33,7 +33,7 @@
</TR>
<TR VALIGN=TOP>
- <TD ALIGN=RIGHT><P>auth_instructions:</TD>
+ <TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
<TD>
<TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA>
</TD>
View
@@ -63,7 +63,7 @@
</TR>
<TR VALIGN=TOP>
- <TD ALIGN=RIGHT><P>auth_instructions:</TD>
+ <TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
<TD>
<TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA>
</TD>
View
@@ -1,4 +1,4 @@
-<tr valign="top">
+<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_nntphost:</TD>
<TD>
<INPUT name="auth_nntphost" TYPE="text" SIZE=30 VALUE="<?=$config->auth_nntphost?>">
@@ -9,7 +9,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_nntpport:</TD>
<TD>
<INPUT name=auth_imapport TYPE=text SIZE=6 VALUE="<?=$config->auth_nntpport?>">
@@ -21,7 +21,7 @@
</TR>
<TR VALIGN=TOP>
- <TD ALIGN=RIGHT><P>auth_instructions:</TD>
+ <TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
<TD>
<TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA>
</TD>
View
@@ -1,4 +1,4 @@
-<tr valign="top">
+<tr valign="top" BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_pop3host:</TD>
<TD>
<INPUT name=auth_pop3host TYPE=text SIZE=30 VALUE="<?=$config->auth_pop3host?>">
@@ -9,7 +9,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_pop3type:</TD>
<TD>
<? $pop3types = array("pop3","pop3cert");
@@ -22,7 +22,7 @@
</TD>
</TR>
-<TR VALIGN=TOP>
+<TR VALIGN=TOP BGCOLOR="<?=$THEME->cellheading2 ?>">
<TD ALIGN=RIGHT><P>auth_pop3port:</TD>
<TD>
<INPUT name=auth_pop3port TYPE=text SIZE=6 VALUE="<?=$config->auth_pop3port?>">
@@ -34,7 +34,7 @@
</TR>
<TR VALIGN=TOP>
- <TD ALIGN=RIGHT><P>auth_instructions:</TD>
+ <TD ALIGN=RIGHT><P><? print_string("instructions", "auth") ?>:</TD>
<TD>
<TEXTAREA NAME=auth_instructions COLS=30 ROWS=10 WRAP=virtual><? p($config->auth_instructions) ?></TEXTAREA>
</TD>
Oops, something went wrong.

0 comments on commit 34daec9

Please sign in to comment.