version 1.434, 2017/01/28 23:26:46
|
version 1.438, 2017/03/30 14:08:18
|
Line 755 sub print_username_entry_form {
|
Line 755 sub print_username_entry_form {
|
} |
} |
} else { |
} else { |
my $actiontext = $lt{'srad'}; |
my $actiontext = $lt{'srad'}; |
|
my $fixeddom; |
if ($env{'form.action'} eq 'singlestudent') { |
if ($env{'form.action'} eq 'singlestudent') { |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
$actiontext = $lt{'srme'}; |
$actiontext = $lt{'srme'}; |
Line 763 sub print_username_entry_form {
|
Line 764 sub print_username_entry_form {
|
} |
} |
} elsif ($env{'form.action'} eq 'accesslogs') { |
} elsif ($env{'form.action'} eq 'accesslogs') { |
$actiontext = $lt{'srva'}; |
$actiontext = $lt{'srva'}; |
|
$fixeddom = 1; |
} elsif (($env{'form.action'} eq 'singleuser') && |
} elsif (($env{'form.action'} eq 'singleuser') && |
($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) { |
($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) { |
$actiontext = $lt{'srvu'}; |
$actiontext = $lt{'srvu'}; |
Line 774 sub print_username_entry_form {
|
Line 776 sub print_username_entry_form {
|
'<br clear="all" />'); |
'<br clear="all" />'); |
} |
} |
} |
} |
$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1)); |
$r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom)); |
} |
} |
} |
} |
|
|
Line 833 sub entry_form {
|
Line 835 sub entry_form {
|
$inexact = 1; |
$inexact = 1; |
} |
} |
} |
} |
my $cancreate = |
my ($cancreate,$noinstd); |
&Apache::lonuserutils::can_create_user($dom,$context,$usertype); |
if ($env{'form.action'} eq 'accesslogs') { |
|
$noinstd = 1; |
|
} else { |
|
$cancreate = |
|
&Apache::lonuserutils::can_create_user($dom,$context,$usertype); |
|
} |
my ($userpicker,$cansearch) = |
my ($userpicker,$cansearch) = |
&Apache::loncommon::user_picker($dom,$srch,$forcenewuser, |
&Apache::loncommon::user_picker($dom,$srch,$forcenewuser, |
'document.crtuser',$cancreate,$usertype,$context,$fixeddom); |
'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd); |
my $srchbutton = &mt('Search'); |
my $srchbutton = &mt('Search'); |
if ($env{'form.action'} eq 'singlestudent') { |
if ($env{'form.action'} eq 'singlestudent') { |
$srchbutton = &mt('Search and Enroll'); |
$srchbutton = &mt('Search and Enroll'); |
Line 1044 ENDSCRIPT
|
Line 1051 ENDSCRIPT
|
$r->print('</h3>'); |
$r->print('</h3>'); |
} elsif ($env{'form.action'} eq 'accesslogs') { |
} elsif ($env{'form.action'} eq 'accesslogs') { |
$r->print("<b>$lt{'srcva'}</b><br />"); |
$r->print("<b>$lt{'srcva'}</b><br />"); |
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1)); |
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1)); |
$r->print('<h3>'.$lt{'vacsel'}.'</h3>'); |
$r->print('<h3>'.$lt{'vacsel'}.'</h3>'); |
} |
} |
} |
} |
Line 6765 ENDSCRIPT
|
Line 6772 ENDSCRIPT
|
return; |
return; |
} |
} |
|
|
|
if (&Apache::lonnet::privileged($uname,$udom, |
|
[$env{'request.role.domain'}],['dc','su'])) { |
|
unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'}, |
|
[$env{'request.role.domain'}],['dc','su'])) { |
|
$r->print('<p class="LC_warning">' |
|
.&mt('You need to be a privileged user to display user access logs for [_1]', |
|
&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom), |
|
$uname,$udom)) |
|
.'</p>'); |
|
if ($env{'form.popup'}) { |
|
$r->print('<p><a href="javascript:window.close()">'.&mt('Close window').'</a></p>'); |
|
} else { |
|
$r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom)); |
|
} |
|
return; |
|
} |
|
} |
|
|
# set defaults |
# set defaults |
my $now = time(); |
my $now = time(); |
my $defstart = $now - (7*24*3600); |
my $defstart = $now - (7*24*3600); |
Line 6851 ENDSCRIPT
|
Line 6876 ENDSCRIPT
|
$showntableheader = 1; |
$showntableheader = 1; |
} |
} |
my ($shown,$extra); |
my ($shown,$extra); |
my ($event,$data) = split(/\s+/,&unescape($event)); |
my ($event,$data) = split(/\s+/,&unescape($event),2); |
if ($event eq 'Role') { |
if ($event eq 'Role') { |
my ($rolecode,$extent) = split(/\./,$data,2); |
my ($rolecode,$extent) = split(/\./,$data,2); |
next if ($extent eq ''); |
next if ($extent eq ''); |
Line 6903 ENDSCRIPT
|
Line 6928 ENDSCRIPT
|
$shown = &mt('Role selection: [_1]',$rolename); |
$shown = &mt('Role selection: [_1]',$rolename); |
} else { |
} else { |
$shown = &mt($event); |
$shown = &mt($event); |
if ($data ne '') { |
if ($data =~ /^webdav/) { |
$extra = &mt('Client IP address: [_1]',$data); |
my ($path,$clientip) = split(/\s+/,$data,2); |
|
$path =~ s/^webdav//; |
|
if ($clientip ne '') { |
|
$extra = &mt('Client IP address: [_1]',$clientip); |
|
} |
|
if ($path ne '') { |
|
$shown .= ' '.&mt('(WebDAV access to [_1])',$path); |
|
} |
|
} elsif ($data ne '') { |
|
$extra = &mt('Client IP address: [_1]',$data); |
} |
} |
} |
} |
$r->print( |
$r->print( |
Line 8224 sub user_search_result {
|
Line 8258 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 />'; |
} |
} |
} else { |
} else { |
unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) { |
unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) { |
my $domd_chk = &domdirectorysrch_check($srch); |
my $domd_chk = &domdirectorysrch_check($srch); |
if ($domd_chk ne 'ok') { |
if (($domd_chk ne 'ok') && ($env{'form.action'} ne 'accesslogs')) { |
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 8336 sub user_search_result {
|
Line 8370 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 8409 sub user_search_result {
|
Line 8443 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 8582 sub build_search_response {
|
Line 8616 sub build_search_response {
|
if ($srch->{'srchin'} ne 'alc') { |
if ($srch->{'srchin'} ne 'alc') { |
$forcenewuser = 1; |
$forcenewuser = 1; |
my $cansrchinst = 0; |
my $cansrchinst = 0; |
if ($srch->{'srchdomain'}) { |
if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) { |
my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'}); |
my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'}); |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
if (ref($domconfig{'directorysrch'}) eq 'HASH') { |
if ($domconfig{'directorysrch'}{'available'}) { |
if ($domconfig{'directorysrch'}{'available'}) { |