print(' onclick="auth_check()" \>'."\n");
} else {
- $r->print(' onclick="this.form.submit()" \>'."\n");
+ $r->print('onclick="this.form.submit()" \>'."\n");
}
} else {
$r->print(''.
@@ -1907,9 +1587,6 @@ ENDNOTOOLSPRIV
$r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
$r->print(''.$1.'_'.$2.' ');
} else {
if ($showall) {
$contextrole = &mt('Existing Roles in this Domain');
@@ -2362,25 +2027,13 @@ sub new_coauthor_roles {
#
# Co-Author
#
- my ($cuname,$cudom);
- if (($env{'request.role'} eq "au./$env{'user.domain'}/") ||
- ($env{'request.role'} eq "dc./$env{'user.domain'}/")) {
- $cuname=$env{'user.name'};
- $cudom=$env{'request.role.domain'};
+ if (&Apache::lonuserutils::authorpriv($env{'user.name'},
+ $env{'request.role.domain'}) &&
+ ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
# No sense in assigning co-author role to yourself
- if ((&Apache::lonuserutils::authorpriv($cuname,$cudom)) &&
- ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) {
- $addrolesdisplay = 1;
- }
- } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
- ($cudom,$cuname) = ($1,$2);
- if ((&Apache::lonuserutils::coauthorpriv($cuname,$cudom)) &&
- ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain) &&
- ($cudom ne $ccdomain || $cuname ne $ccuname)) {
- $addrolesdisplay = 1;
- }
- }
- if ($addrolesdisplay) {
+ $addrolesdisplay = 1;
+ my $cuname=$env{'user.name'};
+ my $cudom=$env{'request.role.domain'};
my %lt=&Apache::lonlocal::texthash(
'cs' => "Authoring Space",
'act' => "Activate",
@@ -2435,17 +2088,6 @@ sub new_coauthor_roles {
($env{'user.domain'} eq $ccdomain)) {
$r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Authoring Space is not permitted'));
}
- } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
- if (!(&Apache::lonuserutils::coauthorpriv($2,$1))) {
- $r->print(''.
- &mt('You do not have privileges to assign co-author roles.').
- ' ');
- } elsif (($env{'user.name'} eq $ccuname) &&
- ($env{'user.domain'} eq $ccdomain)) {
- $r->print(&mt('Assigning yourself a co-author or assistant co-author role in an author area in Authoring Space in which you already have a co-author role is not permitted'));
- } elsif (($cudom eq $ccdomain) && ($cuname eq $ccuname)) {
- $r->print(&mt("Assigning a co-author or assistant co-author role to an Authoring Space's author is not permitted"));
- }
}
return $addrolesdisplay;;
}
@@ -2501,7 +2143,7 @@ sub new_domain_roles {
}
sub user_authentication {
- my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_;
+ my ($ccuname,$ccdomain,$formname) = @_;
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
my $outcome;
my %lt=&Apache::lonlocal::texthash(
@@ -2539,6 +2181,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
ENDBADAUTH
}
} else { # Authentication type is valid
+
&initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
my ($authformcurrent,$can_modify,@authform_others) =
&modify_login_block($ccdomain,$currentauth);
@@ -2573,43 +2216,6 @@ ENDBADAUTH
}
$outcome .= &Apache::loncommon::end_data_table();
} else {
- if (($currentauth =~ /^internal:/) &&
- (&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) {
- $outcome = <<"ENDJS";
-
-ENDJS
-
- $outcome .= ''.$lt{'ld'}.' '.
- &Apache::loncommon::start_data_table().
- &Apache::loncommon::start_data_table_row().
- ''.&mt('Internally authenticated').''.
- ' '.&mt('Password').'
'.
- &Apache::loncommon::end_data_table_row().
- &Apache::loncommon::end_data_table();
- }
if (&Apache::lonnet::allowed('udp',$ccdomain)) {
# Current user has rights to view domain preferences for user's domain
my $result;
@@ -2718,9 +2324,9 @@ sub modify_login_block {
}
sub personal_data_display {
- my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$readonly,$rolesarray,$now,
- $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_;
- my ($output,%userenv,%canmodify,%canmodify_status,$disabled);
+ my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
+ $now,$captchaform,$emailusername,$usertype) = @_;
+ my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
my $rowcount = 0;
@@ -2746,7 +2352,6 @@ sub personal_data_display {
'inststatus' => "Affiliation",
'email' => 'E-mail address',
'valid' => 'Validation',
- 'username' => 'Username',
);
%canmodify_status =
@@ -2765,7 +2370,7 @@ sub personal_data_display {
if (ref($emailusername) eq 'HASH') {
if (ref($emailusername->{$usertype}) eq 'HASH') {
my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
- @userinfo = ();
+ @userinfo = ();
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
foreach my $field (@{$infofields}) {
if ($emailusername->{$usertype}->{$field}) {
@@ -2789,50 +2394,19 @@ sub personal_data_display {
%canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,
$inst_results,$rolesarray);
}
- } elsif ($readonly) {
- $disabled = ' disabled="disabled"';
}
my $genhelp=&Apache::loncommon::help_open_topic('Generation');
$output = ''.$lt{'pd'}.' '.
&Apache::lonhtmlcommon::start_pick_box();
if (($context eq 'selfcreate') && ($newuser eq 'email')) {
- my $size = 25;
- if ($condition) {
- if ($condition =~ /^\@[^\@]+$/) {
- $size = 10;
- } else {
- undef($condition);
- }
- }
- if ($excluded) {
- unless ($excluded =~ /^\@[^\@]+$/) {
- undef($condition);
- }
- }
$output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'* ',undef,
'LC_oddrow_value')."\n".
- ''.&mt('You must use an e-mail address that does not end with [_1]',
- $excluded).' ';
- }
- if ($usernameset eq 'first') {
- $output .= '';
- if ($condition) {
- $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]',
- $condition);
- } else {
- $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @');
- }
- $output .= ' ';
- }
+ '* ',
'LC_pick_box_title',
'LC_oddrow_value')."\n".
@@ -2843,20 +2417,6 @@ sub personal_data_display {
'LC_oddrow_value')."\n".
$upasstwo.
&Apache::lonhtmlcommon::row_closure()."\n";
- if ($usernameset eq 'free') {
- my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
- $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
- ''.&mt('Use e-mail address: ').
- ' '."\n".
- ''.
- ''.&mt('Preferred username').
- '
'."\n".&Apache::lonhtmlcommon::row_closure(1);
- $rowcount ++;
- }
}
foreach my $item (@userinfo) {
my $rowtitle = $lt{$item};
@@ -2878,7 +2438,7 @@ sub personal_data_display {
$hiderow = 1;
}
} else {
- $row .= ''.$lt{'uic'}.' '.
@@ -4073,13 +3444,10 @@ sub display_userinfo {
}
foreach my $entry (@{$order}) {
if ($canshow->{$entry}) {
- if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') ||
- ($entry eq 'requestauthor') || ($entry eq 'authordefaults')) {
+ if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') || ($entry eq 'requestauthor')) {
my @items;
if ($entry eq 'requestauthor') {
@items = ($entry);
- } elsif ($entry eq 'authordefaults') {
- @items = ('webdav','managers','editors','archive');
} else {
@items = @{$requestcourses};
}
@@ -4087,27 +3455,19 @@ sub display_userinfo {
if (($newsetting->{$item} ne $oldsetting->{$item}) ||
($newsettingtext->{$item} ne $oldsettingtext->{$item})) {
$r->print(&Apache::loncommon::start_data_table_row()."\n");
- $r->print("$lt{$item} \n");
- unless ($item eq 'managers') {
- $r->print($oldsetting->{$item});
- }
+ $r->print(" $lt{$item} \n");
+ $r->print("".$oldsetting->{$item});
if ($oldsettingtext->{$item}) {
if ($oldsetting->{$item}) {
- unless ($item eq 'managers') {
- $r->print(' -- ');
- }
+ $r->print(' -- ');
}
$r->print($oldsettingtext->{$item});
}
- $r->print(" \n");
- unless ($item eq 'managers') {
- $r->print($newsetting->{$item});
- }
+ $r->print(" \n");
+ $r->print("".$newsetting->{$item});
if ($newsettingtext->{$item}) {
if ($newsetting->{$item}) {
- unless ($item eq 'managers') {
- $r->print(' -- ');
- }
+ $r->print(' -- ');
}
$r->print($newsettingtext->{$item});
}
@@ -4268,11 +3628,6 @@ sub tool_changes {
}
return;
}
- my %tooldesc = &Apache::lonlocal::texthash(
- 'edit' => 'Standard editor (Edit)',
- 'xml' => 'Text editor (EditXML)',
- 'daxe' => 'Daxe editor (Daxe)',
- );
foreach my $tool (@{$usertools}) {
my ($newval,$limit,$envkey);
$envkey = $context.'.'.$tool;
@@ -4286,54 +3641,6 @@ sub tool_changes {
} elsif ($context eq 'requestauthor') {
$newval = $env{'form.'.$context};
$envkey = $context;
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $envkey = 'authoreditors';
- if ($env{'form.customeditors'} == 1) {
- my @editors;
- my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor');
- if (@posseditors) {
- foreach my $editor (@posseditors) {
- if (grep(/^\Q$editor\E$/,@posseditors)) {
- unless (grep(/^\Q$editor\E$/,@editors)) {
- push(@editors,$editor);
- }
- }
- }
- }
- if (@editors) {
- $newval = join(',',(sort(@editors)));
- }
- }
- } elsif ($tool eq 'managers') {
- $envkey = 'authormanagers';
- my @possibles = &Apache::loncommon::get_env_multiple('form.custommanagers');
- if (@possibles) {
- my %ca_roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'},
- undef,['active','future'],['ca']);
- if (keys(%ca_roles)) {
- my @custommanagers;
- foreach my $user (@possibles) {
- if ($user =~ /^($match_username):($match_domain)$/) {
- if (exists($ca_roles{$user.':ca'})) {
- unless ($user eq $env{'form.ccuname'}.':'.$env{'form.ccdomain'}) {
- push(@custommanagers,$user);
- }
- }
- }
- }
- if (@custommanagers) {
- $newval = join(',',sort(@custommanagers));
- }
- }
- }
- } elsif ($tool eq 'webdav') {
- $envkey = 'tools.webdav';
- $newval = $env{'form.'.$context.'_'.$tool};
- } elsif ($tool eq 'archive') {
- $envkey = 'authorarchive';
- $newval = $env{'form.'.$context.'_'.$tool};
- }
} else {
$newval = $env{'form.'.$context.'_'.$tool};
}
@@ -4352,25 +3659,6 @@ sub tool_changes {
} else {
$oldaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'managers') {
- if ($userenv->{$envkey} eq '') {
- $oldaccesstext->{$tool} = &mt('Only author may manage co-author roles');
- } else {
- my $managers = $userenv->{$envkey};
- $managers =~ s/,/, /g;
- $oldaccesstext->{$tool} = $managers;
- }
- } elsif ($tool eq 'editors') {
- $oldaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
- if ($userenv->{$envkey}) {
- $oldaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $oldaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($userenv->{$envkey}) {
$oldaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4379,8 +3667,7 @@ sub tool_changes {
}
}
$changeHash->{$envkey} = $userenv->{$envkey};
- if (($env{'form.custom'.$tool} == 1) ||
- (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
+ if ($env{'form.custom'.$tool} == 1) {
if ($newval ne $userenv->{$envkey}) {
$changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
$context);
@@ -4398,25 +3685,6 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $newaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$changeHash->{$envkey})));
- } elsif ($tool eq 'managers') {
- if ($changeHash->{$envkey} eq '') {
- $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
- } else {
- my $managers = $changeHash->{$envkey};
- $managers =~ s/,/, /g;
- $newaccesstext->{$tool} = $managers;
- }
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
- if ($newval) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4427,36 +3695,17 @@ sub tool_changes {
} else {
$newaccess->{$tool} = $oldaccess->{$tool};
if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
- if ($userenv->{$envkey} =~ /^autolimit/) {
+ if ($newval =~ /^autolimit/) {
if ($limit) {
$newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit);
} else {
$newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)');
}
- } elsif ($userenv->{$envkey}) {
- $newaccesstext->{$tool} = $reqdisplay{$userenv->{$envkey}};
+ } elsif ($newval) {
+ $newaccesstext->{$tool} = $reqdisplay{$newval};
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $newaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey})));
- } elsif ($tool eq 'managers') {
- if ($userenv->{$envkey} eq '') {
- $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
- } else {
- my $managers = $userenv->{$envkey};
- $managers =~ s/,/, /g;
- $newaccesstext->{$tool} = $managers;
- }
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
- if ($userenv->{$envkey}) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($userenv->{$context.'.'.$tool}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4487,25 +3736,6 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'editors') {
- $newaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
- } elsif ($tool eq 'managers') {
- if ($newval eq '') {
- $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
- } else {
- my $managers = $newval;
- $managers =~ s/,/, /g;
- $newaccesstext->{$tool} = $managers;
- }
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
- if ($newval) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($userenv->{$context.'.'.$tool}) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -4517,8 +3747,7 @@ sub tool_changes {
}
} else {
$oldaccess->{$tool} = &mt('default');
- if (($env{'form.custom'.$tool} == 1) ||
- (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) {
+ if ($env{'form.custom'.$tool} == 1) {
$changed->{$tool} = &tool_admin($tool,$newval,$changeHash,
$context);
if ($changed->{$tool}) {
@@ -4535,25 +3764,6 @@ sub tool_changes {
} else {
$newaccesstext->{$tool} = &mt("availability set to 'off'");
}
- } elsif ($context eq 'authordefaults') {
- if ($tool eq 'managers') {
- if ($newval eq '') {
- $newaccesstext->{$tool} = &mt('Only author may manage co-author roles');
- } else {
- my $managers = $newval;
- $managers =~ s/,/, /g;
- $newaccesstext->{$tool} = $managers;
- }
- } elsif ($tool eq 'editors') {
- $newaccesstext->{$tool} = &mt('can use: [_1]',
- join(', ', map { $tooldesc{$_} } split(/,/,$newval)));
- } elsif (($tool eq 'webdav') || ($tool eq 'archive')) {
- if ($newval) {
- $newaccesstext->{$tool} = &mt("availability set to 'on'");
- } else {
- $newaccesstext->{$tool} = &mt("availability set to 'off'");
- }
- }
} else {
if ($newval) {
$newaccesstext->{$tool} = &mt("availability set to 'on'");
@@ -5048,10 +4258,6 @@ sub tool_admin {
if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
$canchange = 1;
}
- } elsif ($context eq 'authordefaults') {
- if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) {
- $canchange = 1;
- }
} elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) {
# Current user has quota modification privileges
$canchange = 1;
@@ -5062,10 +4268,6 @@ sub tool_admin {
$toolchanged = 1;
if ($tool eq 'requestauthor') {
$changeHash->{$context} = $settool;
- } elsif (($tool eq 'managers') || ($tool eq 'editors') || ($tool eq 'archive')) {
- $changeHash->{'author'.$tool} = $settool;
- } elsif ($tool eq 'webdav') {
- $changeHash->{'tools.'.$tool} = $settool;
} else {
$changeHash->{$context.'.'.$tool} = $settool;
}
@@ -5110,9 +4312,9 @@ sub build_roles {
# ========================================================== Custom Role Editor
sub custom_role_editor {
- my ($r,$context,$brcrum,$prefix,$permission) = @_;
+ my ($r,$brcrum,$prefix) = @_;
my $action = $env{'form.customroleaction'};
- my ($rolename,$helpitem);
+ my $rolename;
if ($action eq 'new') {
$rolename=$env{'form.newrolename'};
} else {
@@ -5123,17 +4325,14 @@ sub custom_role_editor {
if ($env{'request.course.id'}) {
$crstype = &Apache::loncommon::course_type();
$context = 'course';
- $helpitem = 'Course_Editing_Custom_Roles';
} else {
$context = 'domain';
$crstype = 'course';
- $helpitem = 'Domain_Editing_Custom_Roles';
}
$rolename=~s/[^A-Za-z0-9]//gs;
if (!$rolename || $env{'form.phase'} eq 'pickrole') {
- &print_username_entry_form($r,$context,undef,undef,undef,$crstype,$brcrum,
- $permission);
+ &print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum);
return;
}
@@ -5188,7 +4387,7 @@ sub custom_role_editor {
text => "Edit custom role",
faq => 282,
bug => 'Instructor Interface',
- help => $helpitem}
+ help => 'Course_Editing_Custom_Roles'}
);
my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};
@@ -5215,11 +4414,11 @@ ENDCCF
# ---------------------------------------------------------- Call to definerole
sub set_custom_role {
- my ($r,$context,$brcrum,$prefix,$permission) = @_;
+ my ($r,$context,$brcrum,$prefix) = @_;
my $rolename=$env{'form.rolename'};
$rolename=~s/[^A-Za-z0-9]//gs;
if (!$rolename) {
- &custom_role_editor($r,$context,$brcrum,$prefix,$permission);
+ &custom_role_editor($r,$brcrum,$prefix);
return;
}
my ($jsback,$elements) = &crumb_utilities();
@@ -5228,10 +4427,6 @@ sub set_custom_role {
.$jsback."\n"
.'// ]]>'."\n"
.''."\n";
- my $helpitem = 'Course_Editing_Custom_Roles';
- if ($context eq 'domain') {
- $helpitem = 'Domain_Editing_Custom_Roles';
- }
push(@{$brcrum},
{href => "javascript:backPage(document.customresult,'pickrole','')",
text => "Pick custom role",
@@ -5245,7 +4440,7 @@ sub set_custom_role {
text => "Result",
faq => 282,
bug => 'Instructor Interface',
- help => $helpitem,}
+ help => 'Course_Editing_Custom_Roles'},
);
my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};
@@ -5308,164 +4503,6 @@ sub set_custom_role {
);
}
-sub display_coauthor_managers {
- my ($permission) = @_;
- my $output;
- if ((ref($permission) eq 'HASH') && ($permission->{'author'})) {
- $output = '';
- } else {
- $output = ''.
- &mt('You do not have permission to perform this action').
- ' ';
- }
- return $output;
-}
-
-sub update_coauthor_managers {
- my ($permission) = @_;
- my $output;
- if ((ref($permission) eq 'HASH') && ($permission->{'author'})) {
- my ($current,$newval,@possibles,@managers);
- my %userenv =
- &Apache::lonnet::userenvironment($env{'user.domain'},
- $env{'user.name'},
- 'authormanagers');
- $current = $userenv{'authormanagers'};
- @possibles = &Apache::loncommon::get_env_multiple('form.custommanagers');
- if (@possibles) {
- my %ca_roles = &Apache::lonnet::get_my_roles(undef,undef,undef,
- ['active','future'],['ca']);
- if (keys(%ca_roles)) {
- foreach my $user (@possibles) {
- if ($user =~ /^($match_username):($match_domain)$/) {
- if (exists($ca_roles{$user.':ca'})) {
- unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) {
- push(@managers,$user);
- }
- }
- }
- }
- if (@managers) {
- $newval = join(',',sort(@managers));
- }
- }
- }
- if ($current eq $newval) {
- $output = &mt('No changes made to management of co-author roles');
- } else {
- my $chgresult =
- &Apache::lonnet::put('environment',{'authormanagers' => $newval},
- $env{'user.domain'},$env{'user.name'});
- if ($chgresult eq 'ok') {
- &Apache::lonnet::appenv({'environment.authormanagers' => $newval});
- my (@adds,@dels);
- if ($newval eq '') {
- @dels = split(/,/,$current);
- } elsif ($current eq '') {
- @adds = @managers;
- } else {
- my @old = split(/,/,$current);
- my @diffs = &Apache::loncommon::compare_arrays(\@old,\@managers);
- if (@diffs) {
- foreach my $user (@diffs) {
- if (grep(/^\Q$user\E$/,@old)) {
- push(@dels,$user);
- } elsif (grep(/^\Q$user\E$/,@managers)) {
- push(@adds,$user);
- }
- }
- }
- }
- my $key = "internal.manager./$env{'user.domain'}/$env{'user.name'}";
- if (@dels) {
- foreach my $user (@dels) {
- if ($user =~ /^($match_username):($match_domain)$/) {
- &Apache::lonnet::del('environment',[$key],$2,$1);
- }
- }
- }
- if (@adds) {
- foreach my $user (@adds) {
- if ($user =~ /^($match_username):($match_domain)$/) {
- &Apache::lonnet::put('environment',{$key => 1},$2,$1);
- }
- }
- }
- if ($newval eq '') {
- $output = &mt('Management of co-authors set to be author-only');
- } else {
- $output .= &mt('Co-authors who can manage co-author roles set to: [_1]',
- ''.
- &mt('You do not have permission to perform this action').
- ' ';
- }
- return $output;
-}
-
# ================================================================ Main Handler
sub handler {
my $r = shift;
@@ -5474,96 +4511,19 @@ sub handler {
$r->send_http_header;
return OK;
}
- my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems);
-
+ my ($context,$crstype);
if ($env{'request.course.id'}) {
$context = 'course';
$crstype = &Apache::loncommon::course_type();
} elsif ($env{'request.role'} =~ /^au\./) {
$context = 'author';
- } elsif ($env{'request.role'} =~ m{^(ca|aa)\./$match_domain/$match_username$}) {
- $context = 'coauthor';
} else {
$context = 'domain';
}
- my ($permission,$allowed) =
- &Apache::lonuserutils::get_permission($context,$crstype);
- if (($context eq 'coauthor') && ($allowed)) {
- $context = 'author';
- }
-
- if ($allowed) {
- my @allhelp;
- if ($context eq 'course') {
- $cid = $env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
-
- if ($permission->{'cusr'}) {
- push(@allhelp,'Course_Create_Class_List');
- }
- if ($permission->{'view'} || $permission->{'cusr'}) {
- push(@allhelp,('Course_Change_Privileges','Course_View_Class_List'));
- }
- if ($permission->{'custom'}) {
- push(@allhelp,'Course_Editing_Custom_Roles');
- }
- if ($permission->{'cusr'}) {
- push(@allhelp,('Course_Add_Student','Course_Drop_Student'));
- }
- unless ($permission->{'cusr_section'}) {
- if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) {
- push(@allhelp,'Course_Automated_Enrollment');
- }
- if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) {
- push(@allhelp,'Course_Approve_Selfenroll');
- }
- }
- if ($permission->{'grp_manage'}) {
- push(@allhelp,'Course_Manage_Group');
- }
- if ($permission->{'view'} || $permission->{'cusr'}) {
- push(@allhelp,'Course_User_Logs');
- }
- } elsif ($context eq 'author') {
- push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
- 'Author_View_Coauthor_List','Author_User_Logs'));
- } elsif ($context eq 'coauthor') {
- if ($permission->{'cusr'}) {
- push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List',
- 'Author_View_Coauthor_List','Author_User_Logs'));
- } elsif ($permission->{'view'}) {
- push(@allhelp,'Author_View_Coauthor_List');
- }
- } else {
- if ($permission->{'cusr'}) {
- push(@allhelp,'Domain_Change_Privileges');
- if ($permission->{'activity'}) {
- push(@allhelp,'Domain_User_Access_Logs');
- }
- push(@allhelp,('Domain_Create_Users','Domain_View_Users_List'));
- if ($permission->{'custom'}) {
- push(@allhelp,'Domain_Editing_Custom_Roles');
- }
- push(@allhelp,('Domain_Role_Approvals','Domain_Username_Approvals','Domain_Change_Logs'));
- } elsif ($permission->{'view'}) {
- push(@allhelp,'Domain_View_Privileges');
- if ($permission->{'activity'}) {
- push(@allhelp,'Domain_User_Access_Logs');
- }
- push(@allhelp,('Domain_View_Users_List','Domain_Change_Logs'));
- }
- }
- if (@allhelp) {
- $allhelpitems = join(',',@allhelp);
- }
- }
-
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
- 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue',
- 'forceedit']);
+ 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $args;
my $brcrum = [];
@@ -5571,16 +4531,17 @@ sub handler {
if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) {
$brcrum = [{href=>"/adm/createuser",
text=>"User Management",
- help=>$allhelpitems}
+ help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'}
];
}
+ #SD Following files not added to help, because the corresponding .tex-files seem to
+ #be missing: Course_Approve_Selfenroll,Course_User_Logs,
+ my ($permission,$allowed) =
+ &Apache::lonuserutils::get_permission($context,$crstype);
if (!$allowed) {
if ($context eq 'course') {
$r->internal_redirect('/adm/viewclasslist');
return OK;
- } elsif ($context eq 'coauthor') {
- $r->internal_redirect('/adm/viewcoauthors');
- return OK;
}
$env{'user.error.msg'}=
"/adm/createuser:cst:0:0:Cannot create/modify user data ".
@@ -5608,16 +4569,10 @@ sub handler {
$r->print(&header(undef,$args));
$r->print(&print_main_menu($permission,$context,$crstype));
} elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
- my $helpitem = 'Course_Create_Class_List';
- if ($context eq 'author') {
- $helpitem = 'Author_Create_Coauthor_List';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Create_Users';
- }
push(@{$brcrum},
{ href => '/adm/createuser?action=upload&state=',
text => 'Upload Users List',
- help => $helpitem,
+ help => 'Course_Create_Class_List',
});
$bread_crumbs_component = 'Upload Users List';
$args = {bread_crumbs => $brcrum,
@@ -5629,41 +4584,16 @@ sub handler {
if (! exists($env{'form.state'})) {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
} elsif ($env{'form.state'} eq 'got_file') {
- my $result =
- &Apache::lonuserutils::print_upload_manager_form($r,$context,
- $permission,
- $crstype,$showcredits);
- if ($result eq 'missingdata') {
- delete($env{'form.state'});
- &Apache::lonuserutils::print_first_users_upload_form($r,$context);
- }
+ &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
+ $crstype,$showcredits);
} elsif ($env{'form.state'} eq 'enrolling') {
if ($env{'form.datatoken'}) {
- my $result = &Apache::lonuserutils::upfile_drop_add($r,$context,
- $permission,
- $showcredits);
- if ($result eq 'missingdata') {
- delete($env{'form.state'});
- &Apache::lonuserutils::print_first_users_upload_form($r,$context);
- } elsif ($result eq 'invalidhome') {
- $env{'form.state'} = 'got_file';
- delete($env{'form.lcserver'});
- my $result =
- &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
- $crstype,$showcredits);
- if ($result eq 'missingdata') {
- delete($env{'form.state'});
- &Apache::lonuserutils::print_first_users_upload_form($r,$context);
- }
- }
- } else {
- delete($env{'form.state'});
- &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+ &Apache::lonuserutils::upfile_drop_add($r,$context,$permission,
+ $showcredits);
}
} else {
&Apache::lonuserutils::print_first_users_upload_form($r,$context);
}
- $r->print('');
} elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
eq 'singlestudent')) && ($permission->{'cusr'})) ||
(($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) ||
@@ -5687,7 +4617,7 @@ sub handler {
.'';
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,undef,
- $crstype,$brcrum,$permission);
+ $crstype,$brcrum,$showcredits);
} else {
my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'});
my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'});
@@ -5732,8 +4662,7 @@ sub handler {
# }
#}
&print_username_entry_form($r,$context,$response,$srch,
- $forcenewuser,$crstype,$brcrum,
- $permission);
+ $forcenewuser,$crstype,$brcrum);
} else {
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
}
@@ -5750,8 +4679,7 @@ sub handler {
} else {
$env{'form.phase'} = '';
&print_username_entry_form($r,$context,$response,$srch,
- $forcenewuser,$crstype,$brcrum,
- $permission);
+ $forcenewuser,$crstype,$brcrum);
}
} elsif ($env{'form.phase'} eq 'userpicked') {
my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
@@ -5769,17 +4697,17 @@ sub handler {
&print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
}
} elsif ($env{'form.phase'} eq 'update_user_data') {
- &update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission);
+ &update_user_data($r,$context,$crstype,$brcrum,$showcredits);
} else {
&print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
- $brcrum,$permission);
+ $brcrum);
}
} elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
my $prefix;
if ($env{'form.phase'} eq 'set_custom_roles') {
- &set_custom_role($r,$context,$brcrum,$prefix,$permission);
+ &set_custom_role($r,$context,$brcrum,$prefix);
} else {
- &custom_role_editor($r,$context,$brcrum,$prefix,$permission);
+ &custom_role_editor($r,$brcrum,$prefix);
}
} elsif (($env{'form.action'} eq 'processauthorreq') &&
($permission->{'cusr'}) &&
@@ -5885,92 +4813,56 @@ sub handler {
unless ($usertype) {
$usertype = 'default';
}
- my ($showstatus,$showemail,$pickstart);
- my $numextras = 0;
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
- if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
- if (ref($usertypes) eq 'HASH') {
- if ($usertypes->{$usertype}) {
- $showstatus = $usertypes->{$usertype};
- } else {
- $showstatus = $othertitle;
- }
- if ($showstatus) {
- $numextras ++;
- }
- }
- }
- if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) {
- $showemail = $info{$uname}{'email'};
- $numextras ++;
- }
if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {
if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
- $pickstart = 1;
$r->print(''.&Apache::lonhtmlcommon::start_pick_box());
- my ($num,$count);
+ my ($num,$count,$showstatus);
$count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
- $count += $numextras;
+ unless ($usertype eq 'default') {
+ my ($othertitle,$usertypes,$types) =
+ &Apache::loncommon::sorted_inst_types($dom);
+ if (ref($usertypes) eq 'HASH') {
+ if ($usertypes->{$usertype}) {
+ $showstatus = $usertypes->{$usertype};
+ $count ++;
+ }
+ }
+ }
foreach my $field (@{$infofields}) {
next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});
next unless ($infotitles->{$field});
$r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
$info{$uname}{$field});
$num ++;
- unless ($count == $num) {
+ if ($count == $num) {
+ $r->print(&Apache::lonhtmlcommon::row_closure(1));
+ } else {
$r->print(&Apache::lonhtmlcommon::row_closure());
}
}
- }
- }
- if ($numextras) {
- unless ($pickstart) {
- $r->print('
'.&Apache::lonhtmlcommon::start_pick_box());
- $pickstart = 1;
- }
- if ($showemail) {
- my $closure = '';
- unless ($showstatus) {
- $closure = 1;
+ if ($showstatus) {
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')).
+ $showstatus.
+ &Apache::lonhtmlcommon::row_closure(1));
}
- $r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')).
- $showemail.
- &Apache::lonhtmlcommon::row_closure($closure));
- }
- if ($showstatus) {
- $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','
');
}
}
- if ($pickstart) {
- $r->print(&Apache::lonhtmlcommon::end_pick_box().'
'.&mt('No information to display for this account request.').'
');
- }
- } else {
- $r->print(''.&mt('No information available for this account request.').'
');
}
}
}
}
+ $r->print(&close_popup_form());
}
- $r->print(&close_popup_form());
} elsif (($env{'form.action'} eq 'listusers') &&
($permission->{'view'} || $permission->{'cusr'})) {
- my $helpitem = 'Course_View_Class_List';
- if ($context eq 'author') {
- $helpitem = 'Author_View_Coauthor_List';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_View_Users_List';
- }
if ($env{'form.phase'} eq 'bulkchange') {
push(@{$brcrum},
{href => '/adm/createuser?action=listusers',
text => "List Users"},
{href => "/adm/createuser",
text => "Result",
- help => $helpitem});
+ help => 'Course_View_Class_List'});
$bread_crumbs_component = 'Update Users';
$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
@@ -5987,7 +4879,7 @@ sub handler {
push(@{$brcrum},
{href => '/adm/createuser?action=listusers',
text => "List Users",
- help => $helpitem});
+ help => 'Course_View_Class_List'});
$bread_crumbs_component = 'List Users';
$args = {bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
@@ -6067,9 +4959,11 @@ sub handler {
''.&mt('You do not have permission to modify dates or sections for users').' ');
}
} elsif ($env{'form.action'} eq 'selfenroll') {
- my %currsettings;
- if ($permission->{selfenrolladmin} || $permission->{selfenrollview}) {
- %currsettings = (
+ if ($permission->{selfenrolladmin}) {
+ my $cid = $env{'request.course.id'};
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
+ my %currsettings = (
selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'},
selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'},
selfenroll_section => $env{'course.'.$cid.'.internal.selfenroll_section'},
@@ -6085,8 +4979,6 @@ sub handler {
default_enrollment_end_date => $env{'course.'.$cid.'.default_enrollment_end_date'},
uniquecode => $env{'course.'.$cid.'.internal.uniquecode'},
);
- }
- if ($permission->{selfenrolladmin}) {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenroll',
text => "Configure Self-enrollment",
@@ -6107,16 +4999,6 @@ sub handler {
$r->print(''.&mt('Self-enrollment with a student role').' '."\n");
&update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings);
}
- } elsif ($permission->{selfenrollview}) {
- push(@{$brcrum},
- {href => '/adm/createuser?action=selfenroll',
- text => "View Self-enrollment configuration",
- help => 'Course_Self_Enrollment'});
- $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => 'Self-enrollment Settings'};
- $r->print(&header(undef,$args));
- $r->print(''.&mt('Self-enrollment with a student role').' '."\n");
- &print_selfenroll_menu($r,'course',$cid,$cdom,$cnum,\%currsettings,'',1);
} else {
$r->print(&header(undef,{'no_nav_bar' => 1}).
''.&mt('You do not have permission to configure self-enrollment').' ');
@@ -6126,18 +5008,21 @@ sub handler {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',
text => 'Enrollment requests',
- help => 'Course_Approve_Selfenroll'});
+ help => 'Course_Self_Enrollment'});
$bread_crumbs_component = 'Enrollment requests';
if ($env{'form.state'} eq 'done') {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',
text => 'Result',
- help => 'Course_Approve_Selfenroll'});
+ help => 'Course_Self_Enrollment'});
$bread_crumbs_component = 'Enrollment result';
}
$args = { bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
$r->print(&header(undef,$args));
+ my $cid = $env{'request.course.id'};
+ my $cdom = $env{'course.'.$cid.'.domain'};
+ my $cnum = $env{'course.'.$cid.'.num'};
my $coursedesc = $env{'course.'.$cid.'.description'};
if (!exists($env{'form.state'})) {
$r->print(''.&mt('Pending enrollment requests').' '."\n");
@@ -6160,8 +5045,7 @@ sub handler {
''.&mt('You do not have permission to view change logs').' ');
}
} elsif ($env{'form.action'} eq 'helpdesk') {
- if (($permission->{'owner'} || $permission->{'co-owner'}) &&
- ($permission->{'cusr'} || $permission->{'view'})) {
+ if (($permission->{'owner'}) || ($permission->{'co-owner'})) {
if ($env{'form.state'} eq 'process') {
if ($permission->{'owner'}) {
&update_helpdeskaccess($r,$permission,$brcrum);
@@ -6175,85 +5059,6 @@ sub handler {
$r->print(&header(undef,{'no_nav_bar' => 1}).
''.&mt('You do not have permission to view helpdesk access').' ');
}
- } elsif ($env{'form.action'} eq 'camanagers') {
- if (($permission->{cusr}) && ($context eq 'author')) {
- push(@{$brcrum},
- {href => '/adm/createuser?action=camanagers',
- text => 'Co-author Managers',
- help => 'Author_Manage_Coauthors'});
- if ($env{'form.state'} eq 'process') {
- push(@{$brcrum},
- {href => '/adm/createuser?action=camanagers',
- text => 'Result',
- help => 'Author_Manage_Coauthors'});
- }
- $args = { bread_crumbs => $brcrum };
- $r->print(&header(undef,$args));
- my $coursedesc = $env{'course.'.$cid.'.description'};
- if (!exists($env{'form.state'})) {
- $r->print(''.&mt('Co-author Management').' '."\n".
- &display_coauthor_managers($permission));
- } elsif ($env{'form.state'} eq 'process') {
- $r->print(''.&mt('Co-author Management Update Result').' '."\n".
- &update_coauthor_managers($permission));
- }
- }
- } elsif (($env{'form.action'} eq 'calist') && ($context eq 'author')) {
- if ($permission->{'cusr'}) {
- my ($role,$audom,$auname,$canview,$canedit) =
- &Apache::lonviewcoauthors::get_allowable();
- if (($canedit) && ($env{'form.forceedit'})) {
- &Apache::lonviewcoauthors::get_editor_crumbs($brcrum,'/adm/createuser');
- my $args = { 'bread_crumbs' => $brcrum };
- $r->print(&Apache::loncommon::start_page('Configure co-author listing',undef,
- $args).
- &Apache::lonviewcoauthors::edit_settings($audom,$auname,$role,
- '/adm/createuser'));
- } else {
- push(@{$brcrum},
- {href => '/adm/createuser?action=calist',
- text => 'Coauthor-viewable list',
- help => 'Author_List_Coauthors'});
- my $args = { 'bread_crumbs' => $brcrum };
- $r->print(&Apache::loncommon::start_page('Coauthor-viewable list',undef,
- $args));
- my %viewsettings =
- &Apache::lonviewcoauthors::retrieve_view_settings($auname,$audom,$role);
- if ($viewsettings{'show'} eq 'none') {
- $r->print(''.&mt('Coauthor-viewable listing').' '.
- ''.
- &mt('Listing of co-authors not enabled for this Authoring Space').
- '
');
- } else {
- &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role,
- '/adm/createuser',\%viewsettings);
- }
- }
- } else {
- $r->internal_redirect('/adm/viewcoauthors');
- return OK;
- }
- } elsif (($env{'form.action'} eq 'setenv') && ($context eq 'author')) {
- my ($role,$audom,$auname,$canview,$canedit) =
- &Apache::lonviewcoauthors::get_allowable();
- push(@{$brcrum},
- {href => '/adm/createuser?action=calist',
- text => 'Coauthor-viewable list',
- help => 'Author_List_Coauthors'});
- my $args = { 'bread_crumbs' => $brcrum };
- $r->print(&Apache::loncommon::start_page('Coauthor-viewable list',undef,
- $args));
- my %viewsettings =
- &Apache::lonviewcoauthors::retrieve_view_settings($auname,$audom,$role);
- if ($viewsettings{'show'} eq 'none') {
- $r->print(''.&mt('Coauthor-viewable listing').' '.
- ''.
- &mt('Listing of co-authors not enabled for this Authoring Space').
- '
');
- } else {
- &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role,
- '/adm/createuser',\%viewsettings);
- }
} else {
$bread_crumbs_component = 'User Management';
$args = { bread_crumbs => $brcrum,
@@ -6360,15 +5165,6 @@ function updateCols(caller) {
document.getElementById('showcolstart').checked = false;
document.getElementById('showcolend').checked = false;
}
- if (context == 'author') {
- if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Expired') {
- document.getElementById('showcolmanager').checked = false;
- document.getElementById('showcolmanager').disabled = 'disabled';
- } else if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value != 'aa') {
- document.getElementById('showcolmanager').checked = true;
- document.getElementById('showcolmanager').disabled = '';
- }
- }
}
}
if (caller == 'output') {
@@ -6454,15 +5250,6 @@ function updateCols(caller) {
}
}
}
- if (context == 'author') {
- if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'aa') {
- document.getElementById('showcolmanager').checked = false;
- document.getElementById('showcolmanager').disabled = 'disabled';
- } else if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value != 'Expired') {
- document.getElementById('showcolmanager').checked = true;
- document.getElementById('showcolmanager').disabled = '';
- }
- }
}
return;
}
@@ -6644,6 +5431,7 @@ sub print_main_menu {
groups => 'Community Groups',
},
);
+ $linktext{'Placement'} = $linktext{'Course'};
my %linktitle = (
'Course' => {
@@ -6658,6 +5446,8 @@ sub print_main_menu {
},
);
+ $linktitle{'Placement'} = $linktitle{'Course'};
+
push(@{ $menu[0]->{items} }, #Category: Single Users
{
linktext => $linktext{$crstype}{'single'},
@@ -6685,8 +5475,7 @@ sub print_main_menu {
icon => 'helpdesk-access.png',
#help => 'Course_Helpdesk_Access',
url => '/adm/createuser?action=helpdesk',
- permission => (($permission->{'owner'} || $permission->{'co-owner'}) &&
- ($permission->{'view'} || $permission->{'cusr'})),
+ permission => ($permission->{'owner'} || $permission->{'co-owner'}),
linktitle => 'Helpdesk access options',
},
{
@@ -6721,7 +5510,7 @@ sub print_main_menu {
icon => 'selfenrl-queue.png',
#help => 'Course_Approve_Selfenroll',
url => '/adm/createuser?action=selfenrollqueue',
- permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
+ permission => $permission->{'selfenrolladmin'},
linktitle =>'Approve or reject enrollment requests.',
},
);
@@ -6748,33 +5537,12 @@ sub print_main_menu {
icon => 'self_enroll.png',
#help => 'Course_Self_Enrollment',
url => '/adm/createuser?action=selfenroll',
- permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'},
+ permission => $permission->{'selfenrolladmin'},
linktitle => 'Configure user self-enrollment.',
},
);
}
} elsif ($context eq 'author') {
- my $coauthorlist;
- if ($env{'request.role'} =~ m{^(?:ca|aa)\./($match_domain)/($match_username)$}) {
- if ($env{'environment.internal.coauthorlist./'.$1.'/'.$2}) {
- $coauthorlist = 1;
- }
- } elsif ($env{'request.role'} eq "au./$env{'user.domain'}/") {
- if ($env{'environment.coauthorlist'}) {
- $coauthorlist = 1;
- }
- }
- if ($coauthorlist) {
- push(@{ $menu[1]->{items} },
- {
- linktext => 'Co-author-viewable list',
- icon => 'clst.png',
- #help => 'Coauthor_Listing',
- url => '/adm/createuser?action=calist&forceedit=0',
- permission => $permission->{'cusr'},
- linktitle => 'Co-author-viewable listing',
- });
- }
push(@{ $menu[2]->{items} }, #Category: Administration
{
linktext => 'Change Log',
@@ -6784,22 +5552,6 @@ sub print_main_menu {
permission => $permission->{'cusr'},
linktitle => 'View change log.',
},
- {
- linktext => 'Co-author Managers',
- icon => 'camanager.png',
- #help => 'Coauthor_Management',
- url => '/adm/createuser?action=camanagers',
- permission => $permission->{'author'},
- linktitle => 'Assign/Revoke right to manage co-author roles',
- },
- {
- linktext => 'Configure Co-author Listing',
- icon => 'coauthors.png',
- #help => 'Coauthor_Settings',
- url => '/adm/createuser?action=calist&forceedit=1',
- permission => ($permission->{'cusr'}),
- linktitle => 'Set availability of coauthor-viewable user listing',
- },
);
}
return Apache::lonhtmlcommon::generate_menu(@menu);
@@ -6971,13 +5723,12 @@ function validate_types(form) {
}
function check_types(num,countfail,needaction) {
- var boxname = 'selfenroll_types_'+num;
- var typeidx = getIndexByName(boxname);
+ var typeidx = getIndexByName('selfenroll_types_'+num);
var count = 0;
if (typeidx != -1) {
- if (document.$formname.elements[boxname].length) {
- for (var k=0; k'."\n".
''."\n".
''.$lt->{'selfenroll'}.' '."\n";
- my $visactions = &cat_visibility($cdom);
+
+ my $visactions = &cat_visibility();
my ($cathash,%cattype);
my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom);
if (ref($domconfig{'coursecategories'}) eq 'HASH') {
@@ -7579,7 +6331,6 @@ sub visible_in_stdcat {
}
sub cat_visibility {
- my ($cdom) = @_;
my %visactions = &Apache::lonlocal::texthash(
vis => 'This course/community currently appears in the Course/Community Catalog for this domain.',
gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.',
@@ -7592,24 +6343,13 @@ sub cat_visibility {
dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.',
dc_setcode => 'Ask a domain coordinator to assign a six character code to the course',
dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
- dc_addinst => 'Ask a domain coordinator to enable catalog display of "Official courses (with institutional codes)".',
+ dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).',
dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.',
dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.',
dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain',
dc_addcat => 'Ask a domain coordinator to assign a category to the course.',
);
- if ($env{'request.role'} eq "dc./$cdom/") {
- $visactions{'dc_chgconf'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the Catalog type for this domain.','»');
- $visactions{'dc_setcode'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to assign a six character code to the course.','»');
- $visactions{'dc_unhide'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the "Exclude from course catalog" setting.','»');
- $visactions{'dc_addinst'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable catalog display of "Official courses (with institutional codes)".','»');
- $visactions{'dc_instcode'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify course owner, institutional code ... " to assign an institutional code (if this is an official course).','»');
- $visactions{'dc_catalog'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable or create at least one course category in the domain.','»');
- $visactions{'dc_categories'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to create a hierarchy of categories and sub categories for courses in the domain.','»');
- $visactions{'dc_chgcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','»');
- $visactions{'dc_addcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to assign a category to the course.','»');
- }
$visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','',' "');
$visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"',' "');
$visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"',' "');
@@ -7735,11 +6475,9 @@ sub print_userchangelogs_display {
&Apache::loncommon::restore_course_settings('roles_log',
\%saveable_parameters);
} elsif ($context eq 'author') {
- $domain = $env{'user.domain'};
+ $domain = $env{'user.domain'};
if ($env{'request.role'} =~ m{^au\./\Q$domain\E/$}) {
$username = $env{'user.name'};
- } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) {
- ($domain,$username) = ($1,$2);
} else {
undef($domain);
}
@@ -7753,10 +6491,6 @@ sub print_userchangelogs_display {
my $helpitem;
if ($context eq 'course') {
$helpitem = 'Course_User_Logs';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Role_Logs';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_User_Logs';
}
push (@{$brcrum},
{href => '/adm/createuser?action=changelogs',
@@ -8102,10 +6836,9 @@ ENDSCRIPT
my ($nav_script,$nav_links);
# table header
- my $heading = ''.
+ my $tableheader = ''.
&mt('User access logs for: [_1]',
- &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).' ';
- my $tableheader = $heading
+ &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).' '
.&Apache::loncommon::start_data_table_header_row()
.' '
.''.&mt('When').' '
@@ -8223,7 +6956,7 @@ ENDSCRIPT
$r->print(&Apache::loncommon::end_data_table().
&userlogdisplay_navlinks(\%curr,$more_records));
} else { # No content displayed above
- $r->print($heading.''
+ $r->print('
'
.&mt('There are no records to display.')
.'
');
}
@@ -8412,12 +7145,12 @@ sub role_display_filter {
&mt('Context:').'';
my @posscontexts;
if ($context eq 'course') {
- @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses','chgtype');
+ @posscontexts = ('any','automated','updatenow','createcourse','course','domain','selfenroll','requestcourses');
} elsif ($context eq 'domain') {
@posscontexts = ('any','domain','requestauthor','domconfig','server');
} else {
- @posscontexts = ('any','author','coauthor','domain');
- }
+ @posscontexts = ('any','author','domain');
+ }
foreach my $chgtype (@posscontexts) {
my $selstr = '';
if ($curr->{'chgcontext'} eq $chgtype) {
@@ -8461,7 +7194,6 @@ sub rolechg_contexts {
%lt = &Apache::lonlocal::texthash (
any => 'Any',
automated => 'Automated Enrollment',
- chgtype => 'Enrollment Type/Lock Change',
updatenow => 'Roster Update',
createcourse => 'Course Creation',
course => 'User Management in course',
@@ -8487,7 +7219,6 @@ sub rolechg_contexts {
any => 'Any',
domain => 'User Management in domain',
author => 'User Management by author',
- coauthor => 'User Management by coauthor',
);
}
return %lt;
@@ -9527,7 +8258,7 @@ sub user_search_result {
my $domd_chk = &domdirectorysrch_check($srch);
$response .= ''.$instd_chk.' '.$domd_chk.' '.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
' '.
&mt('Institutional directory search is not available in domain: [_1]',$showdom).
'