|
version 1.319, 2009/10/30 04:44:56
|
version 1.338, 2010/04/02 14:18:50
|
|
Line 51 In LON-CAPA, roles are actually collecti
|
Line 51 In LON-CAPA, roles are actually collecti
|
| Assistant", "Course Coordinator", and other such roles are really just |
Assistant", "Course Coordinator", and other such roles are really just |
| collection of privileges that are useful in many circumstances. |
collection of privileges that are useful in many circumstances. |
| |
|
| Creating custom roles can be done by the Domain Coordinator through |
Custom roles can be defined by a Domain Coordinator, Course Coordinator |
| the Create User functionality. That screen will show all privileges |
or Community Coordinator via the Manage User functionality. |
| that can be assigned to users. For a complete list of privileges, |
The custom role editor screen will show all privileges which can be |
| please see C</home/httpd/lonTabs/rolesplain.tab>. |
assigned to users. For a complete list of privileges, please see |
| |
C</home/httpd/lonTabs/rolesplain.tab>. |
| |
|
| Custom role definitions are stored in the C<roles.db> file of the role |
Custom role definitions are stored in the C<roles.db> file of the creator |
| author. |
of the role. |
| |
|
| =cut |
=cut |
| |
|
|
Line 218 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 242 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 288 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 487 sub print_username_entry_form {
|
Line 498 sub print_username_entry_form {
|
| '// ]]>'."\n". |
'// ]]>'."\n". |
| '</script>'."\n"; |
'</script>'."\n"; |
| |
|
| |
my %existingroles=&Apache::lonuserutils::my_custom_roles($crstype); |
| |
if (($env{'form.action'} eq 'custom') && (keys(%existingroles) > 0) |
| |
&& (&Apache::lonnet::allowed('mcr','/'))) { |
| |
$jscript .= &customrole_javascript(); |
| |
} |
| my %loaditems = ( |
my %loaditems = ( |
| 'onload' => "javascript:setFormElements(document.$formtoset)", |
'onload' => "javascript:setFormElements(document.$formtoset)", |
| ); |
); |
|
Line 512 sub print_username_entry_form {
|
Line 528 sub print_username_entry_form {
|
| } |
} |
| my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management', |
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management', |
| $helpitem); |
$helpitem); |
| my %existingroles=&Apache::lonuserutils::my_custom_roles(); |
|
| my $choice=&Apache::loncommon::select_form('make new role','rolename', |
|
| ('make new role' => 'Generate new role ...',%existingroles)); |
|
| my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
| 'srst' => 'Search for a user and enroll as a student', |
'srst' => 'Search for a user and enroll as a student', |
| 'srme' => 'Search for a user and enroll as a member', |
'srme' => 'Search for a user and enroll as a member', |
| 'srad' => 'Search for a user and modify/add user information or roles', |
'srad' => 'Search for a user and modify/add user information or roles', |
| 'usr' => "Username", |
'usr' => "Username", |
| 'dom' => "Domain", |
'dom' => "Domain", |
| 'ecrp' => "Edit Custom Role Privileges", |
'ecrp' => "Define or Edit Custom Role", |
| 'nr' => "Name of Role", |
'nr' => "role name", |
| 'cre' => "Next", |
'cre' => "Next", |
| ); |
); |
| $r->print($start_page."\n".$crumbs); |
$r->print($start_page."\n".$crumbs); |
| if ($env{'form.action'} eq 'custom') { |
if ($env{'form.action'} eq 'custom') { |
| if (&Apache::lonnet::allowed('mcr','/')) { |
if (&Apache::lonnet::allowed('mcr','/')) { |
| $r->print(<<ENDCUSTOM); |
my $newroletext = &mt('Define new custom role:'); |
| <form action="/adm/createuser" method="post" name="docustom"> |
$r->print('<form action="/adm/createuser" method="post" name="docustom">'. |
| <input type="hidden" name="action" value="$env{'form.action'}" /> |
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. |
| <input type="hidden" name="phase" value="selected_custom_edit" /> |
'<input type="hidden" name="phase" value="selected_custom_edit" />'. |
| <h3>$lt{'ecrp'}</h3> |
'<h3>'.$lt{'ecrp'}.'</h3>'. |
| $choice $lt{'nr'}: <input type="text" size="15" name="newrolename" /><br /> |
&Apache::loncommon::start_data_table(). |
| <input name="customeditor" type="submit" value="$lt{'cre'}" /> |
&Apache::loncommon::start_data_table_row(). |
| </form> |
'<td>'); |
| ENDCUSTOM |
if (keys(%existingroles) > 0) { |
| |
$r->print('<br /><label><input type="radio" name="customroleaction" value="new" checked="checked" onclick="setCustomFields();" /><b>'.$newroletext.'</b></label>'); |
| |
} else { |
| |
$r->print('<br /><input type="hidden" name="customroleaction" value="new" /><b>'.$newroletext.'</b>'); |
| |
} |
| |
$r->print('</td><td align="center">'.$lt{'nr'}.'<br /><input type="text" size="15" name="newrolename" onfocus="setCustomAction('."'new'".');" /></td>'. |
| |
&Apache::loncommon::end_data_table_row()); |
| |
if (keys(%existingroles) > 0) { |
| |
$r->print(&Apache::loncommon::start_data_table_row().'<td><br />'. |
| |
'<label><input type="radio" name="customroleaction" value="edit" onclick="setCustomFields();"/><b>'. |
| |
&mt('View/Modify existing role:').'</b></label></td>'. |
| |
'<td align="center"><br />'. |
| |
'<select name="rolename" onchange="setCustomAction('."'edit'".');">'. |
| |
'<option value="" selected="selected">'. |
| |
&mt('Select')); |
| |
foreach my $role (sort(keys(%existingroles))) { |
| |
$r->print('<option value="'.$role.'">'.$role.'</option>'); |
| |
} |
| |
$r->print('</select>'. |
| |
'</td>'. |
| |
&Apache::loncommon::end_data_table_row()); |
| |
} |
| |
$r->print(&Apache::loncommon::end_data_table().'<p>'. |
| |
'<input name="customeditor" type="submit" value="'. |
| |
$lt{'cre'}.'" /></p>'. |
| |
'</form>'); |
| } |
} |
| } else { |
} else { |
| my $actiontext = $lt{'srad'}; |
my $actiontext = $lt{'srad'}; |
|
Line 547 ENDCUSTOM
|
Line 585 ENDCUSTOM
|
| $actiontext = $lt{'srst'}; |
$actiontext = $lt{'srst'}; |
| } |
} |
| } |
} |
| $r->print(" |
$r->print("<h3>$actiontext</h3>"); |
| <h3>$actiontext</h3>"); |
|
| if ($env{'form.origform'} ne 'crtusername') { |
if ($env{'form.origform'} ne 'crtusername') { |
| $r->print("\n".$response); |
$r->print("\n".$response); |
| } |
} |
|
Line 557 ENDCUSTOM
|
Line 594 ENDCUSTOM
|
| $r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
| } |
} |
| |
|
| |
sub customrole_javascript { |
| |
my $js = <<"END"; |
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
|
| |
function setCustomFields() { |
| |
if (document.docustom.customroleaction.length > 0) { |
| |
for (var i=0; i<document.docustom.customroleaction.length; i++) { |
| |
if (document.docustom.customroleaction[i].checked) { |
| |
if (document.docustom.customroleaction[i].value == 'new') { |
| |
document.docustom.rolename.selectedIndex = 0; |
| |
} else { |
| |
document.docustom.newrolename.value = ''; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
function setCustomAction(caller) { |
| |
if (document.docustom.customroleaction.length > 0) { |
| |
for (var i=0; i<document.docustom.customroleaction.length; i++) { |
| |
if (document.docustom.customroleaction[i].value == caller) { |
| |
document.docustom.customroleaction[i].checked = true; |
| |
} |
| |
} |
| |
} |
| |
setCustomFields(); |
| |
return; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
END |
| |
return $js; |
| |
} |
| |
|
| sub entry_form { |
sub entry_form { |
| my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_; |
my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_; |
| my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); |
|
Line 870 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 963 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 1203 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 1324 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 1340 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; |
| |
} elsif ($end ne '') { |
| |
$newvalue .= '_'.$end; |
| |
} |
| |
$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. |
$row.= '</td><td>'.$plaintext. |
| '</td><td>'.$area. |
'</td><td>'.$area. |
| '</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) |
'</td><td>'.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) |
| : ' ' ). |
: ' ' ). |
| '</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) |
'</td><td>'.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) |
| : ' ' ) |
: ' ' ) |
| ."</td>"; |
."</td>"; |
| $sortrole{$sortkey}=$envkey; |
$sortrole{$sortkey}=$envkey; |
| $roletext{$envkey}=$row; |
$roletext{$envkey}=$row; |
| $roleclass{$envkey}=$class; |
$roleclass{$envkey}=$class; |
| $rolepriv{$envkey}=$allowed; |
$rolepriv{$envkey}=$allowed; |
| #$r->print($row); |
} # end of foreach (table building loop) |
| } # end of foreach (table building loop) |
|
| my $rolesdisplay = 0; |
my $rolesdisplay = 0; |
| my %output = (); |
my %output = (); |
| foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { |
foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { |
| $output{$type} = ''; |
$output{$type} = ''; |
| foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { |
foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { |
| if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { |
if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { |
| $output{$type}.= |
$output{$type}.= |
| &Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
| $roletext{$sortrole{$which}}. |
$roletext{$sortrole{$which}}. |
| &Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
| } |
} |
| } |
} |
| unless($output{$type} eq '') { |
unless($output{$type} eq '') { |
| $output{$type} = '<tr class="LC_info_row">'. |
$output{$type} = '<tr class="LC_info_row">'. |
| "<td align='center' colspan='7'>".&mt($type)."</td></tr>". |
"<td align='center' colspan='7'>".&mt($type)."</td></tr>". |
| $output{$type}; |
$output{$type}; |
| $rolesdisplay = 1; |
$rolesdisplay = 1; |
| } |
} |
| } |
} |
| if ($rolesdisplay == 1) { |
if ($rolesdisplay == 1) { |
| my $contextrole=''; |
my $contextrole=''; |
| if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
| my $crstype = &Apache::loncommon::course_type(); |
if (&Apache::loncommon::course_type() eq 'Community') { |
| $contextrole = "Existing Roles in this $crstype"; |
$contextrole = &mt('Existing Roles in this Community'); |
| } 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 1921 sub personal_data_display {
|
Line 2065 sub personal_data_display {
|
| if ($canmodify_status{'inststatus'}) { |
if ($canmodify_status{'inststatus'}) { |
| $shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types); |
$shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types); |
| } else { |
} else { |
| $shown .= $userenv{'inststatus'}; |
|
| if ($userenv{'inststatus'} eq '') { |
if ($userenv{'inststatus'} eq '') { |
| $hiderow = 1; |
$hiderow = 1; |
| |
} else { |
| |
my @showitems; |
| |
foreach my $item ( map { &unescape($_); } split(':',$userenv{'inststatus'})) { |
| |
if (exists($usertypes->{$item})) { |
| |
push(@showitems,$usertypes->{$item}); |
| |
} else { |
| |
push(@showitems,$item); |
| |
} |
| |
} |
| |
if (@showitems) { |
| |
$shown = join(', ',@showitems); |
| |
} else { |
| |
$hiderow = 1; |
| |
} |
| } |
} |
| } |
} |
| if (!$hiderow) { |
if (!$hiderow) { |
|
Line 2141 sub update_user_data {
|
Line 2298 sub update_user_data {
|
| $r->print('<h3>'.&mt('User [_1] in domain [_2]', |
$r->print('<h3>'.&mt('User [_1] in domain [_2]', |
| $env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>'); |
$env{'form.ccuname'}, $env{'form.ccdomain'}).'</h3>'); |
| my (%alerts,%rulematch,%inst_results,%curr_rules); |
my (%alerts,%rulematch,%inst_results,%curr_rules); |
| |
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); |
| my @usertools = ('aboutme','blog','portfolio'); |
my @usertools = ('aboutme','blog','portfolio'); |
| my @requestcourses = ('official','unofficial','community'); |
my @requestcourses = ('official','unofficial','community'); |
| my ($othertitle,$usertypes,$types) = |
my ($othertitle,$usertypes,$types) = |
| &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); |
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); |
| |
my %canmodify_status = |
| |
&Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'}, |
| |
['inststatus']); |
| if ($env{'form.makeuser'}) { |
if ($env{'form.makeuser'}) { |
| $r->print('<h3>'.&mt('Creating new account.').'</h3>'); |
$r->print('<h3>'.&mt('Creating new account.').'</h3>'); |
| # Check for the authentication mode and password |
# Check for the authentication mode and password |
|
Line 2204 sub update_user_data {
|
Line 2365 sub update_user_data {
|
| $r->print(&mt('Generating user').': '.$result); |
$r->print(&mt('Generating user').': '.$result); |
| $uhome = &Apache::lonnet::homeserver($env{'form.ccuname'}, |
$uhome = &Apache::lonnet::homeserver($env{'form.ccuname'}, |
| $env{'form.ccdomain'}); |
$env{'form.ccdomain'}); |
| my (%changeHash,%newcustom,%changed); |
my (%changeHash,%newcustom,%changed,%changedinfo); |
| if ($uhome ne 'no_host') { |
if ($uhome ne 'no_host') { |
| if ($env{'form.customquota'} == 1) { |
if ($context eq 'domain') { |
| if ($env{'form.portfolioquota'} eq '') { |
if ($env{'form.customquota'} == 1) { |
| $newcustom{'quota'} = 0; |
if ($env{'form.portfolioquota'} eq '') { |
| } else { |
$newcustom{'quota'} = 0; |
| $newcustom{'quota'} = $env{'form.portfolioquota'}; |
} else { |
| $newcustom{'quota'} =~ s/[^\d\.]//g; |
$newcustom{'quota'} = $env{'form.portfolioquota'}; |
| |
$newcustom{'quota'} =~ s/[^\d\.]//g; |
| |
} |
| |
$changed{'quota'} = "a_admin($newcustom{'quota'},\%changeHash); |
| } |
} |
| $changed{'quota'} = "a_admin($newcustom{'quota'},\%changeHash); |
foreach my $item (@usertools) { |
| } |
if ($env{'form.custom'.$item} == 1) { |
| foreach my $item (@usertools) { |
$newcustom{$item} = $env{'form.tools_'.$item}; |
| if ($env{'form.custom'.$item} == 1) { |
$changed{$item} = &tool_admin($item,$newcustom{$item}, |
| $newcustom{$item} = $env{'form.tools_'.$item}; |
\%changeHash,'tools'); |
| $changed{$item} = &tool_admin($item,$newcustom{$item}, |
} |
| \%changeHash,'tools'); |
|
| } |
} |
| } |
foreach my $item (@requestcourses) { |
| foreach my $item (@requestcourses) { |
$newcustom{$item} = $env{'form.crsreq_'.$item}; |
| $newcustom{$item} = $env{'form.crsreq_'.$item}; |
if ($env{'form.crsreq_'.$item} eq 'autolimit') { |
| if ($env{'form.crsreq_'.$item} eq 'autolimit') { |
$newcustom{$item} .= '='; |
| $newcustom{$item} .= '='; |
unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) { |
| unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) { |
$newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'}; |
| $newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'}; |
} |
| } |
} |
| |
$changed{$item} = &tool_admin($item,$newcustom{$item}, |
| |
\%changeHash,'requestcourses'); |
| } |
} |
| $changed{$item} = &tool_admin($item,$newcustom{$item}, |
|
| \%changeHash,'requestcourses'); |
|
| } |
} |
| if (exists($env{'form.inststatus'})) { |
if ($canmodify_status{'inststatus'}) { |
| my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); |
if (exists($env{'form.inststatus'})) { |
| if (@inststatuses > 0) { |
my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); |
| $changeHash{'inststatus'} = join(',',@inststatuses); |
if (@inststatuses > 0) { |
| $changed{'inststatus'} = $changeHash{'inststatus'}; |
$changeHash{'inststatus'} = join(',',@inststatuses); |
| |
$changed{'inststatus'} = $changeHash{'inststatus'}; |
| |
} |
| } |
} |
| } |
} |
| if (keys(%changed)) { |
if (keys(%changed)) { |
| $changeHash{'firstname'} = $env{'form.cfirstname'}; |
foreach my $item (@userinfo) { |
| $changeHash{'middlename'} = $env{'form.cmiddlename'}; |
$changeHash{$item} = $env{'form.c'.$item}; |
| $changeHash{'lastname'} = $env{'form.clastname'}; |
} |
| $changeHash{'generation'} = $env{'form.cgeneration'}; |
|
| $changeHash{'id'} = $env{'form.cid'}; |
|
| $changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; |
|
| my $chgresult = |
my $chgresult = |
| &Apache::lonnet::put('environment',\%changeHash, |
&Apache::lonnet::put('environment',\%changeHash, |
| $env{'form.ccdomain'},$env{'form.ccuname'}); |
$env{'form.ccdomain'},$env{'form.ccuname'}); |
|
Line 2275 sub update_user_data {
|
Line 2437 sub update_user_data {
|
| } |
} |
| } |
} |
| ## |
## |
| my (@userroles,%userupdate,$cnum,$cdom,$crstype,$namechanged); |
my (@userroles,%userupdate,$cnum,$cdom,$crstype,%namechanged); |
| if ($context eq 'course') { |
if ($context eq 'course') { |
| ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); |
($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); |
| $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum); |
$crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum); |
|
Line 2365 sub update_user_data {
|
Line 2527 sub update_user_data {
|
| push(@longroles,&Apache::lonnet::plaintext($role,$crstype)); |
push(@longroles,&Apache::lonnet::plaintext($role,$crstype)); |
| } |
} |
| } |
} |
| my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); |
|
| my %canmodify = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},\@userinfo,\@userroles); |
my %canmodify = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},\@userinfo,\@userroles); |
| foreach my $item (@userinfo) { |
foreach my $item (@userinfo) { |
| # Strip leading and trailing whitespace |
# Strip leading and trailing whitespace |
|
Line 2412 sub update_user_data {
|
Line 2573 sub update_user_data {
|
| } |
} |
| } |
} |
| my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus, |
my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus, |
| $inststatus,$newinststatus,$oldisdefault,$newisdefault,$olddefquotatext, |
$newinststatus,$oldisdefault,$newisdefault,%oldsettings, |
| $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext, |
%oldsettingstext,%newsettings,%newsettingstext,@disporder); |
| $oldinststatuses,$newinststatuses); |
@disporder = ('inststatus'); |
| |
if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) { |
| |
push(@disporder,'requestcourses'); |
| |
} else { |
| |
push(@disporder,'reqcrsotherdom'); |
| |
} |
| |
push(@disporder,('quota','tools')); |
| |
$oldinststatus = $userenv{'inststatus'}; |
| my ($defquota,$settingstatus) = |
my ($defquota,$settingstatus) = |
| &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); |
&Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus); |
| my ($showquota,$showtools,$showrequestcourses,$showinststatus,$showreqotherdom); |
my %canshow; |
| if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { |
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { |
| $showquota = 1; |
$canshow{'quota'} = 1; |
| } |
} |
| if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { |
if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { |
| $showtools = 1; |
$canshow{'tools'} = 1; |
| } |
} |
| if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { |
if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { |
| $showrequestcourses = 1; |
$canshow{'requestcourses'} = 1; |
| } elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { |
} elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { |
| $showreqotherdom = 1; |
$canshow{'reqcrsotherdom'} = 1; |
| } |
} |
| if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { |
if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { |
| $showinststatus = 1; |
$canshow{'inststatus'} = 1; |
| } |
} |
| my (%changeHash,%changed); |
my (%changeHash,%changed); |
| $oldinststatus = $userenv{'inststatus'}; |
|
| if ($oldinststatus eq '') { |
if ($oldinststatus eq '') { |
| $oldinststatuses = $othertitle; |
$oldsettings{'inststatus'} = $othertitle; |
| } else { |
} else { |
| if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
| $oldinststatuses = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'}))); |
$oldsettings{'inststatus'} = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'}))); |
| } else { |
} else { |
| $oldinststatuses = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'}))); |
$oldsettings{'inststatus'} = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'}))); |
| } |
} |
| } |
} |
| $changeHash{'inststatus'} = $userenv{'inststatus'}; |
$changeHash{'inststatus'} = $userenv{'inststatus'}; |
| my %canmodify_inststatus = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},['inststatus'],\@userroles); |
if ($canmodify_status{'inststatus'}) { |
| if ($canmodify_inststatus{'inststatus'}) { |
$canshow{'inststatus'} = 1; |
| if (exists($env{'form.inststatus'})) { |
if (exists($env{'form.inststatus'})) { |
| my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); |
my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); |
| if (@inststatuses > 0) { |
if (@inststatuses > 0) { |
|
Line 2455 sub update_user_data {
|
Line 2622 sub update_user_data {
|
| $changed{'inststatus'} = $newinststatus; |
$changed{'inststatus'} = $newinststatus; |
| } |
} |
| if (ref($usertypes) eq 'HASH') { |
if (ref($usertypes) eq 'HASH') { |
| $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); |
$newsettings{'inststatus'} = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); |
| } else { |
} else { |
| $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); |
$newsettings{'inststatus'} = join(', ',@inststatuses); |
| } |
|
| } else { |
|
| $newinststatus = ''; |
|
| $changeHash{'inststatus'} = $newinststatus; |
|
| $newinststatuses = $othertitle; |
|
| if ($newinststatus ne $oldinststatus) { |
|
| $changed{'inststatus'} = $changeHash{'inststatus'}; |
|
| } |
} |
| } |
} |
| |
} else { |
| |
$newinststatus = ''; |
| |
$changeHash{'inststatus'} = $newinststatus; |
| |
$newsettings{'inststatus'} = $othertitle; |
| |
if ($newinststatus ne $oldinststatus) { |
| |
$changed{'inststatus'} = $changeHash{'inststatus'}; |
| |
} |
| } |
} |
| |
} elsif ($context ne 'selfcreate') { |
| |
$canshow{'inststatus'} = 1; |
| |
$newsettings{'inststatus'} = $oldsettings{'inststatus'}; |
| } |
} |
| $changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; |
$changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; |
| if ($userenv{'portfolioquota'} ne '') { |
if ($context eq 'domain') { |
| $oldportfolioquota = $userenv{'portfolioquota'}; |
if ($userenv{'portfolioquota'} ne '') { |
| if ($env{'form.customquota'} == 1) { |
$oldportfolioquota = $userenv{'portfolioquota'}; |
| if ($env{'form.portfolioquota'} eq '') { |
if ($env{'form.customquota'} == 1) { |
| $newportfolioquota = 0; |
if ($env{'form.portfolioquota'} eq '') { |
| |
$newportfolioquota = 0; |
| |
} else { |
| |
$newportfolioquota = $env{'form.portfolioquota'}; |
| |
$newportfolioquota =~ s/[^\d\.]//g; |
| |
} |
| |
if ($newportfolioquota != $oldportfolioquota) { |
| |
$changed{'quota'} = "a_admin($newportfolioquota,\%changeHash); |
| |
} |
| } else { |
} else { |
| $newportfolioquota = $env{'form.portfolioquota'}; |
$changed{'quota'} = "a_admin('',\%changeHash); |
| $newportfolioquota =~ s/[^\d\.]//g; |
$newportfolioquota = $defquota; |
| } |
$newisdefault = 1; |
| if ($newportfolioquota != $oldportfolioquota) { |
|
| $changed{'quota'} = "a_admin($newportfolioquota,\%changeHash); |
|
| } |
} |
| } else { |
} else { |
| $changed{'quota'} = "a_admin('',\%changeHash); |
$oldisdefault = 1; |
| $newportfolioquota = $defquota; |
$oldportfolioquota = $defquota; |
| $newisdefault = 1; |
if ($env{'form.customquota'} == 1) { |
| } |
if ($env{'form.portfolioquota'} eq '') { |
| } else { |
$newportfolioquota = 0; |
| $oldisdefault = 1; |
} else { |
| $oldportfolioquota = $defquota; |
$newportfolioquota = $env{'form.portfolioquota'}; |
| if ($env{'form.customquota'} == 1) { |
$newportfolioquota =~ s/[^\d\.]//g; |
| if ($env{'form.portfolioquota'} eq '') { |
} |
| $newportfolioquota = 0; |
$changed{'quota'} = "a_admin($newportfolioquota,\%changeHash); |
| } else { |
} else { |
| $newportfolioquota = $env{'form.portfolioquota'}; |
$newportfolioquota = $defquota; |
| $newportfolioquota =~ s/[^\d\.]//g; |
$newisdefault = 1; |
| } |
} |
| $changed{'quota'} = "a_admin($newportfolioquota,\%changeHash); |
} |
| |
if ($oldisdefault) { |
| |
$oldsettingstext{'quota'} = &get_defaultquota_text($settingstatus); |
| |
} |
| |
if ($newisdefault) { |
| |
$newsettingstext{'quota'} = &get_defaultquota_text($settingstatus); |
| |
} |
| |
&tool_changes('tools',\@usertools,\%oldsettings,\%oldsettingstext,\%userenv, |
| |
\%changeHash,\%changed,\%newsettings,\%newsettingstext); |
| |
if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) { |
| |
&tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext, |
| |
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); |
| } else { |
} else { |
| $newportfolioquota = $defquota; |
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext, |
| $newisdefault = 1; |
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); |
| } |
} |
| } |
} |
| if ($oldisdefault) { |
foreach my $item (@userinfo) { |
| $olddefquotatext = &get_defaultquota_text($settingstatus); |
if ($env{'form.c'.$item} ne $userenv{$item}) { |
| } |
$namechanged{$item} = 1; |
| if ($newisdefault) { |
} |
| $newdefquotatext = &get_defaultquota_text($settingstatus); |
} |
| } |
$oldsettings{'quota'} = $oldportfolioquota.' Mb'; |
| &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv, |
$newsettings{'quota'} = $newportfolioquota.' Mb'; |
| \%changeHash,\%changed,\%newaccess,\%newaccesstext); |
if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) { |
| if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) { |
|
| &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext, |
|
| \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); |
|
| } else { |
|
| &tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext, |
|
| \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); |
|
| } |
|
| if ($env{'form.cfirstname'} ne $userenv{'firstname'} || |
|
| $env{'form.cmiddlename'} ne $userenv{'middlename'} || |
|
| $env{'form.clastname'} ne $userenv{'lastname'} || |
|
| $env{'form.cgeneration'} ne $userenv{'generation'} || |
|
| $env{'form.cid'} ne $userenv{'id'} || |
|
| $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} ) { |
|
| $namechanged = 1; |
|
| } |
|
| if (($namechanged) || (keys(%changed) > 0)) { |
|
| $changeHash{'firstname'} = $env{'form.cfirstname'}; |
|
| $changeHash{'middlename'} = $env{'form.cmiddlename'}; |
|
| $changeHash{'lastname'} = $env{'form.clastname'}; |
|
| $changeHash{'generation'} = $env{'form.cgeneration'}; |
|
| $changeHash{'id'} = $env{'form.cid'}; |
|
| $changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; |
|
| my ($chgresult,$namechgresult); |
my ($chgresult,$namechgresult); |
| if (keys(%changed) > 0) { |
if (keys(%changed) > 0) { |
| $chgresult = |
$chgresult = |
|
Line 2548 sub update_user_data {
|
Line 2713 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 2573 sub update_user_data {
|
Line 2737 sub update_user_data {
|
| } |
} |
| } |
} |
| } |
} |
| if ($namechanged) { |
if (keys(%namechanged) > 0) { |
| # Make the change |
foreach my $field (@userinfo) { |
| |
$changeHash{$field} = $env{'form.c'.$field}; |
| |
} |
| |
# Make the change |
| $namechgresult = |
$namechgresult = |
| &Apache::lonnet::modifyuser($env{'form.ccdomain'}, |
&Apache::lonnet::modifyuser($env{'form.ccdomain'}, |
| $env{'form.ccuname'},$changeHash{'id'},undef,undef, |
$env{'form.ccuname'},$changeHash{'id'},undef,undef, |
| $changeHash{'firstname'},$changeHash{'middlename'}, |
$changeHash{'firstname'},$changeHash{'middlename'}, |
| $changeHash{'lastname'},$changeHash{'generation'}, |
$changeHash{'lastname'},$changeHash{'generation'}, |
| $changeHash{'id'},undef,$changeHash{'permanentemail'}); |
$changeHash{'id'},undef,$changeHash{'permanentemail'},undef,\@userinfo); |
| %userupdate = ( |
%userupdate = ( |
| lastname => $env{'form.clastname'}, |
lastname => $env{'form.clastname'}, |
| middlename => $env{'form.cmiddlename'}, |
middlename => $env{'form.cmiddlename'}, |
|
Line 2589 sub update_user_data {
|
Line 2756 sub update_user_data {
|
| id => $env{'form.cid'}, |
id => $env{'form.cid'}, |
| ); |
); |
| } |
} |
| if (($namechanged && $namechgresult eq 'ok') || |
if (((keys(%namechanged) > 0) && $namechgresult eq 'ok') || |
| ((keys(%changed) > 0) && $chgresult eq 'ok')) { |
((keys(%changed) > 0) && $chgresult eq 'ok')) { |
| # Tell the user we changed the name |
# Tell the user we changed the name |
| my %lt=&Apache::lonlocal::texthash( |
&display_userinfo($r,1,\@disporder,\%canshow,\@requestcourses, |
| 'uic' => 'User Information Changed', |
\@usertools,\%userenv,\%changed,\%namechanged, |
| 'frst' => 'First Name', |
\%oldsettings, \%oldsettingstext,\%newsettings, |
| 'mddl' => 'Middle Name', |
\%newsettingstext); |
| 'lst' => 'Last Name', |
|
| 'gen' => 'Generation', |
|
| 'id' => 'Student/Employee ID', |
|
| 'mail' => 'Permanent e-mail address', |
|
| 'disk' => 'Disk space allocated to portfolio files', |
|
| 'blog' => 'Blog Availability', |
|
| 'aboutme' => 'Personal Information Page Availability', |
|
| 'portfolio' => 'Portfolio Availability', |
|
| 'official' => 'Can Request Official Courses', |
|
| 'unofficial' => 'Can Request Unofficial Courses', |
|
| 'community' => 'Can Request Communities', |
|
| 'inststatus' => "Affiliation", |
|
| 'prvs' => 'Previous Value:', |
|
| 'chto' => 'Changed To:' |
|
| ); |
|
| $r->print('<h4>'.$lt{'uic'}.'</h4>'. |
|
| &Apache::loncommon::start_data_table(). |
|
| &Apache::loncommon::start_data_table_header_row()); |
|
| $r->print(<<"END"); |
|
| <th> </th> |
|
| <th>$lt{'frst'}</th> |
|
| <th>$lt{'mddl'}</th> |
|
| <th>$lt{'lst'}</th> |
|
| <th>$lt{'gen'}</th> |
|
| <th>$lt{'id'}</th> |
|
| <th>$lt{'mail'}</th> |
|
| END |
|
| if ($showinststatus) { |
|
| $r->print(" |
|
| <th>$lt{'inststatus'}</th>\n"); |
|
| } |
|
| if ($showrequestcourses) { |
|
| foreach my $item (@requestcourses) { |
|
| $r->print(" |
|
| <th>$lt{$item}</th>\n"); |
|
| } |
|
| } elsif ($showreqotherdom) { |
|
| foreach my $item (@requestcourses) { |
|
| $r->print(" |
|
| <th>$lt{$item}</th>\n"); |
|
| } |
|
| } |
|
| if ($showquota) { |
|
| $r->print(" |
|
| <th>$lt{'disk'}</th>\n"); |
|
| } |
|
| if ($showtools) { |
|
| foreach my $item (@usertools) { |
|
| $r->print(" |
|
| <th>$lt{$item}</th>\n"); |
|
| } |
|
| } |
|
| $r->print(&Apache::loncommon::end_data_table_header_row(). |
|
| &Apache::loncommon::start_data_table_row()); |
|
| $r->print(<<"END"); |
|
| <td><b>$lt{'prvs'}</b></td> |
|
| <td>$userenv{'firstname'} </td> |
|
| <td>$userenv{'middlename'} </td> |
|
| <td>$userenv{'lastname'} </td> |
|
| <td>$userenv{'generation'} </td> |
|
| <td>$userenv{'id'}</td> |
|
| <td>$userenv{'permanentemail'} </td> |
|
| END |
|
| if ($showinststatus) { |
|
| $r->print(" |
|
| <td>$oldinststatuses</td>\n"); |
|
| } |
|
| if ($showrequestcourses) { |
|
| foreach my $item (@requestcourses) { |
|
| $r->print(" |
|
| <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n"); |
|
| } |
|
| } elsif ($showreqotherdom) { |
|
| foreach my $item (@requestcourses) { |
|
| $r->print(" |
|
| <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n"); |
|
| } |
|
| } |
|
| if ($showquota) { |
|
| $r->print(" |
|
| <td>$oldportfolioquota Mb $olddefquotatext </td>\n"); |
|
| } |
|
| if ($showtools) { |
|
| foreach my $item (@usertools) { |
|
| $r->print(" |
|
| <td>$oldaccess{$item} $oldaccesstext{$item} </td>\n"); |
|
| } |
|
| } |
|
| $r->print(&Apache::loncommon::end_data_table_row(). |
|
| &Apache::loncommon::start_data_table_row()); |
|
| $r->print(<<"END"); |
|
| <td><span class="LC_nobreak"><b>$lt{'chto'}</b></span></td> |
|
| <td>$env{'form.cfirstname'} </td> |
|
| <td>$env{'form.cmiddlename'} </td> |
|
| <td>$env{'form.clastname'} </td> |
|
| <td>$env{'form.cgeneration'} </td> |
|
| <td>$env{'form.cid'} </td> |
|
| <td>$env{'form.cpermanentemail'} </td> |
|
| END |
|
| if ($showinststatus) { |
|
| $r->print(" |
|
| <td>$newinststatuses</td>\n"); |
|
| } |
|
| if ($showrequestcourses) { |
|
| foreach my $item (@requestcourses) { |
|
| $r->print(" |
|
| <td>$newaccess{$item} $newaccesstext{$item} </td>\n"); |
|
| } |
|
| } elsif ($showreqotherdom) { |
|
| foreach my $item (@requestcourses) { |
|
| $r->print(" |
|
| <td>$newaccess{$item} $newaccesstext{$item} </td>\n"); |
|
| } |
|
| } |
|
| if ($showquota) { |
|
| $r->print(" |
|
| <td>$newportfolioquota Mb $newdefquotatext </td>\n"); |
|
| } |
|
| if ($showtools) { |
|
| foreach my $item (@usertools) { |
|
| $r->print(" |
|
| <td>$newaccess{$item} $newaccesstext{$item} </td>\n"); |
|
| } |
|
| } |
|
| $r->print(&Apache::loncommon::end_data_table_row(). |
|
| &Apache::loncommon::end_data_table().'<br />'); |
|
| 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'})); |
|
Line 2747 END
|
Line 2788 END
|
| $env{'form.ccuname'}.' '.&mt('in domain').' '. |
$env{'form.ccuname'}.' '.&mt('in domain').' '. |
| $env{'form.ccdomain'}.'</span><br />'); |
$env{'form.ccdomain'}.'</span><br />'); |
| } |
} |
| } else { # End of if ($env ... ) logic |
} else { # End of if ($env ... ) logic |
| # They did not want to change the users name, quota, tool availability, |
# They did not want to change the users name, quota, tool availability, |
| # or ability to request creation of courses, |
# or ability to request creation of courses, |
| # but we can still tell them what the name and quota and availabilities are |
# but we can still tell them what the name and quota and availabilities are |
| my %lt=&Apache::lonlocal::texthash( |
&display_userinfo($r,undef,\@disporder,\%canshow,\@requestcourses, |
| 'id' => "Student/Employee ID", |
\@usertools,\%userenv,\%changed,\%namechanged,\%oldsettings, |
| 'mail' => "Permanent e-mail address", |
\%oldsettingstext,\%newsettings,\%newsettingstext); |
| 'disk' => "Disk space allocated to user's portfolio files", |
|
| 'blog' => "Blog Availability", |
|
| 'aboutme' => "Personal Information Page Availability", |
|
| 'portfolio' => "Portfolio Availability", |
|
| 'official' => "Can Request Official Courses", |
|
| 'unofficial' => "Can Request Unofficial Courses", |
|
| 'community' => "Can Request Communities", |
|
| 'inststatus' => "Affiliation", |
|
| ); |
|
| $r->print(<<"END"); |
|
| <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} |
|
| END |
|
| if ($userenv{'permanentemail'} ne '') { |
|
| $r->print('<br />['.$lt{'mail'}.': '. |
|
| $userenv{'permanentemail'}.']'); |
|
| } |
|
| if ($showinststatus) { |
|
| $r->print('<br />['.$lt{'inststatus'}.': '.$oldinststatuses.']'); |
|
| } |
|
| if ($showrequestcourses) { |
|
| foreach my $item (@requestcourses) { |
|
| $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '. |
|
| $newaccesstext{$item}.']'."\n"); |
|
| } |
|
| } elsif ($showreqotherdom) { |
|
| foreach my $item (@requestcourses) { |
|
| $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '. |
|
| $newaccesstext{$item}.']'."\n"); |
|
| } |
|
| } |
|
| if ($showtools) { |
|
| foreach my $item (@usertools) { |
|
| $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '. |
|
| $newaccesstext{$item}.']'."\n"); |
|
| } |
|
| } |
|
| if ($showquota) { |
|
| $r->print('<br />['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '. |
|
| $olddefquotatext.']'); |
|
| } |
|
| $r->print('</h4>'); |
|
| } |
} |
| if (@mod_disallowed) { |
if (@mod_disallowed) { |
| my ($rolestr,$contextname); |
my ($rolestr,$contextname); |
|
Line 2841 END
|
Line 2841 END
|
| $r->print('</a></p>'); |
$r->print('</a></p>'); |
| } else { |
} else { |
| my @rolechanges = &update_roles($r,$context); |
my @rolechanges = &update_roles($r,$context); |
| if ($namechanged) { |
if (keys(%namechanged) > 0) { |
| if ($context eq 'course') { |
if ($context eq 'course') { |
| if (@userroles > 0) { |
if (@userroles > 0) { |
| if ((@rolechanges == 0) || |
if ((@rolechanges == 0) || |
|
Line 2870 END
|
Line 2870 END
|
| $r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
| } |
} |
| |
|
| |
sub display_userinfo { |
| |
my ($r,$changed,$order,$canshow,$requestcourses,$usertools,$userenv, |
| |
$changedhash,$namechangedhash,$oldsetting,$oldsettingtext, |
| |
$newsetting,$newsettingtext) = @_; |
| |
return unless (ref($order) eq 'ARRAY' && |
| |
ref($canshow) eq 'HASH' && |
| |
ref($requestcourses) eq 'ARRAY' && |
| |
ref($usertools) eq 'ARRAY' && |
| |
ref($userenv) eq 'HASH' && |
| |
ref($changedhash) eq 'HASH' && |
| |
ref($oldsetting) eq 'HASH' && |
| |
ref($oldsettingtext) eq 'HASH' && |
| |
ref($newsetting) eq 'HASH' && |
| |
ref($newsettingtext) eq 'HASH'); |
| |
my %lt=&Apache::lonlocal::texthash( |
| |
'ui' => 'User Information (unchanged)', |
| |
'uic' => 'User Information Changed', |
| |
'firstname' => 'First Name', |
| |
'middlename' => 'Middle Name', |
| |
'lastname' => 'Last Name', |
| |
'generation' => 'Generation', |
| |
'id' => 'Student/Employee ID', |
| |
'permanentemail' => 'Permanent e-mail address', |
| |
'quota' => 'Disk space allocated to portfolio files', |
| |
'blog' => 'Blog Availability', |
| |
'aboutme' => 'Personal Information Page Availability', |
| |
'portfolio' => 'Portfolio Availability', |
| |
'official' => 'Can Request Official Courses', |
| |
'unofficial' => 'Can Request Unofficial Courses', |
| |
'community' => 'Can Request Communities', |
| |
'inststatus' => "Affiliation", |
| |
'prvs' => 'Previous Value:', |
| |
'chto' => 'Changed To:' |
| |
); |
| |
my $title = $lt{'ui'}; |
| |
if ($changed) { |
| |
$title = $lt{'uic'}; |
| |
} |
| |
$r->print('<h4>'.$title.'</h4>'. |
| |
&Apache::loncommon::start_data_table(). |
| |
&Apache::loncommon::start_data_table_header_row()); |
| |
if ($changed) { |
| |
$r->print("<th> </th>\n"); |
| |
} |
| |
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); |
| |
foreach my $item (@userinfo) { |
| |
$r->print("<th>$lt{$item}</th>\n"); |
| |
} |
| |
foreach my $entry (@{$order}) { |
| |
if ($canshow->{$entry}) { |
| |
if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { |
| |
foreach my $item (@{$requestcourses}) { |
| |
$r->print("<th>$lt{$item}</th>\n"); |
| |
} |
| |
} elsif ($entry eq 'tools') { |
| |
foreach my $item (@{$usertools}) { |
| |
$r->print("<th>$lt{$item}</th>\n"); |
| |
} |
| |
} else { |
| |
$r->print("<th>$lt{$entry}</th>\n"); |
| |
} |
| |
} |
| |
} |
| |
$r->print(&Apache::loncommon::end_data_table_header_row(). |
| |
&Apache::loncommon::start_data_table_row()); |
| |
if ($changed) { |
| |
$r->print('<td><b>'.$lt{'prvs'}.'</b></td>'."\n"); |
| |
} |
| |
foreach my $item (@userinfo) { |
| |
$r->print('<td>'.$userenv->{$item}.' </td>'."\n"); |
| |
} |
| |
foreach my $entry (@{$order}) { |
| |
if ($canshow->{$entry}) { |
| |
if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { |
| |
foreach my $item (@{$requestcourses}) { |
| |
$r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n"); |
| |
} |
| |
} elsif ($entry eq 'tools') { |
| |
foreach my $item (@{$usertools}) { |
| |
$r->print("<td>$oldsetting->{$item} $oldsettingtext->{$item}</td>\n"); |
| |
} |
| |
} else { |
| |
$r->print("<td>$oldsetting->{$entry} $oldsettingtext->{$entry} </td>\n"); |
| |
} |
| |
} |
| |
} |
| |
$r->print(&Apache::loncommon::end_data_table_row()); |
| |
if ($changed) { |
| |
$r->print(&Apache::loncommon::start_data_table_row(). |
| |
'<td><span class="LC_nobreak"><b>'.$lt{'chto'}.'</b></span></td>'."\n"); |
| |
foreach my $item (@userinfo) { |
| |
my $value = $env{'form.c'.$item}; |
| |
if ($namechangedhash->{$item}) { |
| |
$value = '<span class="LC_cusr_emph">'.$value.'</span>'; |
| |
} |
| |
$r->print("<td>$value </td>\n"); |
| |
} |
| |
foreach my $entry (@{$order}) { |
| |
if ($canshow->{$entry}) { |
| |
if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { |
| |
foreach my $item (@{$requestcourses}) { |
| |
my $value = $newsetting->{$item}.' '.$newsettingtext->{$item}; |
| |
if ($changedhash->{$item}) { |
| |
$value = '<span class="LC_cusr_emph">'.$value.'</span>'; |
| |
} |
| |
$r->print("<td>$value </td>\n"); |
| |
} |
| |
} elsif ($entry eq 'tools') { |
| |
foreach my $item (@{$usertools}) { |
| |
my $value = $newsetting->{$item}.' '.$newsettingtext->{$item}; |
| |
if ($changedhash->{$item}) { |
| |
$value = '<span class="LC_cusr_emph">'.$value.'</span>'; |
| |
} |
| |
$r->print("<td>$value </td>\n"); |
| |
} |
| |
} else { |
| |
my $value = $newsetting->{$entry}.' '.$newsettingtext->{$entry}; |
| |
if ($changedhash->{$entry}) { |
| |
$value = '<span class="LC_cusr_emph">'.$value.'</span>'; |
| |
} |
| |
$r->print("<td>$value </td>\n"); |
| |
} |
| |
} |
| |
} |
| |
$r->print(&Apache::loncommon::end_data_table_row()); |
| |
} |
| |
$r->print(&Apache::loncommon::end_data_table().'<br />'); |
| |
return; |
| |
} |
| |
|
| sub tool_changes { |
sub tool_changes { |
| my ($context,$usertools,$oldaccess,$oldaccesstext,$userenv,$changeHash, |
my ($context,$usertools,$oldaccess,$oldaccesstext,$userenv,$changeHash, |
| $changed,$newaccess,$newaccesstext) = @_; |
$changed,$newaccess,$newaccesstext) = @_; |
|
Line 3478 sub build_roles {
|
Line 3608 sub build_roles {
|
| |
|
| sub custom_role_editor { |
sub custom_role_editor { |
| my ($r) = @_; |
my ($r) = @_; |
| my $rolename=$env{'form.rolename'}; |
my $action = $env{'form.customroleaction'}; |
| |
my $rolename; |
| if ($rolename eq 'make new role') { |
if ($action eq 'new') { |
| $rolename=$env{'form.newrolename'}; |
$rolename=$env{'form.newrolename'}; |
| |
} else { |
| |
$rolename=$env{'form.rolename'}; |
| } |
} |
| |
|
| $rolename=~s/[^A-Za-z0-9]//gs; |
$rolename=~s/[^A-Za-z0-9]//gs; |
| |
|
| if (!$rolename || $env{'form.phase'} eq 'pickrole') { |
if (!$rolename || $env{'form.phase'} eq 'pickrole') { |
| &print_username_entry_form($r); |
&print_username_entry_form($r); |
| return; |
return; |
| } |
} |
| |
my ($crstype,$context); |
| |
if ($env{'request.course.id'}) { |
| |
$crstype = &Apache::loncommon::course_type(); |
| |
$context = 'course'; |
| |
} else { |
| |
$context = 'domain'; |
| |
$crstype = $env{'form.templatecrstype'}; |
| |
} |
| # ------------------------------------------------------- What can be assigned? |
# ------------------------------------------------------- What can be assigned? |
| my %full=(); |
my %full=(); |
| my %courselevel=(); |
my %courselevel=(); |
|
Line 3498 sub custom_role_editor {
|
Line 3637 sub custom_role_editor {
|
| my $dompriv=''; |
my $dompriv=''; |
| my $coursepriv=''; |
my $coursepriv=''; |
| my $body_top; |
my $body_top; |
| my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]); |
|
| my ($rdummy,$roledef)= |
my ($rdummy,$roledef)= |
| &Apache::lonnet::get('roles',["rolesdef_$rolename"]); |
&Apache::lonnet::get('roles',["rolesdef_$rolename"]); |
| # ------------------------------------------------------- Does this role exist? |
# ------------------------------------------------------- Does this role exist? |
|
Line 3507 sub custom_role_editor {
|
Line 3645 sub custom_role_editor {
|
| $body_top .= &mt('Existing Role').' "'; |
$body_top .= &mt('Existing Role').' "'; |
| # ------------------------------------------------- Get current role privileges |
# ------------------------------------------------- Get current role privileges |
| ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); |
($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); |
| |
if ($crstype eq 'Community') { |
| |
$syspriv =~ s/bre\&S//; |
| |
} |
| } else { |
} else { |
| $body_top .= &mt('New Role').' "'; |
$body_top .= &mt('New Role').' "'; |
| $roledef=''; |
$roledef=''; |
|
Line 3548 sub custom_role_editor {
|
Line 3689 sub custom_role_editor {
|
| my $head_script = "\n"; |
my $head_script = "\n"; |
| $head_script .= '<script type="text/javascript">'."\n" |
$head_script .= '<script type="text/javascript">'."\n" |
| .'// <![CDATA['."\n"; |
.'// <![CDATA['."\n"; |
| my $crstype; |
my @template_roles = ("in","ta","ep"); |
| if ($env{'request.course.id'}) { |
if ($context eq 'domain') { |
| $crstype = &Apache::loncommon::course_type(); |
push(@template_roles,"ad"); |
| } |
} |
| my @template_roles = ("in","ta","ep","st"); |
push(@template_roles,"st"); |
| if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
| unshift(@template_roles,'co'); |
unshift(@template_roles,'co'); |
| } else { |
} else { |
| unshift(@template_roles,'cc'); |
unshift(@template_roles,'cc'); |
| } |
} |
| foreach my $role (@template_roles) { |
foreach my $role (@template_roles) { |
| $head_script .= &make_script_template($role); |
$head_script .= &make_script_template($role,$crstype); |
| $button_code .= &make_button_code($role,$crstype).' '; |
$button_code .= &make_button_code($role,$crstype).' '; |
| } |
} |
| |
my $context_code; |
| |
if ($context eq 'domain') { |
| |
my $checkedCommunity = ''; |
| |
my $checkedCourse = ' checked="checked"'; |
| |
if ($env{'form.templatecrstype'} eq 'Community') { |
| |
$checkedCommunity = $checkedCourse; |
| |
$checkedCourse = ''; |
| |
} |
| |
$context_code = '<label>'. |
| |
'<input type="radio" name="templatecrstype" value="Course"'.$checkedCourse.' onclick="this.form.submit();">'. |
| |
&mt('Course'). |
| |
'</label>'.(' ' x2). |
| |
'<label>'. |
| |
'<input type="radio" name="templatecrstype" value="Community"'.$checkedCommunity.' onclick="this.form.submit();">'. |
| |
&mt('Community'). |
| |
'</label>'. |
| |
'</fieldset>'. |
| |
'<input type="hidden" name="customroleaction" value="'. |
| |
$action.'" />'; |
| |
if ($env{'form.customroleaction'} eq 'new') { |
| |
$context_code .= '<input type="hidden" name="newrolename" value="'. |
| |
$rolename.'" />'; |
| |
} else { |
| |
$context_code .= '<input type="hidden" name="rolename" value="'. |
| |
$rolename.'" />'; |
| |
} |
| |
$context_code .= '<input type="hidden" name="action" value="custom" />'. |
| |
'<input type="hidden" name="phase" value="selected_custom_edit" />'; |
| |
} |
| |
|
| $head_script .= "\n".$jsback."\n" |
$head_script .= "\n".$jsback."\n" |
| .'// ]]>'."\n" |
.'// ]]>'."\n" |
| .'</script>'."\n"; |
.'</script>'."\n"; |
|
Line 3583 sub custom_role_editor {
|
Line 3754 sub custom_role_editor {
|
| 'dml' => "Domain Level", |
'dml' => "Domain Level", |
| 'ssl' => "System Level"); |
'ssl' => "System Level"); |
| |
|
| $r->print('<div>' |
|
| |
$r->print('<div class="LC_left_float">' |
| .'<form action=""><fieldset>' |
.'<form action=""><fieldset>' |
| .'<legend>'.&mt('Select a Template').'</legend>' |
.'<legend>'.&mt('Select a Template').'</legend>' |
| .$button_code |
.$button_code |
| .'</fieldset></form>' |
.'</fieldset></form></div>'); |
| .'</div>' |
if ($context_code) { |
| ); |
$r->print('<div class="LC_left_float">' |
| |
.'<form action="/adm/createuser" method="post"><fieldset>' |
| |
.'<legend>'.&mt('Context').'</legend>' |
| |
.$context_code |
| |
.'</form>' |
| |
.'</div>' |
| |
); |
| |
} |
| |
$r->print('<br clear="all" />'); |
| |
|
| $r->print(<<ENDCCF); |
$r->print(<<ENDCCF); |
| <form name="form1" method="post"> |
<form name="form1" method="post"> |
|
Line 3601 ENDCCF
|
Line 3781 ENDCCF
|
| '<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}. |
'<th>'.$lt{'prv'}.'</th><th>'.$lt{'crl'}.'</th><th>'.$lt{'dml'}. |
| '</th><th>'.$lt{'ssl'}.'</th>'. |
'</th><th>'.$lt{'ssl'}.'</th>'. |
| &Apache::loncommon::end_data_table_header_row()); |
&Apache::loncommon::end_data_table_header_row()); |
| foreach my $priv (sort keys %full) { |
foreach my $priv (sort(keys(%full))) { |
| my $privtext = &Apache::lonnet::plaintext($priv,$crstype); |
my $privtext = &Apache::lonnet::plaintext($priv,$crstype); |
| $r->print(&Apache::loncommon::start_data_table_row(). |
$r->print(&Apache::loncommon::start_data_table_row(). |
| '<td>'.$privtext.'</td><td>'. |
'<td>'.$privtext.'</td><td>'. |
|
Line 3610 ENDCCF
|
Line 3790 ENDCCF
|
| '</td><td>'. |
'</td><td>'. |
| ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'. |
($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'. |
| ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' '). |
($domainlevelcurrent{$priv}?' checked="checked"':'').' />':' '). |
| '</td><td>'. |
'</td><td>'); |
| ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'. |
if ($priv eq 'bre' && $crstype eq 'Community') { |
| ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' '). |
$r->print(' '); |
| '</td>'. |
} else { |
| &Apache::loncommon::end_data_table_row()); |
$r->print($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'. |
| |
($systemlevelcurrent{$priv}?' checked="checked"':'').' />':' '); |
| |
} |
| |
$r->print('</td>'. |
| |
&Apache::loncommon::end_data_table_row()); |
| } |
} |
| $r->print(&Apache::loncommon::end_data_table(). |
$r->print(&Apache::loncommon::end_data_table(). |
| '<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. |
'<input type="hidden" name="action" value="'.$env{'form.action'}.'" />'. |
|
Line 3626 ENDCCF
|
Line 3810 ENDCCF
|
| } |
} |
| # -------------------------------------------------------- |
# -------------------------------------------------------- |
| sub make_script_template { |
sub make_script_template { |
| my ($role) = @_; |
my ($role,$crstype) = @_; |
| my %full_c=(); |
my %full_c=(); |
| my %full_d=(); |
my %full_d=(); |
| my %full_s=(); |
my %full_s=(); |
|
Line 3640 sub make_script_template {
|
Line 3824 sub make_script_template {
|
| $full_d{$priv}=1; |
$full_d{$priv}=1; |
| } |
} |
| foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { |
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { |
| |
next if (($crstype eq 'Community') && ($item eq 'bre&S')); |
| my ($priv,$restrict)=split(/\&/,$item); |
my ($priv,$restrict)=split(/\&/,$item); |
| $full_s{$priv}=1; |
$full_s{$priv}=1; |
| } |
} |
|
Line 3944 sub handler {
|
Line 4129 sub handler {
|
| $r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users", |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users", |
| 'Course_View_Class_List')); |
'Course_View_Class_List')); |
| if ($permission->{'cusr'}) { |
if ($permission->{'cusr'}) { |
| &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice); |
&Apache::lonuserutils::update_user_list($r,$context,$setting,$choice,$crstype); |
| $r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
| } else { |
} else { |
| $r->print(&mt('You are not authorized to make bulk changes to user roles')); |
$r->print(&mt('You are not authorized to make bulk changes to user roles')); |
|
Line 3957 sub handler {
|
Line 4142 sub handler {
|
| text=>"List Users"}); |
text=>"List Users"}); |
| my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles); |
my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles); |
| my $formname = 'studentform'; |
my $formname = 'studentform'; |
| if ($context eq 'domain' && $env{'form.roletype'} eq 'course') { |
if (($context eq 'domain') && (($env{'form.roletype'} eq 'course') || |
| ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = |
($env{'form.roletype'} eq 'community'))) { |
| &Apache::lonuserutils::courses_selector($env{'request.role.domain'}, |
if ($env{'form.roletype'} eq 'course') { |
| $formname); |
($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = |
| |
&Apache::lonuserutils::courses_selector($env{'request.role.domain'}, |
| |
$formname); |
| |
} elsif ($env{'form.roletype'} eq 'community') { |
| |
$cb_jscript = |
| |
&Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); |
| |
my %elements = ( |
| |
coursepick => 'radio', |
| |
coursetotal => 'text', |
| |
courselist => 'text', |
| |
); |
| |
$jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements); |
| |
} |
| $jscript .= &verify_user_display(); |
$jscript .= &verify_user_display(); |
| my $js = &add_script($jscript).$cb_jscript; |
my $js = &add_script($jscript).$cb_jscript; |
| my $loadcode = |
my $loadcode = |
|
Line 4278 sub print_main_menu {
|
Line 4475 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 4307 sub print_main_menu {
|
Line 4504 sub print_main_menu {
|
| } |
} |
| |
|
| if (!exists($permission->{'cusr_section'})){ |
if (!exists($permission->{'cusr_section'})){ |
| |
if ($crstype ne 'Community') { |
| push(@{ $menu[2]->{items} }, |
push(@{ $menu[2]->{items} }, |
| { |
{ |
| linktext => 'Automated Enrollment', |
linktext => 'Automated Enrollment', |
| icon => 'roles.png', |
icon => 'roles.png', |
| #help => 'Course_Automated_Enrollment', |
#help => 'Course_Automated_Enrollment', |
| permission => (&Apache::lonnet::auto_run($cnum,$cdom) |
permission => (&Apache::lonnet::auto_run($cnum,$cdom) |
| && $permission->{'cusr'}), |
&& $permission->{'cusr'}), |
| url => '/adm/populate', |
url => '/adm/populate', |
| linktitle => 'Automated enrollment manager.', |
linktitle => 'Automated enrollment manager.', |
| }, |
} |
| |
); |
| |
} |
| |
push(@{ $menu[2]->{items} }, |
| { |
{ |
| linktext => 'User Self-Enrollment', |
linktext => 'User Self-Enrollment', |
| icon => 'cstr.png', |
icon => 'cstr.png', |
|
Line 4327 sub print_main_menu {
|
Line 4527 sub print_main_menu {
|
| linktitle => 'Configure user self-enrollment.', |
linktitle => 'Configure user self-enrollment.', |
| }, |
}, |
| ); |
); |
| |
|
| } |
} |
| }; |
}; |
| return Apache::lonhtmlcommon::generate_menu(@menu); |
return Apache::lonhtmlcommon::generate_menu(@menu); |
|
Line 4351 sub restore_prev_selections {
|
Line 4550 sub restore_prev_selections {
|
| |
|
| sub print_selfenroll_menu { |
sub print_selfenroll_menu { |
| my ($r,$context,$permission) = @_; |
my ($r,$context,$permission) = @_; |
| |
my $crstype = &Apache::loncommon::course_type(); |
| my $formname = 'enrollstudent'; |
my $formname = 'enrollstudent'; |
| my $nolink = 1; |
my $nolink = 1; |
| my ($row,$lt) = &get_selfenroll_titles(); |
my ($row,$lt) = &get_selfenroll_titles(); |
|
Line 4712 ENDSCRIPT
|
Line 4912 ENDSCRIPT
|
| &mt('No').'</label>'; |
&mt('No').'</label>'; |
| my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1); |
my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1); |
| my (@ccs,%notified); |
my (@ccs,%notified); |
| if ($advhash{'cc'}) { |
my $ccrole = 'cc'; |
| @ccs = split(/,/,$advhash{'cc'}); |
if ($crstype eq 'Community') { |
| |
$ccrole = 'co'; |
| |
} |
| |
if ($advhash{$ccrole}) { |
| |
@ccs = split(/,/,$advhash{$ccrole}); |
| } |
} |
| if ($currnotified) { |
if ($currnotified) { |
| foreach my $current (split(/,/,$currnotified)) { |
foreach my $current (split(/,/,$currnotified)) { |
|
Line 5022 sub print_userchangelogs_display {
|
Line 5226 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 5057 sub print_userchangelogs_display {
|
Line 5260 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 5068 sub print_userchangelogs_display {
|
Line 5270 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 5091 sub print_userchangelogs_display {
|
Line 5314 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 5130 sub print_userchangelogs_display {
|
Line 5360 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 5141 sub print_userchangelogs_display {
|
Line 5371 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 5174 function chgPage(caller) {
|
Line 5408 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 5651 sub build_search_response {
|
Line 5859 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 5676 sub build_search_response {
|
Line 5884 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 5833 sub course_level_table {
|
Line 6047 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 $type=$coursedata{'type'}; |
my $crstype=$coursedata{'type'}; |
| if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } |
if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } |
| my ($domain,$cnum)=split(/\//,$thiscourse); |
my ($domain,$cnum)=split(/\//,$thiscourse); |
| my %sections_count; |
my %sections_count; |
|
Line 5848 sub course_level_table {
|
Line 6063 sub course_level_table {
|
| &Apache::loncommon::get_sections($domain,$cnum); |
&Apache::loncommon::get_sections($domain,$cnum); |
| } |
} |
| } |
} |
| my @roles = &Apache::lonuserutils::roles_by_context('course'); |
my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype); |
| foreach my $role (@roles) { |
foreach my $role (@roles) { |
| my $plrole=&Apache::lonnet::plaintext($role,$type); |
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 5863 sub course_level_table {
|
Line 6079 sub course_level_table {
|
| } |
} |
| } |
} |
| if (&Apache::lonnet::allowed('ccr',$thiscourse)) { |
if (&Apache::lonnet::allowed('ccr',$thiscourse)) { |
| foreach my $cust (sort keys %customroles) { |
foreach my $cust (sort(keys(%customroles))) { |
| |
next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/); |
| my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust; |
my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust; |
| $table .= &course_level_row($protectedcourse,$role,$area,$domain, |
$table .= &course_level_row($protectedcourse,$role,$area,$domain, |
| $cust,\%sections_count,\%lt); |
$cust,\%sections_count,\%lt); |
|
Line 5894 sub course_level_row {
|
Line 6111 sub course_level_row {
|
| $protectedcourse.'_'.$role.'" /></td>'."\n". |
$protectedcourse.'_'.$role.'" /></td>'."\n". |
| ' <td>'.$plrole.'</td>'."\n". |
' <td>'.$plrole.'</td>'."\n". |
| ' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n"; |
' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n"; |
| if ($role eq 'cc') { |
if (($role eq 'cc') || ($role eq 'co')) { |
| $row .= '<td> </td>'; |
$row .= '<td> </td>'; |
| } elsif ($env{'request.course.sec'} ne '') { |
} elsif ($env{'request.course.sec'} ne '') { |
| $row .= ' <td><input type="hidden" value="'. |
$row .= ' <td><input type="hidden" value="'. |
|
Line 5942 sub course_level_dc {
|
Line 6159 sub course_level_dc {
|
| '<input type="hidden" name="origdom" value="'.$dcdom.'" />'. |
'<input type="hidden" name="origdom" value="'.$dcdom.'" />'. |
| '<input type="hidden" name="dccourse" value="" />'; |
'<input type="hidden" name="dccourse" value="" />'; |
| my $courseform='<b>'.&Apache::loncommon::selectcourse_link |
my $courseform='<b>'.&Apache::loncommon::selectcourse_link |
| ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').'</b>'; |
('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Community','crstype').'</b>'; |
| my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role'); |
my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser'); |
| my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
| 'rol' => "Role", |
'rol' => "Role", |
| 'grs' => "Section", |
'grs' => "Section", |
|
Line 5954 sub course_level_dc {
|
Line 6171 sub course_level_dc {
|
| 'ssd' => "Set Start Date", |
'ssd' => "Set Start Date", |
| 'sed' => "Set End Date" |
'sed' => "Set End Date" |
| ); |
); |
| my $header = '<h4>'.&mt('Course Level').'</h4>'. |
my $header = '<h4>'.&mt('Course/Community Level').'</h4>'. |
| &Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
| &Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
| '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. |
'<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'. |
| &Apache::loncommon::end_data_table_header_row(); |
&Apache::loncommon::end_data_table_header_row(); |
| my $otheritems = &Apache::loncommon::start_data_table_row()."\n". |
my $otheritems = &Apache::loncommon::start_data_table_row()."\n". |
| '<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n". |
'<td><br /><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc','','','','crstype'".')" /></td>'."\n". |
| '<td><select name="role">'."\n"; |
'<td valign><br /><select name="role">'."\n"; |
| foreach my $role (@roles) { |
foreach my $role (@roles) { |
| my $plrole=&Apache::lonnet::plaintext($role); |
my $plrole=&Apache::lonnet::plaintext($role); |
| $otheritems .= ' <option value="'.$role.'">'.$plrole; |
$otheritems .= ' <option value="'.$role.'">'.$plrole; |
|
Line 5981 sub course_level_dc {
|
Line 6198 sub course_level_dc {
|
| '<td valign="top"> <b>'.$lt{'new'}.'</b><br />'. |
'<td valign="top"> <b>'.$lt{'new'}.'</b><br />'. |
| '<input type="text" name="newsec" value="" />'. |
'<input type="text" name="newsec" value="" />'. |
| '<input type="hidden" name="section" value="" />'. |
'<input type="hidden" name="section" value="" />'. |
| '<input type="hidden" name="groups" value="" /></td>'. |
'<input type="hidden" name="groups" value="" />'. |
| |
'<input type="hidden" name="crstype" value="" /></td>'. |
| '</tr></table></td>'; |
'</tr></table></td>'; |
| $otheritems .= <<ENDTIMEENTRY; |
$otheritems .= <<ENDTIMEENTRY; |
| <td><input type="hidden" name="start" value='' /> |
<td><br /><input type="hidden" name="start" value='' /> |
| <a href= |
<a href= |
| "javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td> |
"javascript:pjump('date_start','Start Date',document.cu.start.value,'start','cu.pres','dateset')">$lt{'ssd'}</a></td> |
| <td><input type="hidden" name="end" value='' /> |
<td><br /><input type="hidden" name="end" value='' /> |
| <a href= |
<a href= |
| "javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td> |
"javascript:pjump('date_end','End Date',document.cu.end.value,'end','cu.pres','dateset')">$lt{'sed'}</a></td> |
| ENDTIMEENTRY |
ENDTIMEENTRY |
|
Line 6051 sub update_selfenroll_config {
|
Line 6269 sub update_selfenroll_config {
|
| $newnum ++; |
$newnum ++; |
| } |
} |
| } |
} |
| for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) { if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) { |
for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) { |
| |
if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) { |
| my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j); |
my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j); |
| if (@types > 0) { |
if (@types > 0) { |
| @types = sort(@types); |
@types = sort(@types); |
|
Line 6354 sub get_selfenroll_titles {
|
Line 6573 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 |
![[BACK]](/icons/back.gif){kind=icon}
Return to loncreateuser.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface