version 1.406.2.15, 2018/09/14 14:57:52
|
version 1.452, 2019/08/27 14:42:57
|
Line 78 my $authformkrb;
|
Line 78 my $authformkrb;
|
my $authformint; |
my $authformint; |
my $authformfsys; |
my $authformfsys; |
my $authformloc; |
my $authformloc; |
|
my $authformlti; |
|
|
sub initialize_authen_forms { |
sub initialize_authen_forms { |
my ($dom,$formname,$curr_authtype,$mode) = @_; |
my ($dom,$formname,$curr_authtype,$mode) = @_; |
Line 88 sub initialize_authen_forms {
|
Line 89 sub initialize_authen_forms {
|
domain => $dom, |
domain => $dom, |
); |
); |
my %abv_auth = &auth_abbrev(); |
my %abv_auth = &auth_abbrev(); |
if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):(.*)$/) { |
if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix|lti):(.*)$/) { |
my $long_auth = $1; |
my $long_auth = $1; |
my $curr_autharg = $2; |
my $curr_autharg = $2; |
my %abv_auth = &auth_abbrev(); |
my %abv_auth = &auth_abbrev(); |
Line 107 sub initialize_authen_forms {
|
Line 108 sub initialize_authen_forms {
|
$authformint = &Apache::loncommon::authform_internal(%param); |
$authformint = &Apache::loncommon::authform_internal(%param); |
$authformfsys = &Apache::loncommon::authform_filesystem(%param); |
$authformfsys = &Apache::loncommon::authform_filesystem(%param); |
$authformloc = &Apache::loncommon::authform_local(%param); |
$authformloc = &Apache::loncommon::authform_local(%param); |
|
$authformlti = &Apache::loncommon::authform_lti(%param); |
} |
} |
|
|
sub auth_abbrev { |
sub auth_abbrev { |
Line 116 sub auth_abbrev {
|
Line 118 sub auth_abbrev {
|
internal => 'int', |
internal => 'int', |
localauth => 'loc', |
localauth => 'loc', |
unix => 'fsys', |
unix => 'fsys', |
|
lti => 'lti', |
); |
); |
return %abv_auth; |
return %abv_auth; |
} |
} |
Line 252 sub build_tools_display {
|
Line 255 sub build_tools_display {
|
'unofficial' => 'Can request creation of unofficial courses', |
'unofficial' => 'Can request creation of unofficial courses', |
'community' => 'Can request creation of communities', |
'community' => 'Can request creation of communities', |
'textbook' => 'Can request creation of textbook courses', |
'textbook' => 'Can request creation of textbook courses', |
|
'placement' => 'Can request creation of placement tests', |
|
'lti' => 'Can request creation of LTI courses', |
'requestauthor' => 'Can request author space', |
'requestauthor' => 'Can request author space', |
); |
); |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
'requestcourses.official','requestcourses.unofficial', |
'requestcourses.official','requestcourses.unofficial', |
'requestcourses.community','requestcourses.textbook'); |
'requestcourses.community','requestcourses.textbook', |
@usertools = ('official','unofficial','community','textbook'); |
'requestcourses.placement','requestcourses.lti'); |
|
@usertools = ('official','unofficial','community','textbook','placement','lti'); |
@options =('norequest','approval','autolimit','validate'); |
@options =('norequest','approval','autolimit','validate'); |
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); |
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); |
%reqtitles = &courserequest_titles(); |
%reqtitles = &courserequest_titles(); |
Line 333 sub build_tools_display {
|
Line 339 sub build_tools_display {
|
' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n". |
' <td'.$colspan.'>'.$lt{$item}.'</td>'."\n". |
' </tr>'."\n". |
' </tr>'."\n". |
&Apache::loncommon::start_data_table_row()."\n"; |
&Apache::loncommon::start_data_table_row()."\n"; |
|
|
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) { |
my ($curroption,$currlimit); |
my ($curroption,$currlimit); |
my $envkey = $context.'.'.$item; |
my $envkey = $context.'.'.$item; |
Line 451 sub coursereq_externaluser {
|
Line 458 sub coursereq_externaluser {
|
'unofficial' => 'Can request creation of unofficial courses', |
'unofficial' => 'Can request creation of unofficial courses', |
'community' => 'Can request creation of communities', |
'community' => 'Can request creation of communities', |
'textbook' => 'Can request creation of textbook courses', |
'textbook' => 'Can request creation of textbook courses', |
|
'placement' => 'Can request creation of placement tests', |
); |
); |
|
|
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'reqcrsotherdom.community','reqcrsotherdom.textbook'); |
'reqcrsotherdom.community','reqcrsotherdom.textbook', |
@usertools = ('official','unofficial','community','textbook'); |
'reqcrsotherdom.placement'); |
|
@usertools = ('official','unofficial','community','textbook','placement'); |
@options = ('approval','validate','autolimit'); |
@options = ('approval','validate','autolimit'); |
%validations = &Apache::lonnet::auto_courserequest_checks($cdom); |
%validations = &Apache::lonnet::auto_courserequest_checks($cdom); |
my $optregex = join('|',@options); |
my $optregex = join('|',@options); |
Line 537 sub courserequest_titles {
|
Line 546 sub courserequest_titles {
|
unofficial => 'Unofficial', |
unofficial => 'Unofficial', |
community => 'Communities', |
community => 'Communities', |
textbook => 'Textbook', |
textbook => 'Textbook', |
|
placement => 'Placement Tests', |
|
lti => 'LTI Provider', |
norequest => 'Not allowed', |
norequest => 'Not allowed', |
approval => 'Approval by Dom. Coord.', |
approval => 'Approval by Dom. Coord.', |
validate => 'With validation', |
validate => 'With validation', |
Line 880 ENDBLOCK
|
Line 891 ENDBLOCK
|
(!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && |
(!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && |
(!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) { |
(!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) { |
my $defdom=$env{'request.role.domain'}; |
my $defdom=$env{'request.role.domain'}; |
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); |
my ($trusted,$untrusted); |
|
if ($context eq 'course') { |
|
($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom); |
|
} elsif ($context eq 'author') { |
|
($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom); |
|
} elsif ($context eq 'domain') { |
|
($trusted,$untrusted) = &Apache::lonnet::trusted_domains('domroles',$defdom); |
|
} |
|
my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain',undef,undef,undef,$trusted,$untrusted); |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'enro' => 'Enroll one student', |
'enro' => 'Enroll one student', |
'enrm' => 'Enroll one member', |
'enrm' => 'Enroll one member', |
Line 1465 ENDAUTH
|
Line 1484 ENDAUTH
|
$inst_results{$ccuname.':'.$ccdomain})); |
$inst_results{$ccuname.':'.$ccdomain})); |
if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || |
if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || |
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) { |
(&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) { |
$r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'. |
$r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'."\n"); |
&Apache::loncommon::start_data_table()); |
if (($env{'request.role.domain'} eq $ccdomain) || |
if ($env{'request.role.domain'} eq $ccdomain) { |
(&Apache::lonnet::will_trust('reqcrs',$ccdomain,$env{'request.role.domain'}))) { |
$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); |
$r->print(&Apache::loncommon::start_data_table()); |
|
if ($env{'request.role.domain'} eq $ccdomain) { |
|
$r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); |
|
} else { |
|
$r->print(&coursereq_externaluser($ccuname,$ccdomain, |
|
$env{'request.role.domain'})); |
|
} |
|
$r->print(&Apache::loncommon::end_data_table()); |
} else { |
} else { |
$r->print(&coursereq_externaluser($ccuname,$ccdomain, |
$r->print(&mt('Domain configuration for this domain prohibits course creation by users from domain: "[_1]"', |
$env{'request.role.domain'})); |
&Apache::lonnet::domain($ccdomain,'description'))); |
} |
} |
$r->print(&Apache::loncommon::end_data_table()); |
|
} |
} |
$r->print('</div>'); |
$r->print('</div>'); |
my @order = ('auth','quota','tools','requestauthor'); |
my @order = ('auth','quota','tools','requestauthor'); |
Line 1486 ENDAUTH
|
Line 1511 ENDAUTH
|
($env{'request.role.domain'} eq $ccdomain)) { |
($env{'request.role.domain'} eq $ccdomain)) { |
$user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); |
$user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); |
} |
} |
$user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname); |
$user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission); |
if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || |
if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || |
(&Apache::lonnet::allowed('mut',$ccdomain)) || |
(&Apache::lonnet::allowed('mut',$ccdomain)) || |
(&Apache::lonnet::allowed('udp',$ccdomain))) { |
(&Apache::lonnet::allowed('udp',$ccdomain))) { |
Line 2129 sub new_domain_roles {
|
Line 2154 sub new_domain_roles {
|
'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. |
'<th>'.&mt('Start').'</th><th>'.&mt('End').'</th>'. |
&Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
my @allroles = &Apache::lonuserutils::roles_by_context('domain'); |
my @allroles = &Apache::lonuserutils::roles_by_context('domain'); |
|
my $uprimary = &Apache::lonnet::domain($env{'request.role.domain'},'primary'); |
|
my $uintdom = &Apache::lonnet::internet_dom($uprimary); |
foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { |
foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { |
foreach my $role (@allroles) { |
foreach my $role (@allroles) { |
next if ($role eq 'ad'); |
next if ($role eq 'ad'); |
next if (($role eq 'au') && ($ccdomain ne $thisdomain)); |
next if (($role eq 'au') && ($ccdomain ne $thisdomain)); |
if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { |
if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { |
|
if ($role eq 'dc') { |
|
unless ($thisdomain eq $env{'request.role.domain'}) { |
|
my $domprim = &Apache::lonnet::domain($thisdomain,'primary'); |
|
my $intdom = &Apache::lonnet::internet_dom($domprim); |
|
next unless ($uintdom eq $intdom); |
|
} |
|
} |
my $plrole=&Apache::lonnet::plaintext($role); |
my $plrole=&Apache::lonnet::plaintext($role); |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'ssd' => "Set Start Date", |
'ssd' => "Set Start Date", |
Line 2164 sub new_domain_roles {
|
Line 2198 sub new_domain_roles {
|
} |
} |
|
|
sub user_authentication { |
sub user_authentication { |
my ($ccuname,$ccdomain,$formname) = @_; |
my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_; |
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); |
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); |
my $outcome; |
my $outcome; |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
Line 2175 sub user_authentication {
|
Line 2209 sub user_authentication {
|
'ld' => "Login Data" |
'ld' => "Login Data" |
); |
); |
# Check for a bad authentication type |
# Check for a bad authentication type |
if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { |
if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth|lti):/) { |
# bad authentication scheme |
# bad authentication scheme |
if (&Apache::lonnet::allowed('mau',$ccdomain)) { |
if (&Apache::lonnet::allowed('mau',$ccdomain)) { |
&initialize_authen_forms($ccdomain,$formname); |
&initialize_authen_forms($ccdomain,$formname); |
Line 2202 $lt{'uuas'} ($currentauth). $lt{'adcs'}.
|
Line 2236 $lt{'uuas'} ($currentauth). $lt{'adcs'}.
|
ENDBADAUTH |
ENDBADAUTH |
} |
} |
} else { # Authentication type is valid |
} else { # Authentication type is valid |
|
|
&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser'); |
&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser'); |
my ($authformcurrent,$can_modify,@authform_others) = |
my ($authformcurrent,$can_modify,@authform_others) = |
&modify_login_block($ccdomain,$currentauth); |
&modify_login_block($ccdomain,$currentauth); |
Line 2236 ENDBADAUTH
|
Line 2271 ENDBADAUTH
|
} |
} |
$outcome .= &Apache::loncommon::end_data_table(); |
$outcome .= &Apache::loncommon::end_data_table(); |
} else { |
} else { |
|
if (($currentauth =~ /^internal:/) && |
|
(&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) { |
|
$outcome = <<"ENDJS"; |
|
<script type="text/javascript"> |
|
// <![CDATA[ |
|
function togglePwd(form) { |
|
if (form.newintpwd.length) { |
|
if (document.getElementById('LC_ownersetpwd')) { |
|
for (var i=0; i<form.newintpwd.length; i++) { |
|
if (form.newintpwd[i].checked) { |
|
if (form.newintpwd[i].value == 1) { |
|
document.getElementById('LC_ownersetpwd').style.display = 'inline-block'; |
|
} else { |
|
document.getElementById('LC_ownersetpwd').style.display = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
// ]]> |
|
</script> |
|
ENDJS |
|
|
|
$outcome .= '<h3>'.$lt{'ld'}.'</h3>'. |
|
&Apache::loncommon::start_data_table(). |
|
&Apache::loncommon::start_data_table_row(). |
|
'<td>'.&mt('Internally authenticated').'<br />'.&mt("Change user's password?"). |
|
'<label><input type="radio" name="newintpwd" value="0" checked="checked" onclick="togglePwd(this.form);" />'. |
|
&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="newintpwd" value="1" onclick="togglePwd(this.form);" />'.&mt('Yes').'</label>'. |
|
'<div id="LC_ownersetpwd" style="display:none">'. |
|
' '.&mt('Password').' <input type="password" size="15" name="intarg" value="" />'. |
|
'<label><input type="checkbox" name="visible" onclick="if (this.checked) { this.form.intarg.type='."'text'".' } else { this.form.intarg.type='."'password'".' }" />'.&mt('Visible input').'</label></div></td>'. |
|
&Apache::loncommon::end_data_table_row(). |
|
&Apache::loncommon::end_data_table(); |
|
} |
if (&Apache::lonnet::allowed('udp',$ccdomain)) { |
if (&Apache::lonnet::allowed('udp',$ccdomain)) { |
# Current user has rights to view domain preferences for user's domain |
# Current user has rights to view domain preferences for user's domain |
my $result; |
my $result; |
Line 2253 ENDBADAUTH
|
Line 2325 ENDBADAUTH
|
$result = &mt('Currently using local (institutional) authentication.'); |
$result = &mt('Currently using local (institutional) authentication.'); |
} elsif ($currentauth =~ /^unix:/) { |
} elsif ($currentauth =~ /^unix:/) { |
$result = &mt('Currently Filesystem Authenticated.'); |
$result = &mt('Currently Filesystem Authenticated.'); |
|
} elsif ($currentauth =~ /^lti:/) { |
|
$result = &mt('Currently LTI authenticated.'); |
} |
} |
$outcome = '<h3>'.$lt{'ld'}.'</h3>'. |
$outcome = '<h3>'.$lt{'ld'}.'</h3>'. |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
Line 2291 sub modify_login_block {
|
Line 2365 sub modify_login_block {
|
if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
push(@authform_others,$authformloc); |
push(@authform_others,$authformloc); |
} |
} |
|
if ($can_assign{'lti'}) { |
|
push(@authform_others,$authformlti); |
|
} |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
$show_override_msg = 1; |
$show_override_msg = 1; |
} |
} |
Line 2302 sub modify_login_block {
|
Line 2379 sub modify_login_block {
|
if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
push(@authform_others,$authformloc); |
push(@authform_others,$authformloc); |
} |
} |
|
if ($can_assign{'lti'}) { |
|
push(@authform_others,$authformlti); |
|
} |
if ($can_assign{'int'}) { |
if ($can_assign{'int'}) { |
$show_override_msg = 1; |
$show_override_msg = 1; |
} |
} |
Line 2316 sub modify_login_block {
|
Line 2396 sub modify_login_block {
|
if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
push(@authform_others,$authformloc); |
push(@authform_others,$authformloc); |
} |
} |
|
if ($can_assign{'lti'}) { |
|
push(@authform_others,$authformlti); |
|
} |
if ($can_assign{'fsys'}) { |
if ($can_assign{'fsys'}) { |
$show_override_msg = 1; |
$show_override_msg = 1; |
} |
} |
Line 2327 sub modify_login_block {
|
Line 2410 sub modify_login_block {
|
if ($can_assign{'int'}) { |
if ($can_assign{'int'}) { |
push(@authform_others,$authformint); |
push(@authform_others,$authformint); |
} |
} |
|
if ($can_assign{'lti'}) { |
|
push(@authform_others,$authformlti); |
|
} |
if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
$show_override_msg = 1; |
$show_override_msg = 1; |
} |
} |
|
} elsif ($currentauth=~/^lti:/) { |
|
$authformcurrent=$authformlti; |
|
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
|
push(@authform_others,$authformkrb); |
|
} |
|
if ($can_assign{'int'}) { |
|
push(@authform_others,$authformint); |
|
} |
|
if ($can_assign{'loc'}) { |
|
push(@authform_others,$authformloc); |
|
} |
} |
} |
if ($show_override_msg) { |
if ($show_override_msg) { |
$authformcurrent = '<table><tr><td colspan="3">'.$authformcurrent. |
$authformcurrent = '<table><tr><td colspan="3">'.$authformcurrent. |
Line 2345 sub modify_login_block {
|
Line 2442 sub modify_login_block {
|
|
|
sub personal_data_display { |
sub personal_data_display { |
my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray, |
my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray, |
$now,$captchaform,$emailusername,$usertype) = @_; |
$now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_; |
my ($output,%userenv,%canmodify,%canmodify_status); |
my ($output,%userenv,%canmodify,%canmodify_status); |
my @userinfo = ('firstname','middlename','lastname','generation', |
my @userinfo = ('firstname','middlename','lastname','generation', |
'permanentemail','id'); |
'permanentemail','id'); |
Line 2372 sub personal_data_display {
|
Line 2469 sub personal_data_display {
|
'inststatus' => "Affiliation", |
'inststatus' => "Affiliation", |
'email' => 'E-mail address', |
'email' => 'E-mail address', |
'valid' => 'Validation', |
'valid' => 'Validation', |
|
'username' => 'Username', |
); |
); |
|
|
%canmodify_status = |
%canmodify_status = |
Line 2390 sub personal_data_display {
|
Line 2488 sub personal_data_display {
|
if (ref($emailusername) eq 'HASH') { |
if (ref($emailusername) eq 'HASH') { |
if (ref($emailusername->{$usertype}) eq 'HASH') { |
if (ref($emailusername->{$usertype}) eq 'HASH') { |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); |
@userinfo = (); |
@userinfo = (); |
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { |
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { |
foreach my $field (@{$infofields}) { |
foreach my $field (@{$infofields}) { |
if ($emailusername->{$usertype}->{$field}) { |
if ($emailusername->{$usertype}->{$field}) { |
Line 2420 sub personal_data_display {
|
Line 2518 sub personal_data_display {
|
$output = '<h3>'.$lt{'pd'}.'</h3>'. |
$output = '<h3>'.$lt{'pd'}.'</h3>'. |
&Apache::lonhtmlcommon::start_pick_box(); |
&Apache::lonhtmlcommon::start_pick_box(); |
if (($context eq 'selfcreate') && ($newuser eq 'email')) { |
if (($context eq 'selfcreate') && ($newuser eq 'email')) { |
|
my $size = 25; |
|
if ($condition) { |
|
if ($condition =~ /^\@[^\@]+$/) { |
|
$size = 10; |
|
} else { |
|
undef($condition); |
|
} |
|
} |
|
if ($excluded) { |
|
unless ($excluded =~ /^\@[^\@]+$/) { |
|
undef($condition); |
|
} |
|
} |
$output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef, |
$output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef, |
'LC_oddrow_value')."\n". |
'LC_oddrow_value')."\n". |
'<input type="text" name="uname" size="25" value="" autocomplete="off" />'; |
'<input type="text" name="uname" size="'.$size.'" value="" autocomplete="off" />'; |
|
if ($condition) { |
|
$output .= $condition; |
|
} elsif ($excluded) { |
|
$output .= '<br /><span style="font-size: smaller">'.&mt('You must use an e-mail address that does not end with [_1]', |
|
$excluded).'</span>'; |
|
} |
|
if ($usernameset eq 'first') { |
|
$output .= '<br /><span style="font-size: smaller">'; |
|
if ($condition) { |
|
$output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]', |
|
$condition); |
|
} else { |
|
$output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @'); |
|
} |
|
$output .= '</span>'; |
|
} |
$rowcount ++; |
$rowcount ++; |
$output .= &Apache::lonhtmlcommon::row_closure(1); |
$output .= &Apache::lonhtmlcommon::row_closure(1); |
my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />'; |
my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />'; |
Line 2437 sub personal_data_display {
|
Line 2564 sub personal_data_display {
|
'LC_oddrow_value')."\n". |
'LC_oddrow_value')."\n". |
$upasstwo. |
$upasstwo. |
&Apache::lonhtmlcommon::row_closure()."\n"; |
&Apache::lonhtmlcommon::row_closure()."\n"; |
|
if ($usernameset eq 'free') { |
|
my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; |
|
$output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n". |
|
&mt('Use e-mail address: '). |
|
'<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n". |
|
(' 'x2). |
|
'<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n". |
|
'<div id="selfcreateusername" style="display: none; font-size: smaller">'. |
|
'<br /><span class="LC_nobreak">'.&mt('Preferred username'). |
|
' <input type="text" name="username" value="" size="20" autocomplete="off"/>'. |
|
'</span></div>'."\n".&Apache::lonhtmlcommon::row_closure(1); |
|
$rowcount ++; |
|
} |
} |
} |
foreach my $item (@userinfo) { |
foreach my $item (@userinfo) { |
my $rowtitle = $lt{$item}; |
my $rowtitle = $lt{$item}; |
Line 2627 sub get_inststatuses {
|
Line 2767 sub get_inststatuses {
|
|
|
# ================================================================= Phase Three |
# ================================================================= Phase Three |
sub update_user_data { |
sub update_user_data { |
my ($r,$context,$crstype,$brcrum,$showcredits) = @_; |
my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_; |
my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, |
my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, |
$env{'form.ccdomain'}); |
$env{'form.ccdomain'}); |
# Error messages |
# Error messages |
Line 2745 sub update_user_data {
|
Line 2885 sub update_user_data {
|
$amode='localauth'; |
$amode='localauth'; |
$genpwd=$env{'form.locarg'}; |
$genpwd=$env{'form.locarg'}; |
$genpwd=" " if (!$genpwd); |
$genpwd=" " if (!$genpwd); |
|
} elsif ($env{'form.login'} eq 'lti') { |
|
$amode='lti'; |
|
$genpwd=" "; |
} elsif (($env{'form.login'} eq 'nochange') || |
} elsif (($env{'form.login'} eq 'nochange') || |
($env{'form.login'} eq '' )) { |
($env{'form.login'} eq '' )) { |
# There is no need to tell the user we did not change what they |
# There is no need to tell the user we did not change what they |
Line 2764 sub update_user_data {
|
Line 2907 sub update_user_data {
|
my (%alerts,%rulematch,%inst_results,%curr_rules); |
my (%alerts,%rulematch,%inst_results,%curr_rules); |
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); |
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); |
my @usertools = ('aboutme','blog','webdav','portfolio'); |
my @usertools = ('aboutme','blog','webdav','portfolio'); |
my @requestcourses = ('official','unofficial','community','textbook'); |
my @requestcourses = ('official','unofficial','community','textbook','placement','lti'); |
my @requestauthor = ('requestauthor'); |
my @requestauthor = ('requestauthor'); |
my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); |
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); |
Line 2912 sub update_user_data {
|
Line 3055 sub update_user_data {
|
($env{'form.ccuname'},$env{'form.ccdomain'})); |
($env{'form.ccuname'},$env{'form.ccdomain'})); |
} else { |
} else { |
# Okay, this is a non-fatal error. |
# Okay, this is a non-fatal error. |
$r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end); |
$r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end); |
} |
} |
|
} elsif (($env{'form.intarg'} ne '') && |
|
(&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) && |
|
(&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) { |
|
$r->print('Modifying authentication: '. |
|
&Apache::lonnet::modifyuserauth( |
|
$env{'form.ccdomain'},$env{'form.ccuname'}, |
|
'internal',$env{'form.intarg'})); |
} |
} |
$r->rflush(); # Finish display of header before time consuming actions start |
$r->rflush(); # Finish display of header before time consuming actions start |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state); |
Line 2937 sub update_user_data {
|
Line 3087 sub update_user_data {
|
'requestcourses.community','requestcourses.textbook', |
'requestcourses.community','requestcourses.textbook', |
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'reqcrsotherdom.official','reqcrsotherdom.unofficial', |
'reqcrsotherdom.community','reqcrsotherdom.textbook', |
'reqcrsotherdom.community','reqcrsotherdom.textbook', |
'requestauthor'], |
'reqcrsotherdom.placement','requestauthor'], |
$env{'form.ccdomain'},$env{'form.ccuname'}); |
$env{'form.ccdomain'},$env{'form.ccuname'}); |
my ($tmp) = keys(%userenv); |
my ($tmp) = keys(%userenv); |
if ($tmp =~ /^(con_lost|error)/i) { |
if ($tmp =~ /^(con_lost|error)/i) { |
Line 3228 sub update_user_data {
|
Line 3378 sub update_user_data {
|
($env{'user.domain'} eq $env{'form.ccdomain'})) { |
($env{'user.domain'} eq $env{'form.ccdomain'})) { |
my %newenvhash; |
my %newenvhash; |
foreach my $key (keys(%changed)) { |
foreach my $key (keys(%changed)) { |
if (($key eq 'official') || ($key eq 'unofficial') |
if (($key eq 'official') || ($key eq 'unofficial') || |
|| ($key eq 'community') || ($key eq 'textbook')) { |
($key eq 'community') || ($key eq 'textbook') || |
|
($key eq 'placement') || ($key eq 'lti')) { |
$newenvhash{'environment.requestcourses.'.$key} = |
$newenvhash{'environment.requestcourses.'.$key} = |
$changeHash{'requestcourses.'.$key}; |
$changeHash{'requestcourses.'.$key}; |
if ($changeHash{'requestcourses.'.$key}) { |
if ($changeHash{'requestcourses.'.$key}) { |
Line 3295 sub update_user_data {
|
Line 3446 sub update_user_data {
|
\%newsettingstext); |
\%newsettingstext); |
if ($env{'form.cid'} ne $userenv{'id'}) { |
if ($env{'form.cid'} ne $userenv{'id'}) { |
&Apache::lonnet::idput($env{'form.ccdomain'}, |
&Apache::lonnet::idput($env{'form.ccdomain'}, |
{$env{'form.ccuname'} => $env{'form.cid'}}); |
{$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids'); |
if (($recurseid) && |
if (($recurseid) && |
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) { |
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) { |
my $idresult = |
my $idresult = |
Line 3438 sub display_userinfo {
|
Line 3589 sub display_userinfo {
|
'unofficial' => 'Can Request Unofficial Courses', |
'unofficial' => 'Can Request Unofficial Courses', |
'community' => 'Can Request Communities', |
'community' => 'Can Request Communities', |
'textbook' => 'Can Request Textbook Courses', |
'textbook' => 'Can Request Textbook Courses', |
|
'placement' => 'Can Request Placement Tests', |
|
'lti' => 'Can Request LTI Courses', |
'requestauthor' => 'Can Request Author Role', |
'requestauthor' => 'Can Request Author Role', |
'inststatus' => "Affiliation", |
'inststatus' => "Affiliation", |
'prvs' => 'Previous Value:', |
'prvs' => 'Previous Value:', |
Line 4679 sub handler {
|
Line 4832 sub handler {
|
if (! exists($env{'form.state'})) { |
if (! exists($env{'form.state'})) { |
&Apache::lonuserutils::print_first_users_upload_form($r,$context); |
&Apache::lonuserutils::print_first_users_upload_form($r,$context); |
} elsif ($env{'form.state'} eq 'got_file') { |
} elsif ($env{'form.state'} eq 'got_file') { |
my $result = |
my $result = |
&Apache::lonuserutils::print_upload_manager_form($r,$context, |
&Apache::lonuserutils::print_upload_manager_form($r,$context, |
$permission, |
$permission, |
$crstype,$showcredits); |
$crstype,$showcredits); |
Line 4819 sub handler {
|
Line 4972 sub handler {
|
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); |
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); |
} |
} |
} elsif ($env{'form.phase'} eq 'update_user_data') { |
} elsif ($env{'form.phase'} eq 'update_user_data') { |
&update_user_data($r,$context,$crstype,$brcrum,$showcredits); |
&update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission); |
} else { |
} else { |
&print_username_entry_form($r,$context,undef,$srch,undef,$crstype, |
&print_username_entry_form($r,$context,undef,$srch,undef,$crstype, |
$brcrum,$permission); |
$brcrum,$permission); |
Line 4935 sub handler {
|
Line 5088 sub handler {
|
unless ($usertype) { |
unless ($usertype) { |
$usertype = 'default'; |
$usertype = 'default'; |
} |
} |
|
my ($showstatus,$showemail,$pickstart); |
|
my $numextras = 0; |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) { |
|
if (ref($usertypes) eq 'HASH') { |
|
if ($usertypes->{$usertype}) { |
|
$showstatus = $usertypes->{$usertype}; |
|
} else { |
|
$showstatus = $othertitle; |
|
} |
|
if ($showstatus) { |
|
$numextras ++; |
|
} |
|
} |
|
} |
|
if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) { |
|
$showemail = $info{$uname}{'email'}; |
|
$numextras ++; |
|
} |
if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') { |
if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') { |
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { |
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { |
|
$pickstart = 1; |
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box()); |
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box()); |
my ($num,$count,$showstatus); |
my ($num,$count); |
$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}})); |
$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}})); |
unless ($usertype eq 'default') { |
$count += $numextras; |
my ($othertitle,$usertypes,$types) = |
|
&Apache::loncommon::sorted_inst_types($dom); |
|
if (ref($usertypes) eq 'HASH') { |
|
if ($usertypes->{$usertype}) { |
|
$showstatus = $usertypes->{$usertype}; |
|
$count ++; |
|
} |
|
} |
|
} |
|
foreach my $field (@{$infofields}) { |
foreach my $field (@{$infofields}) { |
next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field}); |
next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field}); |
next unless ($infotitles->{$field}); |
next unless ($infotitles->{$field}); |
$r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}). |
$r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}). |
$info{$uname}{$field}); |
$info{$uname}{$field}); |
$num ++; |
$num ++; |
if ($count == $num) { |
unless ($count == $num) { |
$r->print(&Apache::lonhtmlcommon::row_closure(1)); |
|
} else { |
|
$r->print(&Apache::lonhtmlcommon::row_closure()); |
$r->print(&Apache::lonhtmlcommon::row_closure()); |
} |
} |
} |
} |
if ($showstatus) { |
} |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')). |
} |
$showstatus. |
if ($numextras) { |
&Apache::lonhtmlcommon::row_closure(1)); |
unless ($pickstart) { |
|
$r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box()); |
|
$pickstart = 1; |
|
} |
|
if ($showemail) { |
|
my $closure = ''; |
|
unless ($showstatus) { |
|
$closure = 1; |
} |
} |
$r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>'); |
$r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')). |
|
$showemail. |
|
&Apache::lonhtmlcommon::row_closure($closure)); |
|
} |
|
if ($showstatus) { |
|
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','<br />')). |
|
$showstatus. |
|
&Apache::lonhtmlcommon::row_closure(1)); |
} |
} |
} |
} |
|
if ($pickstart) { |
|
$r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>'); |
|
} else { |
|
$r->print('<div>'.&mt('No information to display for this account request.').'</div>'); |
|
} |
|
} else { |
|
$r->print('<div>'.&mt('No information available for this account request.').'</div>'); |
} |
} |
} |
} |
} |
} |
} |
} |
$r->print(&close_popup_form()); |
|
} |
} |
|
$r->print(&close_popup_form()); |
} elsif (($env{'form.action'} eq 'listusers') && |
} elsif (($env{'form.action'} eq 'listusers') && |
($permission->{'view'} || $permission->{'cusr'})) { |
($permission->{'view'} || $permission->{'cusr'})) { |
my $helpitem = 'Course_View_Class_List'; |
my $helpitem = 'Course_View_Class_List'; |
Line 5553 sub print_main_menu {
|
Line 5736 sub print_main_menu {
|
groups => 'Community Groups', |
groups => 'Community Groups', |
}, |
}, |
); |
); |
|
$linktext{'Placement'} = $linktext{'Course'}; |
|
|
my %linktitle = ( |
my %linktitle = ( |
'Course' => { |
'Course' => { |
Line 5567 sub print_main_menu {
|
Line 5751 sub print_main_menu {
|
}, |
}, |
); |
); |
|
|
|
$linktitle{'Placement'} = $linktitle{'Course'}; |
|
|
push(@{ $menu[0]->{items} }, #Category: Single Users |
push(@{ $menu[0]->{items} }, #Category: Single Users |
{ |
{ |
linktext => $linktext{$crstype}{'single'}, |
linktext => $linktext{$crstype}{'single'}, |
Line 6069 ENDSCRIPT
|
Line 6255 ENDSCRIPT
|
} elsif ($curr_types eq '') { |
} elsif ($curr_types eq '') { |
$add_domtitle = &mt('Users in other domain:'); |
$add_domtitle = &mt('Users in other domain:'); |
} |
} |
|
my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$cdom); |
$output .= &Apache::loncommon::start_data_table_row() |
$output .= &Apache::loncommon::start_data_table_row() |
.'<td colspan="2"><span class="LC_nobreak">'.$add_domtitle.'</span><br />' |
.'<td colspan="2"><span class="LC_nobreak">'.$add_domtitle.'</span><br />' |
.&Apache::loncommon::select_dom_form('','selfenroll_newdom', |
.&Apache::loncommon::select_dom_form('','selfenroll_newdom', |
$includeempty,$showdomdesc,'','','',$readonly) |
$includeempty,$showdomdesc,'',$trusted,$untrusted,$readonly) |
.'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />' |
.'<input type="hidden" name="selfenroll_types_total" value="'.$num.'" />' |
.'</td>'.&Apache::loncommon::end_data_table_row() |
.'</td>'.&Apache::loncommon::end_data_table_row() |
.&Apache::loncommon::end_data_table(); |
.&Apache::loncommon::end_data_table(); |
Line 8382 sub user_search_result {
|
Line 8569 sub user_search_result {
|
my $domd_chk = &domdirectorysrch_check($srch); |
my $domd_chk = &domdirectorysrch_check($srch); |
$response .= '<span class="LC_warning">'.$instd_chk.'</span><br />'; |
$response .= '<span class="LC_warning">'.$instd_chk.'</span><br />'; |
if ($domd_chk eq 'ok') { |
if ($domd_chk eq 'ok') { |
$response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'); |
$response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'); |
} |
} |
$response .= '<br />'; |
$response .= '<br />'; |
} |
} |
Line 8393 sub user_search_result {
|
Line 8580 sub user_search_result {
|
my $instd_chk = &instdirectorysrch_check($srch); |
my $instd_chk = &instdirectorysrch_check($srch); |
$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />'; |
$response .= '<span class="LC_warning">'.$domd_chk.'</span><br />'; |
if ($instd_chk eq 'ok') { |
if ($instd_chk eq 'ok') { |
$response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.'); |
$response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.'); |
} |
} |
$response .= '<br />'; |
$response .= '<br />'; |
} |
} |
Line 8494 sub user_search_result {
|
Line 8681 sub user_search_result {
|
$response = '<span class="LC_warning">'. |
$response = '<span class="LC_warning">'. |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
'</span><br />'. |
'</span><br />'. |
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). |
&mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'). |
'<br />'; |
'<br />'; |
} |
} |
} |
} |
Line 8567 sub user_search_result {
|
Line 8754 sub user_search_result {
|
$response = '<span class="LC_warning">'. |
$response = '<span class="LC_warning">'. |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
'</span><br />'. |
'</span><br />'. |
&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). |
&mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'). |
'<br />'; |
'<br />'; |
} |
} |
} |
} |