Index: openacs-4/packages/acs-bootstrap-installer/installer/create-administrator.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/installer/Attic/create-administrator.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-bootstrap-installer/installer/create-administrator.tcl 22 Sep 2003 08:45:46 -0000 1.3 +++ openacs-4/packages/acs-bootstrap-installer/installer/create-administrator.tcl 25 Sep 2003 10:32:19 -0000 1.4 @@ -47,10 +47,7 @@ </tr> <tr> <th align=right>Username:</th> - <td><input name=username size=20><br> - Once your server is installed, you can choose to have users login with username instead of email. - This is particularly useful if you're authenticating against other services, such as LDAP or the - local operating system, which may not use email as the basis of authentication. +<td><input name=username size=20> <span style=\"color: red;\">\[*\]</span> </td> </tr> <tr> @@ -75,6 +72,13 @@ </table> </blockquote> +<h4>\[*\] About username</h4> + +<p> + Once your server is installed, you can choose to have users login with username instead of email. + This is particularly useful if you're authenticating against other services, such as LDAP or the + local operating system, which may not use email as the basis of authentication. +</p> " install_return 200 "Create Administrator" $body Index: openacs-4/packages/acs-bootstrap-installer/tcl/10-utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-bootstrap-installer/tcl/10-utilities-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/acs-bootstrap-installer/tcl/10-utilities-procs.tcl 25 Sep 2003 09:58:57 -0000 1.5 +++ openacs-4/packages/acs-bootstrap-installer/tcl/10-utilities-procs.tcl 25 Sep 2003 10:32:19 -0000 1.6 @@ -78,3 +78,10 @@ # one serving the create-administrator-2 page. return [db_string local_auth { select authority_id from auth_authorities where short_name = 'local' }] } + +ad_proc -public auth::UseEmailForLoginP {} { + Do we use email address for login? code wrapped in a catch, so the + proc will not break regardless of what the parameter value is. +} { + return 0 +}