version 1.44, 2008/02/29 19:07:06
|
version 1.45, 2008/02/29 21:01:36
|
Line 1300 sub print_directorysrch {
|
Line 1300 sub print_directorysrch {
|
} |
} |
} |
} |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($searchtitles,$titleorder) = &sorted_searchtitles(); |
my ($othertitle,$usertypes,$types) = &Apache::Loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
|
my $numinrow = 4; |
my $numinrow = 4; |
my $cansrchrow = 0; |
my $cansrchrow = 0; |
Line 1509 sub print_usercreation {
|
Line 1509 sub print_usercreation {
|
$rowcount ++; |
$rowcount ++; |
} |
} |
} elsif ($position eq 'middle') { |
} elsif ($position eq 'middle') { |
my @creators = ('author','course','selfenroll'); |
my @creators = ('author','course','selfcreate'); |
my ($rules,$ruleorder) = |
my ($rules,$ruleorder) = |
&Apache::lonnet::inst_userrules($dom,'username'); |
&Apache::lonnet::inst_userrules($dom,'username'); |
my %lt = &usercreation_types(); |
my %lt = &usercreation_types(); |
Line 1531 sub print_usercreation {
|
Line 1531 sub print_usercreation {
|
foreach my $item (@creators) { |
foreach my $item (@creators) { |
$rownum ++; |
$rownum ++; |
if ($checked{$item} eq '') { |
if ($checked{$item} eq '') { |
if ($item eq 'selfenroll') { |
if ($item eq 'selfcreate') { |
$checked{$item} = 'none'; |
$checked{$item} = 'none'; |
} else { |
} else { |
$checked{$item} = 'any'; |
$checked{$item} = 'any'; |
Line 1547 sub print_usercreation {
|
Line 1547 sub print_usercreation {
|
'<td><span class="LC_nobreak">'.$lt{$item}. |
'<td><span class="LC_nobreak">'.$lt{$item}. |
'</span></td><td align="right">'; |
'</span></td><td align="right">'; |
my @options = ('any'); |
my @options = ('any'); |
if ($item eq 'selfenroll') { |
if ($item eq 'selfcreate') { |
push(@options,('email','login','sso')); |
push(@options,('email','login','sso')); |
} else { |
} else { |
if (ref($rules) eq 'HASH') { |
if (ref($rules) eq 'HASH') { |
Line 1626 sub user_formats_row {
|
Line 1626 sub user_formats_row {
|
my %text = ( |
my %text = ( |
'username' => 'new usernames', |
'username' => 'new usernames', |
'id' => 'IDs', |
'id' => 'IDs', |
'email' => 'e-mail addresses of self-enrollers', |
'email' => 'self-created accounts (e-mail)', |
); |
); |
my $css_class = $rowcount%2?' class="LC_odd_row"':''; |
my $css_class = $rowcount%2?' class="LC_odd_row"':''; |
$output = '<tr '.$css_class.'>'. |
$output = '<tr '.$css_class.'>'. |
Line 1677 sub usercreation_types {
|
Line 1677 sub usercreation_types {
|
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
author => 'When adding a co-author', |
author => 'When adding a co-author', |
course => 'When adding a user to a course', |
course => 'When adding a user to a course', |
selfenroll => 'When a user is self-enrolling', |
selfcreate => 'User creates own account', |
any => 'Any', |
any => 'Any', |
official => 'Institutional only ', |
official => 'Institutional only ', |
unofficial => 'Non-institutional only', |
unofficial => 'Non-institutional only', |
Line 3181 sub modify_usercreation {
|
Line 3181 sub modify_usercreation {
|
my @username_rule = &Apache::loncommon::get_env_multiple('form.username_rule'); |
my @username_rule = &Apache::loncommon::get_env_multiple('form.username_rule'); |
my @id_rule = &Apache::loncommon::get_env_multiple('form.id_rule'); |
my @id_rule = &Apache::loncommon::get_env_multiple('form.id_rule'); |
my @email_rule = &Apache::loncommon::get_env_multiple('form.email_rule'); |
my @email_rule = &Apache::loncommon::get_env_multiple('form.email_rule'); |
my @contexts = ('author','course','selfenroll'); |
my @contexts = ('author','course','selfcreate'); |
foreach my $item(@contexts) { |
foreach my $item(@contexts) { |
$cancreate{$item} = $env{'form.can_createuser_'.$item}; |
$cancreate{$item} = $env{'form.can_createuser_'.$item}; |
if ($item eq 'selfenroll') { |
if ($item eq 'selfcreate') { |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom); |
if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth'))) { |
if (!((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth'))) { |
if (($cancreate{$item} eq 'any') || ($cancreate{$item} eq 'login')) { |
if (($cancreate{$item} eq 'any') || ($cancreate{$item} eq 'login')) { |
Line 3311 sub modify_usercreation {
|
Line 3311 sub modify_usercreation {
|
my %lt = &usercreation_types(); |
my %lt = &usercreation_types(); |
foreach my $type (@{$changes{'cancreate'}}) { |
foreach my $type (@{$changes{'cancreate'}}) { |
my $chgtext = $lt{$type}.', '; |
my $chgtext = $lt{$type}.', '; |
if ($type eq 'selfenroll') { |
if ($type eq 'selfcreate') { |
if ($cancreate{$type} eq 'none') { |
if ($cancreate{$type} eq 'none') { |
$chgtext .= &mt('creation of a new user account is not permitted.'); |
$chgtext .= &mt('creation of a new user account is not permitted.'); |
} elsif ($cancreate{$type} eq 'any') { |
} elsif ($cancreate{$type} eq 'any') { |