version 1.325, 2009/11/12 16:09:10
|
version 1.333, 2010/01/20 09:49:54
|
Line 219 END_SCRIPT
|
Line 219 END_SCRIPT
|
sub build_tools_display { |
sub build_tools_display { |
my ($ccuname,$ccdomain,$context) = @_; |
my ($ccuname,$ccdomain,$context) = @_; |
my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, |
my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, |
$colspan); |
$colspan,$isadv,%domconfig); |
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
'blog' => "Personal User Blog", |
'blog' => "Personal User Blog", |
'aboutme' => "Personal Information Page", |
'aboutme' => "Personal Information Page", |
Line 243 sub build_tools_display {
|
Line 243 sub build_tools_display {
|
%reqtitles = &courserequest_titles(); |
%reqtitles = &courserequest_titles(); |
%reqdisplay = &courserequest_display(); |
%reqdisplay = &courserequest_display(); |
$colspan = ' colspan="2"'; |
$colspan = ' colspan="2"'; |
|
%domconfig = |
|
&Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain); |
|
$isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); |
} else { |
} else { |
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, |
'tools.aboutme','tools.portfolio','tools.blog'); |
'tools.aboutme','tools.portfolio','tools.blog'); |
Line 289 sub build_tools_display {
|
Line 292 sub build_tools_display {
|
&Apache::loncommon::start_data_table_row()."\n"; |
&Apache::loncommon::start_data_table_row()."\n"; |
if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
my ($curroption,$currlimit); |
my ($curroption,$currlimit); |
$curroption = $userenv{$context.'.'.$item}; |
if ($userenv{$context.'.'.$item} ne '') { |
|
$curroption = $userenv{$context.'.'.$item}; |
|
} else { |
|
my (@inststatuses); |
|
$curroption = |
|
&Apache::loncoursequeueadmin::get_processtype($ccuname,$ccdomain,$isadv,$ccdomain, |
|
$item,\@inststatuses,\%domconfig); |
|
} |
if (!$curroption) { |
if (!$curroption) { |
$curroption = 'norequest'; |
$curroption = 'norequest'; |
} |
} |
Line 552 sub print_username_entry_form {
|
Line 562 sub print_username_entry_form {
|
&mt('View/Modify existing role:').'</b></label></td>'. |
&mt('View/Modify existing role:').'</b></label></td>'. |
'<td align="center"><br />'. |
'<td align="center"><br />'. |
'<select name="rolename" onchange="setCustomAction('."'edit'".');">'. |
'<select name="rolename" onchange="setCustomAction('."'edit'".');">'. |
'<option value="" selected="selected" onchange="">'. |
'<option value="" selected="selected">'. |
&mt('Select')); |
&mt('Select')); |
foreach my $role (sort(keys(%existingroles))) { |
foreach my $role (sort(keys(%existingroles))) { |
$r->print('<option value="$role">'.$role.'</option>'); |
$r->print('<option value="'.$role.'">'.$role.'</option>'); |
} |
} |
$r->print('</select>'. |
$r->print('</select>'. |
'</td>'. |
'</td>'. |
Line 935 sub print_user_modification_page {
|
Line 945 sub print_user_modification_page {
|
); |
); |
my $response; |
my $response; |
if ($env{'form.origform'} eq 'crtusername') { |
if ($env{'form.origform'} eq 'crtusername') { |
$response = '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain). |
$response = '<span class="LC_warning">'.&mt('No match found for the username [_1] in LON-CAPA domain: [_2]','<b>'.$ccuname.'</b>',$ccdomain). |
'</span><br />'; |
'</span><br />'; |
} |
} |
$response .= '<p class="LC_warning">' |
$response .= '<p class="LC_warning">' |
Line 1028 sub print_user_modification_page {
|
Line 1038 sub print_user_modification_page {
|
<input type="hidden" name="pres_type" value="" /> |
<input type="hidden" name="pres_type" value="" /> |
<input type="hidden" name="pres_marker" value="" /> |
<input type="hidden" name="pres_marker" value="" /> |
ENDFORMINFO |
ENDFORMINFO |
my %inccourses; |
my (%inccourses,$roledom); |
foreach my $key (keys(%env)) { |
if ($context eq 'course') { |
if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { |
$inccourses{$env{'request.course.id'}}=1; |
$inccourses{$1.'_'.$2}=1; |
$roledom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
} elsif ($context eq 'author') { |
|
$roledom = $env{'request.role.domain'}; |
|
} elsif ($context eq 'domain') { |
|
foreach my $key (keys(%env)) { |
|
$roledom = $env{'request.role.domain'}; |
|
if ($key=~/^user\.priv\.cm\.\/($roledom)\/($match_username)/) { |
|
$inccourses{$1.'_'.$2}=1; |
|
} |
|
} |
|
} else { |
|
foreach my $key (keys(%env)) { |
|
if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { |
|
$inccourses{$1.'_'.$2}=1; |
|
} |
} |
} |
} |
} |
if ($newuser) { |
if ($newuser) { |
Line 1268 ENDNOTOOLSPRIV
|
Line 1292 ENDNOTOOLSPRIV
|
} |
} |
$r->print('</div><div class="LC_clear_float_footer"></div>'); |
$r->print('</div><div class="LC_clear_float_footer"></div>'); |
if ($env{'form.action'} ne 'singlestudent') { |
if ($env{'form.action'} ne 'singlestudent') { |
&display_existing_roles($r,$ccuname,$ccdomain,\%inccourses); |
&display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context, |
|
$roledom,$crstype); |
} |
} |
} ## End of new user/old user logic |
} ## End of new user/old user logic |
|
|
if ($env{'form.action'} eq 'singlestudent') { |
if ($env{'form.action'} eq 'singlestudent') { |
my $btntxt; |
my $btntxt; |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
Line 1389 sub validation_javascript {
|
Line 1413 sub validation_javascript {
|
} |
} |
|
|
sub display_existing_roles { |
sub display_existing_roles { |
my ($r,$ccuname,$ccdomain,$inccourses) = @_; |
my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype) = @_; |
my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); |
my $now=time; |
# Build up table of user roles to allow revocation and re-enabling of roles. |
my %lt=&Apache::lonlocal::texthash( |
my ($tmp) = keys(%rolesdump); |
|
if ($tmp !~ /^(con_lost|error)/i) { |
|
my $now=time; |
|
my %lt=&Apache::lonlocal::texthash( |
|
'rer' => "Existing Roles", |
'rer' => "Existing Roles", |
'rev' => "Revoke", |
'rev' => "Revoke", |
'del' => "Delete", |
'del' => "Delete", |
Line 1405 sub display_existing_roles {
|
Line 1425 sub display_existing_roles {
|
'sta' => "Start", |
'sta' => "Start", |
'end' => "End", |
'end' => "End", |
); |
); |
my (%roletext,%sortrole,%roleclass,%rolepriv); |
my (%rolesdump,%roletext,%sortrole,%roleclass,%rolepriv); |
foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]); |
if ($context eq 'course' || $context eq 'author') { |
my $b1=join('_',(split('_',$b))[1,0]); |
my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype); |
return $a1 cmp $b1; |
my %roleshash = |
} keys(%rolesdump)) { |
&Apache::lonnet::get_my_roles($ccuname,$ccdomain,'userroles', |
next if ($area =~ /^rolesdef/); |
['active','previous','future'],\@roles,$roledom,1); |
my $envkey=$area; |
foreach my $key (keys(%roleshash)) { |
my $role = $rolesdump{$area}; |
my ($start,$end) = split(':',$roleshash{$key}); |
my $thisrole=$area; |
next if ($start eq '-1' || $end eq '-1'); |
$area =~ s/\_\w\w$//; |
my ($rnum,$rdom,$role,$sec) = split(':',$key); |
my ($role_code,$role_end_time,$role_start_time) = |
if ($context eq 'course') { |
split(/_/,$role); |
next unless (($rnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) |
|
&& ($rdom eq $env{'course.'.$env{'request.course.id'}.'.domain'})); |
|
} elsif ($context eq 'author') { |
|
next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'})); |
|
} |
|
my ($newkey,$newvalue,$newrole); |
|
$newkey = '/'.$rdom.'/'.$rnum; |
|
if ($sec ne '') { |
|
$newkey .= '/'.$sec; |
|
} |
|
$newvalue = $role; |
|
if ($role =~ /^cr/) { |
|
$newrole = 'cr'; |
|
} else { |
|
$newrole = $role; |
|
} |
|
$newkey .= '_'.$newrole; |
|
if ($start ne '' && $end ne '') { |
|
$newvalue .= '_'.$end.'_'.$start; |
|
} |
|
$rolesdump{$newkey} = $newvalue; |
|
} |
|
} else { |
|
%rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); |
|
} |
|
# Build up table of user roles to allow revocation and re-enabling of roles. |
|
my ($tmp) = keys(%rolesdump); |
|
return if ($tmp =~ /^(con_lost|error)/i); |
|
foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]); |
|
my $b1=join('_',(split('_',$b))[1,0]); |
|
return $a1 cmp $b1; |
|
} keys(%rolesdump)) { |
|
next if ($area =~ /^rolesdef/); |
|
my $envkey=$area; |
|
my $role = $rolesdump{$area}; |
|
my $thisrole=$area; |
|
$area =~ s/\_\w\w$//; |
|
my ($role_code,$role_end_time,$role_start_time) = |
|
split(/_/,$role); |
# Is this a custom role? Get role owner and title. |
# Is this a custom role? Get role owner and title. |
my ($croleudom,$croleuname,$croletitle)= |
my ($croleudom,$croleuname,$croletitle)= |
($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); |
($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); |
my $allowed=0; |
my $allowed=0; |
my $delallowed=0; |
my $delallowed=0; |
my $sortkey=$role_code; |
my $sortkey=$role_code; |
my $class='Unknown'; |
my $class='Unknown'; |
if ($area =~ m{^/($match_domain)/($match_courseid)} ) { |
if ($area =~ m{^/($match_domain)/($match_courseid)} ) { |
$class='Course'; |
$class='Course'; |
my ($coursedom,$coursedir) = ($1,$2); |
my ($coursedom,$coursedir) = ($1,$2); |
$sortkey.="\0$coursedom"; |
my $cid = $1.'_'.$2; |
# $1.'_'.$2 is the course id (eg. 103_12345abcef103l3). |
# $1.'_'.$2 is the course id (eg. 103_12345abcef103l3). |
my %coursedata= |
my %coursedata= |
&Apache::lonnet::coursedescription($1.'_'.$2); |
&Apache::lonnet::coursedescription($cid); |
my $carea; |
if ($coursedir =~ /^$match_community$/) { |
if (defined($coursedata{'description'})) { |
$class='Community'; |
$carea=$coursedata{'description'}. |
} |
'<br />'.&mt('Domain').': '.$coursedom.(' 'x8). |
$sortkey.="\0$coursedom"; |
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom); |
my $carea; |
$sortkey.="\0".$coursedata{'description'}; |
if (defined($coursedata{'description'})) { |
$class=$coursedata{'type'}; |
$carea=$coursedata{'description'}. |
|
'<br />'.&mt('Domain').': '.$coursedom.(' 'x8). |
|
&Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom); |
|
$sortkey.="\0".$coursedata{'description'}; |
|
} else { |
|
if ($class eq 'Community') { |
|
$carea=&mt('Unavailable community').': '.$area; |
|
$sortkey.="\0".&mt('Unavailable community').': '.$area; |
} else { |
} else { |
$carea=&mt('Unavailable course').': '.$area; |
$carea=&mt('Unavailable course').': '.$area; |
$sortkey.="\0".&mt('Unavailable course').': '.$area; |
$sortkey.="\0".&mt('Unavailable course').': '.$area; |
} |
} |
$sortkey.="\0$coursedir"; |
} |
$inccourses->{$1.'_'.$2}=1; |
$sortkey.="\0$coursedir"; |
if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) || |
$inccourses->{$cid}=1; |
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { |
if ((&Apache::lonnet::allowed('c'.$role_code,$coursedom.'/'.$coursedir)) || |
$allowed=1; |
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { |
} |
$allowed=1; |
if ((&Apache::lonnet::allowed('dro',$1)) || |
} |
(&Apache::lonnet::allowed('dro',$ccdomain))) { |
unless ($allowed) { |
$delallowed=1; |
my $isowner = &is_courseowner($cid,$coursedata{'internal.courseowner'}); |
|
if ($isowner) { |
|
if (($role_code eq 'co') && ($class eq 'Community')) { |
|
$allowed = 1; |
|
} elsif (($role_code eq 'cc') && ($class eq 'Course')) { |
|
$allowed = 1; |
|
} |
} |
} |
|
} |
|
if ((&Apache::lonnet::allowed('dro',$coursedom)) || |
|
(&Apache::lonnet::allowed('dro',$ccdomain))) { |
|
$delallowed=1; |
|
} |
# - custom role. Needs more info, too |
# - custom role. Needs more info, too |
if ($croletitle) { |
if ($croletitle) { |
if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) { |
if (&Apache::lonnet::allowed('ccr',$coursedom.'/'.$coursedir)) { |
$allowed=1; |
$allowed=1; |
$thisrole.='.'.$role_code; |
$thisrole.='.'.$role_code; |
} |
|
} |
} |
# Compute the background color based on $area |
} |
if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { |
if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { |
$carea.='<br />Section: '.$3; |
$carea.='<br />Section: '.$3; |
$sortkey.="\0$3"; |
$sortkey.="\0$3"; |
if (!$allowed) { |
if (!$allowed) { |
if ($env{'request.course.sec'} eq $3) { |
if ($env{'request.course.sec'} eq $3) { |
if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { |
if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { |
$allowed = 1; |
$allowed = 1; |
} |
|
} |
} |
} |
} |
} |
} |
$area=$carea; |
} |
} else { |
$area=$carea; |
$sortkey.="\0".$area; |
} else { |
# Determine if current user is able to revoke privileges |
$sortkey.="\0".$area; |
if ($area=~m{^/($match_domain)/}) { |
# Determine if current user is able to revoke privileges |
if ((&Apache::lonnet::allowed('c'.$role_code,$1)) || |
if ($area=~m{^/($match_domain)/}) { |
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { |
if ((&Apache::lonnet::allowed('c'.$role_code,$1)) || |
$allowed=1; |
(&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { |
} |
$allowed=1; |
if (((&Apache::lonnet::allowed('dro',$1)) || |
|
(&Apache::lonnet::allowed('dro',$ccdomain))) && |
|
($role_code ne 'dc')) { |
|
$delallowed=1; |
|
} |
|
} else { |
|
if (&Apache::lonnet::allowed('c'.$role_code,'/')) { |
|
$allowed=1; |
|
} |
|
} |
} |
if ($role_code eq 'ca' || $role_code eq 'au') { |
if (((&Apache::lonnet::allowed('dro',$1)) || |
$class='Construction Space'; |
(&Apache::lonnet::allowed('dro',$ccdomain))) && |
} elsif ($role_code eq 'su') { |
($role_code ne 'dc')) { |
$class='System'; |
$delallowed=1; |
} else { |
|
$class='Domain'; |
|
} |
} |
} |
} else { |
if (($role_code eq 'ca') || ($role_code eq 'aa')) { |
if (&Apache::lonnet::allowed('c'.$role_code,'/')) { |
$area=~m{/($match_domain)/($match_username)}; |
|
if (&Apache::lonuserutils::authorpriv($2,$1)) { |
|
$allowed=1; |
$allowed=1; |
} else { |
|
$allowed=0; |
|
} |
} |
} |
} |
my $row = ''; |
if ($role_code eq 'ca' || $role_code eq 'au') { |
$row.= '<td>'; |
$class='Construction Space'; |
my $active=1; |
} elsif ($role_code eq 'su') { |
$active=0 if (($role_end_time) && ($now>$role_end_time)); |
$class='System'; |
if (($active) && ($allowed)) { |
|
$row.= '<input type="checkbox" name="rev:'.$thisrole.'" />'; |
|
} else { |
} else { |
if ($active) { |
$class='Domain'; |
$row.=' '; |
|
} else { |
|
$row.=&mt('expired or revoked'); |
|
} |
|
} |
} |
$row.='</td><td>'; |
} |
if ($allowed && !$active) { |
if (($role_code eq 'ca') || ($role_code eq 'aa')) { |
$row.= '<input type="checkbox" name="ren:'.$thisrole.'" />'; |
$area=~m{/($match_domain)/($match_username)}; |
|
if (&Apache::lonuserutils::authorpriv($2,$1)) { |
|
$allowed=1; |
} else { |
} else { |
$row.=' '; |
$allowed=0; |
} |
} |
$row.='</td><td>'; |
} |
if ($delallowed) { |
my $row = ''; |
$row.= '<input type="checkbox" name="del:'.$thisrole.'" />'; |
$row.= '<td>'; |
|
my $active=1; |
|
$active=0 if (($role_end_time) && ($now>$role_end_time)); |
|
if (($active) && ($allowed)) { |
|
$row.= '<input type="checkbox" name="rev:'.$thisrole.'" />'; |
|
} else { |
|
if ($active) { |
|
$row.=' '; |
} else { |
} else { |
$row.=' '; |
$row.=&mt('expired or revoked'); |
} |
} |
my $plaintext=''; |
} |
if (!$croletitle) { |
$row.='</td><td>'; |
$plaintext=&Apache::lonnet::plaintext($role_code,$class) |
if ($allowed && !$active) { |
} else { |
$row.= '<input type="checkbox" name="ren:'.$thisrole.'" />'; |
$plaintext= |
} else { |
|
$row.=' '; |
|
} |
|
$row.='</td><td>'; |
|
if ($delallowed) { |
|
$row.= '<input type="checkbox" name="del:'.$thisrole.'" />'; |
|
} else { |
|
$row.=' '; |
|
} |
|
my $plaintext=''; |
|
if (!$croletitle) { |
|
$plaintext=&Apache::lonnet::plaintext($role_code,$class) |
|
} else { |
|
$plaintext= |
"Customrole '$croletitle'<br />defined by $croleuname\@$croleudom"; |
"Customrole '$croletitle'<br />defined by $croleuname\@$croleudom"; |
|
} |
|
$row.= '</td><td>'.$plaintext. |
|
'</td><td>'.$area. |
|
'</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) |
|
: ' ' ). |
|
'</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) |
|
: ' ' ) |
|
."</td>"; |
|
$sortrole{$sortkey}=$envkey; |
|
$roletext{$envkey}=$row; |
|
$roleclass{$envkey}=$class; |
|
$rolepriv{$envkey}=$allowed; |
|
} # end of foreach (table building loop) |
|
|
|
my $rolesdisplay = 0; |
|
my %output = (); |
|
foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { |
|
$output{$type} = ''; |
|
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { |
|
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { |
|
$output{$type}.= |
|
&Apache::loncommon::start_data_table_row(). |
|
$roletext{$sortrole{$which}}. |
|
&Apache::loncommon::end_data_table_row(); |
} |
} |
$row.= '</td><td>'.$plaintext. |
} |
'</td><td>'.$area. |
unless($output{$type} eq '') { |
'</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) |
$output{$type} = '<tr class="LC_info_row">'. |
: ' ' ). |
"<td align='center' colspan='7'>".&mt($type)."</td></tr>". |
'</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) |
$output{$type}; |
: ' ' ) |
$rolesdisplay = 1; |
."</td>"; |
} |
$sortrole{$sortkey}=$envkey; |
} |
$roletext{$envkey}=$row; |
if ($rolesdisplay == 1) { |
$roleclass{$envkey}=$class; |
my $contextrole=''; |
$rolepriv{$envkey}=$allowed; |
if ($env{'request.course.id'}) { |
#$r->print($row); |
if (&Apache::loncommon::course_type() eq 'Community') { |
} # end of foreach (table building loop) |
$contextrole = &mt('Existing Roles in this Community'); |
my $rolesdisplay = 0; |
|
my %output = (); |
|
foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { |
|
$output{$type} = ''; |
|
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { |
|
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { |
|
$output{$type}.= |
|
&Apache::loncommon::start_data_table_row(). |
|
$roletext{$sortrole{$which}}. |
|
&Apache::loncommon::end_data_table_row(); |
|
} |
|
} |
|
unless($output{$type} eq '') { |
|
$output{$type} = '<tr class="LC_info_row">'. |
|
"<td align='center' colspan='7'>".&mt($type)."</td></tr>". |
|
$output{$type}; |
|
$rolesdisplay = 1; |
|
} |
|
} |
|
if ($rolesdisplay == 1) { |
|
my $contextrole=''; |
|
if ($env{'request.course.id'}) { |
|
my $crstype = &Apache::loncommon::course_type(); |
|
$contextrole = "Existing Roles in this $crstype"; |
|
} elsif ($env{'request.role'} =~ /^au\./) { |
|
$contextrole = 'Existing Co-Author Roles in your Construction Space'; |
|
} else { |
} else { |
$contextrole = 'Existing Roles in this Domain'; |
$contextrole = &mt('Existing Roles in this Course'); |
} |
} |
$r->print(' |
} elsif ($env{'request.role'} =~ /^au\./) { |
|
$contextrole = &mt('Existing Co-Author Roles in your Construction Space'); |
|
} else { |
|
$contextrole = &mt('Existing Roles in this Domain'); |
|
} |
|
$r->print(' |
<h3>'.$lt{'rer'}.'</h3>'. |
<h3>'.$lt{'rer'}.'</h3>'. |
'<div>'.&mt($contextrole).'</div>'. |
'<div>'.$contextrole.'</div>'. |
&Apache::loncommon::start_data_table("LC_createuser"). |
&Apache::loncommon::start_data_table("LC_createuser"). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}. |
'<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}. |
'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}. |
'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'ext'}. |
'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. |
'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. |
&Apache::loncommon::end_data_table_header_row()); |
&Apache::loncommon::end_data_table_header_row()); |
foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { |
foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { |
if ($output{$type}) { |
if ($output{$type}) { |
$r->print($output{$type}."\n"); |
$r->print($output{$type}."\n"); |
} |
|
} |
} |
$r->print(&Apache::loncommon::end_data_table()); |
|
} |
} |
} # End of check for keys in rolesdump |
$r->print(&Apache::loncommon::end_data_table()); |
|
} |
return; |
return; |
} |
} |
|
|
Line 2613 sub update_user_data {
|
Line 2690 sub update_user_data {
|
$newenvhash{'environment.requestcourses.'.$key} = |
$newenvhash{'environment.requestcourses.'.$key} = |
$changeHash{'requestcourses.'.$key}; |
$changeHash{'requestcourses.'.$key}; |
if ($changeHash{'requestcourses.'.$key} ne '') { |
if ($changeHash{'requestcourses.'.$key} ne '') { |
$newenvhash{'environment.canrequest.'.$key} = |
$newenvhash{'environment.canrequest.'.$key} = 1; |
$changeHash{'requestcourses.'.$key}; |
|
} else { |
} else { |
$newenvhash{'environment.canrequest.'.$key} = |
$newenvhash{'environment.canrequest.'.$key} = |
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, |
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, |
Line 4410 sub print_main_menu {
|
Line 4486 sub print_main_menu {
|
}, |
}, |
{ |
{ |
linktext => $linktext{$crstype}{'groups'}, |
linktext => $linktext{$crstype}{'groups'}, |
icon => 'conf.png', |
icon => 'grps.png', |
#help => 'Course_Manage_Group', |
#help => 'Course_Manage_Group', |
url => '/adm/coursegroups?refpage=cusr', |
url => '/adm/coursegroups?refpage=cusr', |
permission => $permission->{'grp_manage'}, |
permission => $permission->{'grp_manage'}, |
linktitle => $linktitle{$crstype}{'groups'}, |
linktitle => $linktitle{$crstype}{'groups'}, |
}, |
}, |
{ |
{ |
linktext => 'Change Logs', |
linktext => 'Change Log', |
icon => 'document-properties.png', |
icon => 'document-properties.png', |
#help => 'Course_User_Logs', |
#help => 'Course_User_Logs', |
url => '/adm/createuser?action=changelogs', |
url => '/adm/createuser?action=changelogs', |
Line 5161 sub print_userchangelogs_display {
|
Line 5237 sub print_userchangelogs_display {
|
my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum); |
my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum); |
if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); } |
if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); } |
|
|
$r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'); |
|
my %saveable_parameters = ('show' => 'scalar',); |
my %saveable_parameters = ('show' => 'scalar',); |
&Apache::loncommon::store_course_settings('roles_log', |
&Apache::loncommon::store_course_settings('roles_log', |
\%saveable_parameters); |
\%saveable_parameters); |
Line 5196 sub print_userchangelogs_display {
|
Line 5271 sub print_userchangelogs_display {
|
} |
} |
my (%whodunit,%changed,$version); |
my (%whodunit,%changed,$version); |
($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/); |
($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/); |
$r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype)); |
|
my ($minshown,$maxshown); |
my ($minshown,$maxshown); |
$minshown = 1; |
$minshown = 1; |
my $count = 0; |
my $count = 0; |
Line 5207 sub print_userchangelogs_display {
|
Line 5281 sub print_userchangelogs_display {
|
} |
} |
} |
} |
|
|
# Collect user change log data |
# Form Header |
my $content = ''; |
$r->print('<form action="/adm/createuser" method="post" name="'.$formname.'">'. |
|
&role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype)); |
|
|
|
# Create navigation |
|
my ($nav_script,$nav_links) = &userlogdisplay_nav($formname,\%curr,$more_records); |
|
my $showntableheader = 0; |
|
|
|
# Table Header |
|
my $tableheader = |
|
&Apache::loncommon::start_data_table_header_row() |
|
.'<th> </th>' |
|
.'<th>'.&mt('When').'</th>' |
|
.'<th>'.&mt('Who made the change').'</th>' |
|
.'<th>'.&mt('Changed User').'</th>' |
|
.'<th>'.&mt('Role').'</th>' |
|
.'<th>'.&mt('Section').'</th>' |
|
.'<th>'.&mt('Context').'</th>' |
|
.'<th>'.&mt('Start').'</th>' |
|
.'<th>'.&mt('End').'</th>' |
|
.&Apache::loncommon::end_data_table_header_row(); |
|
|
|
# Display user change log data |
foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) { |
foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) { |
next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) || |
next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) || |
($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'})); |
($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'})); |
Line 5230 sub print_userchangelogs_display {
|
Line 5325 sub print_userchangelogs_display {
|
} |
} |
$count ++; |
$count ++; |
next if ($count < $minshown); |
next if ($count < $minshown); |
|
unless ($showntableheader) { |
|
$r->print($nav_script |
|
.$nav_links |
|
.&Apache::loncommon::start_data_table() |
|
.$tableheader); |
|
$r->rflush(); |
|
$showntableheader = 1; |
|
} |
if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') { |
if ($whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} eq '') { |
$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} = |
$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}} = |
&Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'}); |
&Apache::loncommon::plainname($roleslog{$id}{'exe_uname'},$roleslog{$id}{'exe_udom'}); |
Line 5269 sub print_userchangelogs_display {
|
Line 5371 sub print_userchangelogs_display {
|
if ($chgcontext ne '' && $lt{$chgcontext} ne '') { |
if ($chgcontext ne '' && $lt{$chgcontext} ne '') { |
$chgcontext = $lt{$chgcontext}; |
$chgcontext = $lt{$chgcontext}; |
} |
} |
$content .= |
$r->print( |
&Apache::loncommon::start_data_table_row() |
&Apache::loncommon::start_data_table_row() |
.'<td>'.$count.'</td>' |
.'<td>'.$count.'</td>' |
.'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>' |
.'<td>'.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).'</td>' |
Line 5280 sub print_userchangelogs_display {
|
Line 5382 sub print_userchangelogs_display {
|
.'<td>'.$chgcontext.'</td>' |
.'<td>'.$chgcontext.'</td>' |
.'<td>'.$rolestart.'</td>' |
.'<td>'.$rolestart.'</td>' |
.'<td>'.$roleend.'</td>' |
.'<td>'.$roleend.'</td>' |
.&Apache::loncommon::end_data_table_row(); |
.&Apache::loncommon::end_data_table_row()."\n"); |
} |
} |
|
|
# Form Footer |
if ($showntableheader) { # Table footer, if content displayed above |
my $form_footer = |
$r->print(&Apache::loncommon::end_data_table() |
'<input type="hidden" name="page" value="'.$curr{'page'}.'" />' |
.$nav_links); |
.'<input type="hidden" name="action" value="changelogs" />' |
} else { # No content displayed above |
.'</form>'; |
|
|
|
# Only display table, if content is available (has been collected above) |
|
if (!$content) { |
|
$r->print('<p class="LC_info">' |
$r->print('<p class="LC_info">' |
.&mt('There are no records to display.') |
.&mt('There are no records to display.') |
.'</p>' |
.'</p>' |
); |
); |
$r->print($form_footer); |
|
return; |
|
} |
} |
|
|
# Content to display, so create navigation and display table |
# Form Footer |
|
$r->print( |
|
'<input type="hidden" name="page" value="'.$curr{'page'}.'" />' |
|
.'<input type="hidden" name="action" value="changelogs" />' |
|
.'</form>'); |
|
return; |
|
} |
|
|
# Create Navigation: |
sub userlogdisplay_nav { |
# Navigation Script |
my ($formname,$curr,$more_records) = @_; |
my $nav_script = <<"ENDSCRIPT"; |
my ($nav_script,$nav_links); |
|
if (ref($curr) eq 'HASH') { |
|
# Create Navigation: |
|
# Navigation Script |
|
$nav_script = <<"ENDSCRIPT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <![CDATA[ |
// <![CDATA[ |
function chgPage(caller) { |
function chgPage(caller) { |
Line 5313 function chgPage(caller) {
|
Line 5419 function chgPage(caller) {
|
if (caller == 'next') { |
if (caller == 'next') { |
document.$formname.page.value ++; |
document.$formname.page.value ++; |
} |
} |
document.$formname.submit(); |
document.$formname.submit(); |
return; |
return; |
} |
} |
// ]]> |
// ]]> |
</script> |
</script> |
ENDSCRIPT |
ENDSCRIPT |
# Navigation Buttons |
# Navigation Buttons |
my $nav_links; |
$nav_links = '<p>'; |
$nav_links = '<p>'; |
if (($curr->{'page'} > 1) || ($more_records)) { |
if (($curr{'page'} > 1) || ($more_records)) { |
if ($curr->{'page'} > 1) { |
if ($curr{'page'} > 1) { |
$nav_links .= '<input type="button"' |
$nav_links .= '<input type="button"' |
.' onclick="javascript:chgPage('."'previous'".');"' |
.' onclick="javascript:chgPage('."'previous'".');"' |
.' value="'.&mt('Previous [_1] changes',$curr->{'show'}) |
.' value="'.&mt('Previous [_1] changes',$curr{'show'}) |
.'" /> '; |
.'" /> '; |
} |
} |
if ($more_records) { |
if ($more_records) { |
$nav_links .= '<input type="button"' |
$nav_links .= '<input type="button"' |
.' onclick="javascript:chgPage('."'next'".');"' |
.' onclick="javascript:chgPage('."'next'".');"' |
.' value="'.&mt('Next [_1] changes',$curr->{'show'}) |
.' value="'.&mt('Next [_1] changes',$curr{'show'}) |
.'" />'; |
.'" />'; |
} |
} |
} |
|
$nav_links .= '</p>'; |
} |
} |
$nav_links .= '</p>'; |
return ($nav_script,$nav_links); |
|
|
# Table Header |
|
my $tableheader = |
|
&Apache::loncommon::start_data_table_header_row() |
|
.'<th> </th>' |
|
.'<th>'.&mt('When').'</th>' |
|
.'<th>'.&mt('Who made the change').'</th>' |
|
.'<th>'.&mt('Changed User').'</th>' |
|
.'<th>'.&mt('Role').'</th>' |
|
.'<th>'.&mt('Section').'</th>' |
|
.'<th>'.&mt('Context').'</th>' |
|
.'<th>'.&mt('Start').'</th>' |
|
.'<th>'.&mt('End').'</th>' |
|
.&Apache::loncommon::end_data_table_header_row(); |
|
|
|
# Print Content |
|
$r->print( |
|
$nav_script |
|
.$nav_links |
|
.&Apache::loncommon::start_data_table() |
|
.$tableheader |
|
.$content |
|
.&Apache::loncommon::end_data_table() |
|
.$nav_links |
|
.$form_footer |
|
); |
|
return; |
|
} |
} |
|
|
sub role_display_filter { |
sub role_display_filter { |
Line 5790 sub build_search_response {
|
Line 5870 sub build_search_response {
|
my ($context,$srch,%srch_results) = @_; |
my ($context,$srch,%srch_results) = @_; |
my ($currstate,$response,$forcenewuser); |
my ($currstate,$response,$forcenewuser); |
my %names = ( |
my %names = ( |
'uname' => 'username', |
'uname' => 'username', |
'lastname' => 'last name', |
'lastname' => 'last name', |
'lastfirst' => 'last name, first name', |
'lastfirst' => 'last name, first name', |
'crs' => 'this course', |
'crs' => 'this course', |
'dom' => 'LON-CAPA domain: ', |
'dom' => 'LON-CAPA domain', |
'instd' => 'the institutional directory for domain: ', |
'instd' => 'the institutional directory for domain', |
); |
); |
|
|
my %single = ( |
my %single = ( |
Line 5815 sub build_search_response {
|
Line 5895 sub build_search_response {
|
$currstate = 'modify'; |
$currstate = 'modify'; |
$response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}); |
$response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}); |
if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { |
if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { |
$response .= &display_domain_info($srch->{'srchdomain'}); |
$response .= ': '.&display_domain_info($srch->{'srchdomain'}); |
} |
} |
} else { |
} else { # Search has nothing found. Prepare message to user. |
$response = '<span class="LC_warning">'.&mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}",$srch->{'srchterm'}); |
$response = '<span class="LC_warning">'; |
if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { |
if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { |
$response .= &display_domain_info($srch->{'srchdomain'}); |
$response .= &mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} [_1] in $names{$srch->{'srchin'}}: [_2]", |
|
'<b>'.$srch->{'srchterm'}.'</b>', |
|
&display_domain_info($srch->{'srchdomain'})); |
|
} else { |
|
$response .= &mt("$nomatch{$srch->{'srchtype'}} found for the $names{$srch->{'srchby'}} [_1] in $names{$srch->{'srchin'}}.", |
|
'<b>'.$srch->{'srchterm'}.'</b>'); |
} |
} |
$response .= '</span>'; |
$response .= '</span>'; |
|
|
if ($srch->{'srchin'} ne 'alc') { |
if ($srch->{'srchin'} ne 'alc') { |
$forcenewuser = 1; |
$forcenewuser = 1; |
my $cansrchinst = 0; |
my $cansrchinst = 0; |
Line 5972 sub course_level_table {
|
Line 6058 sub course_level_table {
|
'end' => "End" |
'end' => "End" |
); |
); |
|
|
foreach my $protectedcourse (sort( keys(%inccourses))) { |
foreach my $protectedcourse (sort(keys(%inccourses))) { |
my $thiscourse=$protectedcourse; |
my $thiscourse=$protectedcourse; |
$thiscourse=~s:_:/:g; |
$thiscourse=~s:_:/:g; |
my %coursedata=&Apache::lonnet::coursedescription($thiscourse); |
my %coursedata=&Apache::lonnet::coursedescription($thiscourse); |
|
my $isowner = &is_courseowner($protectedcourse,$coursedata{'internal.courseowner'}); |
my $area=$coursedata{'description'}; |
my $area=$coursedata{'description'}; |
my $crstype=$coursedata{'type'}; |
my $crstype=$coursedata{'type'}; |
if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } |
if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } |
Line 5990 sub course_level_table {
|
Line 6077 sub course_level_table {
|
my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype); |
my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype); |
foreach my $role (@roles) { |
foreach my $role (@roles) { |
my $plrole=&Apache::lonnet::plaintext($role,$crstype); |
my $plrole=&Apache::lonnet::plaintext($role,$crstype); |
if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) { |
if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) || |
|
((($role eq 'cc') || ($role eq 'co')) && ($isowner))) { |
$table .= &course_level_row($protectedcourse,$role,$area,$domain, |
$table .= &course_level_row($protectedcourse,$role,$area,$domain, |
$plrole,\%sections_count,\%lt); |
$plrole,\%sections_count,\%lt); |
} elsif ($env{'request.course.sec'} ne '') { |
} elsif ($env{'request.course.sec'} ne '') { |
if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'. |
if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'. |
$env{'request.course.sec'})) { |
$env{'request.course.sec'})) { |
Line 6495 sub get_selfenroll_titles {
|
Line 6583 sub get_selfenroll_titles {
|
return (\@row,\%lt); |
return (\@row,\%lt); |
} |
} |
|
|
|
sub is_courseowner { |
|
my ($thiscourse,$courseowner) = @_; |
|
if ($courseowner eq '') { |
|
if ($env{'request.course.id'} eq $thiscourse) { |
|
$courseowner = $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'}; |
|
} |
|
} |
|
if ($courseowner ne '') { |
|
if ($courseowner eq $env{'user.name'}.':'.$env{'user.domain'}) { |
|
return 1; |
|
} |
|
} |
|
return; |
|
} |
|
|
#---------------------------------------------- end functions for &phase_two |
#---------------------------------------------- end functions for &phase_two |
|
|
#--------------------------------- functions for &phase_two and &phase_three |
#--------------------------------- functions for &phase_two and &phase_three |