'.$contextrole.' '.
&Apache::loncommon::start_data_table("LC_createuser").
-&Apache::loncommon::start_data_table_header_row());
- if ($showall) {
- $r->print(
-''.$lt{'rev'}.' '.$lt{'ren'}.' '.$lt{'del'}.' '
- );
- } elsif ($showexpired) {
- $r->print(''.$lt{'rev'}.' ');
- }
- $r->print(
-''.$lt{'rol'}.' '.$lt{'ext'}.' '.
-''.$lt{'sta'}.' '.$lt{'end'}.' '.
+&Apache::loncommon::start_data_table_header_row().
+''.$lt{'rev'}.' '.$lt{'ren'}.' '.$lt{'del'}.
+' '.$lt{'rol'}.' '.$lt{'ext'}.
+' '.$lt{'sta'}.' '.$lt{'end'}.' '.
&Apache::loncommon::end_data_table_header_row());
foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') {
if ($output{$type}) {
@@ -2167,16 +2095,16 @@ sub user_authentication {
my ($ccuname,$ccdomain,$formname) = @_;
my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
my $outcome;
- my %lt=&Apache::lonlocal::texthash(
- 'err' => "ERROR",
- 'uuas' => "This user has an unrecognized authentication scheme",
- 'adcs' => "Please alert a domain coordinator of this situation",
- 'sldb' => "Please specify login data below",
- 'ld' => "Login Data"
- );
# Check for a bad authentication type
if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) {
# bad authentication scheme
+ my %lt=&Apache::lonlocal::texthash(
+ 'err' => "ERROR",
+ 'uuas' => "This user has an unrecognized authentication scheme",
+ 'adcs' => "Please alert a domain coordinator of this situation",
+ 'sldb' => "Please specify login data below",
+ 'ld' => "Login Data"
+ );
if (&Apache::lonnet::allowed('mau',$ccdomain)) {
&initialize_authen_forms($ccdomain,$formname);
@@ -2207,6 +2135,11 @@ ENDBADAUTH
&modify_login_block($ccdomain,$currentauth);
if (&Apache::lonnet::allowed('mau',$ccdomain)) {
# Current user has login modification privileges
+ my %lt=&Apache::lonlocal::texthash (
+ 'ld' => "Login Data",
+ 'ccld' => "Change Current Login Data",
+ 'enld' => "Enter New Login Data"
+ );
$outcome =
''."\n";
- my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$env{'form.ccdomain'});
+ my %breadcrumb_text = &singleuser_breadcrumb($crstype);
push (@{$brcrum},
{href => "javascript:backPage(document.userupdate)",
text => $breadcrumb_text{'search'},
@@ -2711,10 +2575,6 @@ sub update_user_data {
my $helpitem = 'Course_Change_Privileges';
if ($env{'form.action'} eq 'singlestudent') {
$helpitem = 'Course_Add_Student';
- } elsif ($context eq 'author') {
- $helpitem = 'Author_Change_Privileges';
- } elsif ($context eq 'domain') {
- $helpitem = 'Domain_Change_Privileges';
}
push(@{$brcrum},
{href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')",
@@ -2807,7 +2667,7 @@ sub update_user_data {
my (%alerts,%rulematch,%inst_results,%curr_rules);
my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
my @usertools = ('aboutme','blog','webdav','portfolio');
- my @requestcourses = ('official','unofficial','community','textbook');
+ my @requestcourses = ('official','unofficial','community','textbook','placement');
my @requestauthor = ('requestauthor');
my ($othertitle,$usertypes,$types) =
&Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
@@ -2917,6 +2777,12 @@ sub update_user_data {
$newcustom{'requestauthor'},
\%changeHash,'requestauthor');
}
+ if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
+ my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd');
+ if (&adhocrole_changes(\%changeHash)) {
+ $changed{'adhocroles.'.$env{'request.role.domain'}} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
+ }
+ }
}
if ($canmodify_status{'inststatus'}) {
if (exists($env{'form.inststatus'})) {
@@ -2980,7 +2846,8 @@ sub update_user_data {
'requestcourses.community','requestcourses.textbook',
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community','reqcrsotherdom.textbook',
- 'requestauthor'],
+ 'reqcrsotherdom.placement','requestauthor',
+ 'adhocroles.'.$env{'request.role.domain'}],
$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost|error)/i) {
@@ -3119,6 +2986,7 @@ sub update_user_data {
&Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus,$name);
($newdefquota{$name},$newsettingstatus{$name}) = ($olddefquota{$name},$oldsettingstatus{$name});
}
+ push(@disporder,'adhocroles');
my %canshow;
if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) {
$canshow{'quota'} = 1;
@@ -3137,6 +3005,9 @@ sub update_user_data {
if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) {
$canshow{'requestauthor'} = 1;
}
+ if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) {
+ $canshow{'adhocroles'} = 1;
+ }
my (%changeHash,%changed);
if ($oldinststatus eq '') {
$oldsettings{'inststatus'} = $othertitle;
@@ -3250,6 +3121,14 @@ sub update_user_data {
&tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext,
\%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext);
}
+ if ($userenv{'adhocroles.'.$env{'request.role.domain'}}) {
+ $changeHash{'adhocroles.'.$env{'request.role.domain'}} = $userenv{'adhocroles.'.$env{'request.role.domain'}};
+ }
+ if (&adhocrole_changes(\%changeHash,\%userenv)) {
+ $changed{'adhocroles'} = 1;
+ $oldsettings{'adhocroles'} = $userenv{'adhocroles.'.$env{'request.role.domain'}};
+ $newsettings{'adhocroles'} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
+ }
}
foreach my $item (@userinfo) {
if ($env{'form.c'.$item} ne $userenv{$item}) {
@@ -3271,8 +3150,9 @@ sub update_user_data {
($env{'user.domain'} eq $env{'form.ccdomain'})) {
my %newenvhash;
foreach my $key (keys(%changed)) {
- if (($key eq 'official') || ($key eq 'unofficial')
- || ($key eq 'community') || ($key eq 'textbook')) {
+ if (($key eq 'official') || ($key eq 'unofficial') ||
+ ($key eq 'community') || ($key eq 'textbook') ||
+ ($key eq 'placement')) {
$newenvhash{'environment.requestcourses.'.$key} =
$changeHash{'requestcourses.'.$key};
if ($changeHash{'requestcourses.'.$key}) {
@@ -3291,6 +3171,9 @@ sub update_user_data {
&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},
$key,'reload','requestauthor');
}
+ } elsif ($key eq 'adhocroles') {
+ $newenvhash{'adhocroles.'.$env{'request.role.domain'}} =
+ $changeHash{'adhocroles.'.$env{'request.role.domain'}};
} elsif ($key ne 'quota') {
$newenvhash{'environment.tools.'.$key} =
$changeHash{'tools.'.$key};
@@ -3338,7 +3221,7 @@ sub update_user_data {
\%newsettingstext);
if ($env{'form.cid'} ne $userenv{'id'}) {
&Apache::lonnet::idput($env{'form.ccdomain'},
- {$env{'form.ccuname'} => $env{'form.cid'}});
+ {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
if (($recurseid) &&
(&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
my $idresult =
@@ -3481,7 +3364,9 @@ sub display_userinfo {
'unofficial' => 'Can Request Unofficial Courses',
'community' => 'Can Request Communities',
'textbook' => 'Can Request Textbook Courses',
+ 'placement' => 'Can Request Placement Tests',
'requestauthor' => 'Can Request Author Role',
+ 'adhocroles' => 'Ad Hoc Roles Selectable via Helpdesk Role',
'inststatus' => "Affiliation",
'prvs' => 'Previous Value:',
'chto' => 'Changed To:'
@@ -3847,6 +3732,70 @@ sub tool_changes {
return;
}
+sub adhocrole_changes {
+ my ($changehashref,$userenv) = @_;
+ my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd');
+ my @dels = &Apache::loncommon::get_env_multiple('form.adhocroledel');
+ my (@saved,@added,@alladhoc,$changed);
+ my $adhoc_key = 'adhocroles.'.$env{'request.role.domain'};
+ if (!$env{'form.makeuser'}) {
+ if (ref($userenv) eq 'HASH') {
+ my @current;
+ if ($userenv->{$adhoc_key}) {
+ @current = split(/,/,$userenv->{$adhoc_key});
+ if (@dels) {
+ foreach my $curr (@current) {
+ next if ($curr eq '');
+ unless (grep(/\Q$curr\E$/,@dels)) {
+ push(@saved,$curr);
+ }
+ }
+ $changed = 1;
+ } else {
+ @saved = @current;
+ }
+ }
+ }
+ }
+ if (@adds) {
+ my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'});
+ my %existing=&Apache::lonnet::dump('roles',$env{'request.role.domain'},
+ $confname,'rolesdef_');
+ foreach my $poss (@adds) {
+ if (exists($existing{'rolesdef_'.$poss})) {
+ push(@added,$poss);
+ $changed = 1;
+ }
+ }
+ }
+ if (@added) {
+ if (@saved) {
+ foreach my $add (@added) {
+ unless (grep(/^\Q$add\E$/,@saved)) {
+ push(@alladhoc,$add);
+ }
+ }
+ } else {
+ push(@alladhoc,@added);
+ }
+ }
+ if (@saved) {
+ push(@alladhoc,@saved);
+ }
+ if (@alladhoc) {
+ my $adhocstr = join(',',sort(@alladhoc));
+ $changehashref->{$adhoc_key} = $adhocstr;
+ } elsif (@dels) {
+ &Apache::lonnet::del('environment',[$adhoc_key],$env{'form.ccdomain'},$env{'form.ccuname'});
+ delete($changehashref->{$adhoc_key});
+ if (($env{'form.ccdomain'} eq $env{'user.domain'}) &&
+ ($env{'form.ccuname'} eq $env{'user.name'})) {
+ &Apache::lonnet::delenv($adhoc_key);
+ }
+ }
+ return $changed;
+}
+
sub update_roles {
my ($r,$context,$showcredits) = @_;
my $now=time;
@@ -4377,9 +4326,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 {
@@ -4390,17 +4339,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;
}
@@ -4416,7 +4362,7 @@ sub custom_role_editor {
($privs{'system'},$privs{'domain'},$privs{'course'})=split(/\_/,$roledef);
if ($privs{'system'} =~ /bre\&S/) {
if ($context eq 'domain') {
- $crstype = 'Course';
+ $crstype = 'Course';
} elsif ($crstype eq 'Community') {
$privs{'system'} =~ s/bre\&S//;
}
@@ -4431,7 +4377,7 @@ sub custom_role_editor {
# ------------------------------------------------------- What can be assigned?
my %full=();
- my %levels=(
+ my %levels=(
course => {},
domain => {},
system => {},
@@ -4444,7 +4390,7 @@ sub custom_role_editor {
&Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent);
my ($jsback,$elements) = &crumb_utilities();
my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype);
- my $head_script =
+ my $head_script =
&Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname,
\%full,\@templateroles,$jsback);
push (@{$brcrum},
@@ -4455,10 +4401,11 @@ 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'};
+
$r->print(&Apache::loncommon::start_page('Custom Role Editor',
$head_script,$args).
$body_top);
@@ -4475,18 +4422,18 @@ ENDCCF
$r->print(&Apache::loncommon::end_data_table().
''.&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));
+ $r->print(&Apache::lonhtmlcommon::end_pick_box().'
');
}
- if ($showstatus) {
- $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','
')).
- $showstatus.
- &Apache::lonhtmlcommon::row_closure(1));
- }
- }
- 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};
@@ -5055,7 +4864,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};
@@ -5136,6 +4945,9 @@ sub handler {
}
} elsif ($env{'form.action'} eq 'selfenroll') {
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'},
@@ -5177,58 +4989,36 @@ sub handler {
''.&mt('You do not have permission to configure self-enrollment').' ');
}
} elsif ($env{'form.action'} eq 'selfenrollqueue') {
- if ($permission->{selfenrolladmin}) {
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=selfenrollqueue',
+ text => 'Enrollment requests',
+ help => 'Course_Self_Enrollment'});
+ $bread_crumbs_component = 'Enrollment requests';
+ if ($env{'form.state'} eq 'done') {
push(@{$brcrum},
{href => '/adm/createuser?action=selfenrollqueue',
- text => 'Enrollment requests',
- help => 'Course_Approve_Selfenroll'});
- $bread_crumbs_component = 'Enrollment requests';
- if ($env{'form.state'} eq 'done') {
- push(@{$brcrum},
- {href => '/adm/createuser?action=selfenrollqueue',
- text => 'Result',
- help => 'Course_Approve_Selfenroll'});
- $bread_crumbs_component = 'Enrollment result';
- }
- $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => $bread_crumbs_component};
- $r->print(&header(undef,$args));
- my $coursedesc = $env{'course.'.$cid.'.description'};
- if (!exists($env{'form.state'})) {
- $r->print(''.&mt('Pending enrollment requests').' '."\n");
- $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
- $cdom,$cnum));
- } elsif ($env{'form.state'} eq 'done') {
- $r->print(''.&mt('Enrollment request processing').' '."\n");
- $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
- $cdom,$cnum,$coursedesc));
- }
- } else {
- $r->print(&header(undef,{'no_nav_bar' => 1}).
- ''.&mt('You do not have permission to manage self-enrollment').' ');
- }
- } elsif ($env{'form.action'} eq 'changelogs') {
- if ($permission->{cusr} || $permission->{view}) {
- &print_userchangelogs_display($r,$context,$permission,$brcrum);
- } else {
- $r->print(&header(undef,{'no_nav_bar' => 1}).
- ''.&mt('You do not have permission to view change logs').' ');
+ text => 'Result',
+ help => 'Course_Self_Enrollment'});
+ $bread_crumbs_component = 'Enrollment result';
}
- } elsif ($env{'form.action'} eq 'helpdesk') {
- if (($permission->{'owner'}) || ($permission->{'co-owner'})) {
- if ($env{'form.state'} eq 'process') {
- if ($permission->{'owner'}) {
- &update_helpdeskaccess($r,$permission,$brcrum);
- } else {
- &print_helpdeskaccess_display($r,$permission,$brcrum);
- }
- } else {
- &print_helpdeskaccess_display($r,$permission,$brcrum);
- }
- } else {
- $r->print(&header(undef,{'no_nav_bar' => 1}).
- ''.&mt('You do not have permission to view helpdesk access').' ');
+ $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");
+ $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context,
+ $cdom,$cnum));
+ } elsif ($env{'form.state'} eq 'done') {
+ $r->print(''.&mt('Enrollment request processing').' '."\n");
+ $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
+ $cdom,$cnum,$coursedesc));
}
+ } elsif ($env{'form.action'} eq 'changelogs') {
+ &print_userchangelogs_display($r,$context,$permission,$brcrum);
} else {
$bread_crumbs_component = 'User Management';
$args = { bread_crumbs => $brcrum,
@@ -5480,26 +5270,6 @@ sub print_main_menu {
listusers => 'Show and manage users in this community.',
},
);
- if ($linkcontext eq 'domain') {
- unless ($permission->{'cusr'}) {
- $links{'domain'}{'singleuser'} = 'View a User';
- $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';
- }
- } elsif ($linkcontext eq 'course') {
- unless ($permission->{'cusr'}) {
- $links{'course'}{'singleuser'} = 'View a Course User';
- $linktitles{'course'}{'singleuser'} = 'View information about a user in this course';
- $links{'course'}{'listusers'} = 'List Course Users';
- $linktitles{'course'}{'listusers'} = 'Show information about users in this course';
- }
- } elsif ($linkcontext eq 'community') {
- unless ($permission->{'cusr'}) {
- $links{'community'}{'singleuser'} = 'View a Community User';
- $linktitles{'community'}{'singleuser'} = 'View information about a user in this community';
- $links{'community'}{'listusers'} = 'List Community Users';
- $linktitles{'community'}{'listusers'} = 'Show information about users in this community';
- }
- }
my @menu = ( {categorytitle => 'Single Users',
items =>
[
@@ -5508,7 +5278,7 @@ sub print_main_menu {
icon => 'edit-redo.png',
#help => 'Course_Change_Privileges',
url => '/adm/createuser?action=singleuser',
- permission => ($permission->{'view'} || $permission->{'cusr'}),
+ permission => $permission->{'cusr'},
linktitle => $linktitles{$linkcontext}{'singleuser'},
},
]},
@@ -5540,16 +5310,6 @@ sub print_main_menu {
);
if ($context eq 'domain'){
- push(@{ $menu[0]->{items} }, # Single Users
- {
- linktext => 'User Access Log',
- icon => 'document-properties.png',
- #help => 'Domain_User_Access_Logs',
- url => '/adm/createuser?action=accesslogs',
- permission => $permission->{'activity'},
- linktitle => 'View user access log.',
- }
- );
push(@{ $menu[2]->{items} }, #Category: Administration
{
@@ -5581,7 +5341,7 @@ sub print_main_menu {
icon => 'document-properties.png',
#help => 'Course_User_Logs',
url => '/adm/createuser?action=changelogs',
- permission => ($permission->{'cusr'} || $permission->{'view'}),
+ permission => $permission->{'cusr'},
linktitle => 'View change log.',
},
);
@@ -5601,6 +5361,7 @@ sub print_main_menu {
groups => 'Community Groups',
},
);
+ $linktext{'Placement'} = $linktext{'Course'};
my %linktitle = (
'Course' => {
@@ -5615,6 +5376,8 @@ sub print_main_menu {
},
);
+ $linktitle{'Placement'} = $linktitle{'Course'};
+
push(@{ $menu[0]->{items} }, #Category: Single Users
{
linktext => $linktext{$crstype}{'single'},
@@ -5637,15 +5400,7 @@ sub print_main_menu {
},
);
push(@{ $menu[2]->{items} }, #Category: Administration
- {
- linktext => 'Helpdesk Access',
- icon => 'helpdesk-access.png',
- #help => 'Course_Helpdesk_Access',
- url => '/adm/createuser?action=helpdesk',
- permission => ($permission->{'owner'} || $permission->{'co-owner'}),
- linktitle => 'Helpdesk access options',
- },
- {
+ {
linktext => 'Custom Roles',
icon => 'emblem-photos.png',
#help => 'Course_Editing_Custom_Roles',
@@ -5666,7 +5421,7 @@ sub print_main_menu {
icon => 'document-properties.png',
#help => 'Course_User_Logs',
url => '/adm/createuser?action=changelogs',
- permission => ($permission->{'view'} || $permission->{'cusr'}),
+ permission => $permission->{'cusr'},
linktitle => 'View change log.',
},
);
@@ -5691,8 +5446,7 @@ sub print_main_menu {
icon => 'roles.png',
#help => 'Course_Automated_Enrollment',
permission => (&Apache::lonnet::auto_run($cnum,$cdom)
- && (($permission->{'cusr'}) ||
- ($permission->{'view'}))),
+ && $permission->{'cusr'}),
url => '/adm/populate',
linktitle => 'Automated enrollment manager.',
}
@@ -5741,7 +5495,7 @@ sub restore_prev_selections {
}
sub print_selfenroll_menu {
- my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional,$readonly) = @_;
+ my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional) = @_;
my $crstype = &Apache::loncommon::course_type();
my $formname = 'selfenroll';
my $nolink = 1;
@@ -5754,10 +5508,6 @@ sub print_selfenroll_menu {
butn => 'but no user types have been checked.',
wilf => "Please uncheck 'activate' or check at least one type.",
);
- my $disabled;
- if ($readonly) {
- $disabled = ' disabled="disabled"';
- }
&js_escape(\%alerts);
my $selfenroll_js = <<"ENDSCRIPT";
function update_types(caller,num) {
@@ -5890,13 +5640,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 '.&mt('User types:').' '
+ .&selfenroll_inst_types($num,$currdom,\@currinsttypes).''
.&Apache::loncommon::end_data_table_row();
$num ++;
}
@@ -6120,7 +5869,7 @@ ENDSCRIPT
$output .= &Apache::loncommon::start_data_table_row()
.''.$add_domtitle.' '.
- ' '.
- ' ';
} elsif ($item eq 'enroll_dates') {
my ($starttime,$endtime);
@@ -6171,10 +5920,10 @@ ENDSCRIPT
}
my $startform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime,
- $disabled,undef,undef,undef,undef,undef,undef,$nolink);
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
my $endform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_date',$endtime,
- $disabled,undef,undef,undef,undef,undef,undef,$nolink);
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
$output .= &selfenroll_date_forms($startform,$endform);
} elsif ($item eq 'access_dates') {
my ($starttime,$endtime);
@@ -6196,10 +5945,10 @@ ENDSCRIPT
}
my $startform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime,
- $disabled,undef,undef,undef,undef,undef,undef,$nolink);
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
my $endform =
&Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_access',$endtime,
- $disabled,undef,undef,undef,undef,undef,undef,$nolink);
+ undef,undef,undef,undef,undef,undef,undef,$nolink);
$output .= &selfenroll_date_forms($startform,$endform);
} elsif ($item eq 'section') {
my $currsec;
@@ -6223,19 +5972,19 @@ ENDSCRIPT
next;
}
my $sections_select =
- &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec,$disabled);
+ &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec);
$output .= ''."\n";
} elsif ($item eq 'approval') {
my ($currnotified,$currapproval,%appchecked);
my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();
- if (ref($currsettings) eq 'HASH') {
+ if (ref($currsettings) eq 'HASH') {
$currnotified = $currsettings->{'selfenroll_notifylist'};
$currapproval = $currsettings->{'selfenroll_approval'};
}
@@ -6251,8 +6000,8 @@ ENDSCRIPT
for my $i (0..2) {
$output .= ''.
' '.(' 'x2);
+ $appchecked{$i}.' onclick="toggleNotify();" />'.$selfdescs{'approval'}{$i}.
+ ''.(' 'x2);
}
my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1);
my (@ccs,%notified);
@@ -6293,7 +6042,7 @@ ENDSCRIPT
&Apache::loncommon::start_data_table_row()
}
$output .= ''.
- '
-//
-
-
-ENDSCRIPT
-
-# print page header
- $r->print(&header($jscript,$args));
-
-# early out unless log data can be displayed.
- unless ($permission->{'activity'}) {
- $r->print(''
- .&mt('You do not have rights to display user access logs.')
- .'
');
- if ($env{'form.popup'}) {
- $r->print(''.&mt('Close window').'
');
- } else {
- $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- }
- return;
- }
-
- unless ($udom eq $env{'request.role.domain'}) {
- $r->print(''
- .&mt("User's domain must match role's domain")
- .'
'
- .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- return;
- }
-
- if (($uname eq '') || ($udom eq '')) {
- $r->print(''
- .&mt('Invalid username or domain')
- .'
'
- .&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- return;
- }
-
- if (&Apache::lonnet::privileged($uname,$udom,
- [$env{'request.role.domain'}],['dc','su'])) {
- unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'},
- [$env{'request.role.domain'}],['dc','su'])) {
- $r->print(''
- .&mt('You need to be a privileged user to display user access logs for [_1]',
- &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),
- $uname,$udom))
- .'
');
- if ($env{'form.popup'}) {
- $r->print(''.&mt('Close window').'
');
- } else {
- $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- }
- return;
- }
- }
-
-# set defaults
- my $now = time();
- my $defstart = $now - (7*24*3600);
- my %defaults = (
- page => '1',
- show => '10',
- activity => 'any',
- accesslog_start_date => $defstart,
- accesslog_end_date => $now,
- );
- my $more_records = 0;
-
-# set current
- my %curr;
- foreach my $item ('show','page','activity') {
- $curr{$item} = $env{'form.'.$item};
- }
- my ($startdate,$enddate) =
- &Apache::lonuserutils::get_dates_from_form('accesslog_start_date','accesslog_end_date');
- $curr{'accesslog_start_date'} = $startdate;
- $curr{'accesslog_end_date'} = $enddate;
- foreach my $key (keys(%defaults)) {
- if ($curr{$key} eq '') {
- $curr{$key} = $defaults{$key};
- }
- }
- my ($minshown,$maxshown);
- $minshown = 1;
- my $count = 0;
- if ($curr{'show'} =~ /\D/) {
- $curr{'page'} = 1;
- } else {
- $maxshown = $curr{'page'} * $curr{'show'};
- if ($curr{'page'} > 1) {
- $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'};
- }
- }
-
-# form header
- $r->print('');
- return;
-}
-
-sub earlyout_accesslog_form {
- my ($formname,$prevphasestr,$udom) = @_;
- my $srchterm = &HTML::Entities::encode($env{'form.srchterm'},'<>"&');
- return <<"END";
-
-END
-}
-
-sub activity_display_filter {
- my ($formname,$curr) = @_;
- my $nolink = 1;
- my $output = ''.
- ''.&mt('Actions/page:').' ';
- my $startform =
- &Apache::lonhtmlcommon::date_setter($formname,'accesslog_start_date',
- $curr->{'accesslog_start_date'},undef,
- undef,undef,undef,undef,undef,undef,$nolink);
- my $endform =
- &Apache::lonhtmlcommon::date_setter($formname,'accesslog_end_date',
- $curr->{'accesslog_end_date'},undef,
- undef,undef,undef,undef,undef,undef,$nolink);
- my %lt = &Apache::lonlocal::texthash (
- activity => 'Activity',
- Role => 'Role selection',
- log => 'Log-in or Logout',
- );
- $output .= ''.&mt('Window during which actions occurred:').' '.&mt('After:').
- ' '.$startform.' '.&mt('Before:').' '.
- ''.$endform.'
'.
- ' '.
- ''.&mt('Activities').' {'activity'} eq 'any') {
- $output .= ' selected="selected"';
- }
- $output .= '>'.&mt('Any').' '."\n";
- foreach my $activity ('Role','log') {
- my $selstr = '';
- if ($activity eq $curr->{'activity'}) {
- $selstr = ' selected="selected"';
- }
- $output .= ''.$lt{$activity}.' ';
- }
- $output .= '
';
- # Update Display button
- $output .= ''
- .'
'.$lt{'crl'}.' '.$lt{'def'}.' '.$lt{'ove'}.
- ' '.$lt{'ine'}.' '.
- &Apache::loncommon::end_data_table_header_row();
- foreach my $priv (sort(keys(%{$full}))) {
- next unless ($levels->{'course'}{$priv});
- my $privtext = &Apache::lonnet::plaintext($priv,$crstype);
- my ($default,$ineffect);
- if ($levelscurrent->{'course'}{$priv}) {
- $default = ''.$privtext.' '.
- ''.$default.' ';
- if (($levelscurrent->{'course'}{$priv}) && ($off{$priv})) {
- if ($permission->{'owner'}) {
- $checked = ' checked="checked"';
- }
- $customstatus = ' '.$ineffect.' '.
- &Apache::loncommon::end_data_table_row();
- }
- $output .= &Apache::loncommon::end_data_table();
- return $output;
-}
-
-sub get_adhocrole_settings {
- my ($cid,$accesstypes,$types,$customroles,$settings,$overridden) = @_;
- return unless ((ref($accesstypes) eq 'ARRAY') && (ref($customroles) eq 'HASH') &&
- (ref($settings) eq 'HASH') && (ref($overridden) eq 'HASH'));
- foreach my $role (split(/,/,$env{'course.'.$cid.'.internal.adhocaccess'})) {
- my ($curraccess,$rest) = split(/=/,$env{'course.'.$cid.'.internal.adhoc.'.$role});
- if (($curraccess ne '') && (grep(/^\Q$curraccess\E$/,@{$accesstypes}))) {
- $settings->{$role}{'access'} = $curraccess;
- if (($curraccess eq 'status') && (ref($types) eq 'ARRAY')) {
- my @status = split(/,/,$rest);
- my @currstatus;
- foreach my $type (@status) {
- if ($type eq 'default') {
- push(@currstatus,$type);
- } elsif (grep(/^\Q$type\E$/,@{$types})) {
- push(@currstatus,$type);
- }
- }
- if (@currstatus) {
- $settings->{$role}{$curraccess} = \@currstatus;
- } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) {
- my @personnel = split(/,/,$rest);
- $settings->{$role}{$curraccess} = \@personnel;
- }
- }
- }
- }
- foreach my $role (keys(%{$customroles})) {
- if ($env{'course.'.$cid.'.internal.adhocpriv.'.$role}) {
- my %currentprivs;
- if (ref($customroles->{$role}) eq 'HASH') {
- if (exists($customroles->{$role}{'course'})) {
- my %full=();
- my %levels= (
- course => {},
- domain => {},
- system => {},
- );
- my %levelscurrent=(
- course => {},
- domain => {},
- system => {},
- );
- &Apache::lonuserutils::custom_role_privs($customroles->{$role},\%full,\%levels,\%levelscurrent);
- %currentprivs = %{$levelscurrent{'course'}};
- }
- }
- foreach my $item (split(/,/,$env{'course.'.$cid.'.internal.adhocpriv.'.$role})) {
- next if ($item eq '');
- my ($rule,$rest) = split(/=/,$item);
- next unless (($rule eq 'off') || ($rule eq 'on'));
- foreach my $priv (split(/:/,$rest)) {
- if ($priv ne '') {
- if ($rule eq 'off') {
- push(@{$overridden->{$role}{'off'}},$priv);
- if ($currentprivs{$priv}) {
- push(@{$settings->{$role}{'off'}},$priv);
- }
- } else {
- push(@{$overridden->{$role}{'on'}},$priv);
- unless ($currentprivs{$priv}) {
- push(@{$settings->{$role}{'on'}},$priv);
- }
- }
- }
- }
- }
- }
- }
- return;
-}
-
-sub update_helpdeskaccess {
- my ($r,$permission,$brcrum) = @_;
- my $helpitem = 'Course_Helpdesk_Access';
- push (@{$brcrum},
- {href => '/adm/createuser?action=helpdesk',
- text => 'Helpdesk Access',
- help => $helpitem},
- {href => '/adm/createuser?action=helpdesk',
- text => 'Result',
- help => $helpitem}
- );
- my $bread_crumbs_component = 'Helpdesk Staff Access';
- my $args = { bread_crumbs => $brcrum,
- bread_crumbs_component => $bread_crumbs_component};
-
- # print page header
- $r->print(&header('',$args));
- unless ((ref($permission) eq 'HASH') && ($permission->{'owner'})) {
- $r->print(''.&mt('You do not have permission to change helpdesk access.').'
');
- return;
- }
- my @accesstypes = ('all','dh','da','none','status','inc','exc');
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $confname = $cdom.'-domainconfig';
- my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom);
- my $crstype = &Apache::loncommon::course_type();
- my %customroles = &get_domain_customroles($cdom,$confname);
- my (%settings,%overridden);
- &get_adhocrole_settings($env{'request.course.id'},\@accesstypes,
- $types,\%customroles,\%settings,\%overridden);
- my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']);
- my (%changed,%storehash,@todelete);
-
- if (keys(%customroles)) {
- my (%newsettings,@incrs);
- foreach my $role (keys(%customroles)) {
- $newsettings{$role} = {
- access => '',
- status => '',
- exc => '',
- inc => '',
- on => '',
- off => '',
- };
- my %current;
- if (ref($settings{$role}) eq 'HASH') {
- %current = %{$settings{$role}};
- }
- if (ref($overridden{$role}) eq 'HASH') {
- $current{'overridden'} = $overridden{$role};
- }
- if ($env{'form.'.$role.'_incrs'}) {
- my $access = $env{'form.'.$role.'_access'};
- if (grep(/^\Q$access\E$/,@accesstypes)) {
- push(@incrs,$role);
- unless ($current{'access'} eq $access) {
- $changed{$role}{'access'} = 1;
- $storehash{'internal.adhoc.'.$role} = $access;
- }
- if ($access eq 'status') {
- my @statuses = &Apache::loncommon::get_env_multiple('form.'.$role.'_status');
- my @stored;
- my @shownstatus;
- if (ref($types) eq 'ARRAY') {
- foreach my $type (sort(@statuses)) {
- if ($type eq 'default') {
- push(@stored,$type);
- } elsif (grep(/^\Q$type\E$/,@{$types})) {
- push(@stored,$type);
- push(@shownstatus,$usertypes->{$type});
- }
- }
- if (grep(/^default$/,@statuses)) {
- push(@shownstatus,$othertitle);
- }
- $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored);
- }
- $newsettings{$role}{'status'} = join(' '.&mt('or').' ',@shownstatus);
- if (ref($current{'status'}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{'status'});
- if (@diffs) {
- $changed{$role}{'status'} = 1;
- }
- } elsif (@stored) {
- $changed{$role}{'status'} = 1;
- }
- } elsif (($access eq 'inc') || ($access eq 'exc')) {
- my @personnel = &Apache::loncommon::get_env_multiple('form.'.$role.'_staff_'.$access);
- my @newspecstaff;
- my @stored;
- my @currstaff;
- foreach my $person (sort(@personnel)) {
- if ($domhelpdesk{$person}) {
- push(@stored,$person);
- }
- }
- if (ref($current{$access}) eq 'ARRAY') {
- my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{$access});
- if (@diffs) {
- $changed{$role}{$access} = 1;
- }
- } elsif (@stored) {
- $changed{$role}{$access} = 1;
- }
- $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored);
- foreach my $person (@stored) {
- my ($uname,$udom) = split(/:/,$person);
- push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom));
- }
- $newsettings{$role}{$access} = join(', ',sort(@newspecstaff));
- }
- $newsettings{$role}{'access'} = $access;
- }
- } else {
- if (($current{'access'} ne '') && (grep(/^\Q$current{'access'}\E$/,@accesstypes))) {
- $changed{$role}{'access'} = 1;
- $newsettings{$role} = {};
- push(@todelete,'internal.adhoc.'.$role);
- }
- }
- if (($env{'form.'.$role.'_incrs'}) && ($env{'form.'.$role.'_access'} eq 'none')) {
- if (ref($current{'overridden'}) eq 'HASH') {
- push(@todelete,'internal.adhocpriv.'.$role);
- }
- } else {
- my %full=();
- my %levels= (
- course => {},
- domain => {},
- system => {},
- );
- my %levelscurrent=(
- course => {},
- domain => {},
- system => {},
- );
- &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent);
- my (@updatedon,@updatedoff,@override);
- @override = &Apache::loncommon::get_env_multiple('form.'.$role.'_override');
- if (@override) {
- foreach my $priv (sort(keys(%full))) {
- next unless ($levels{'course'}{$priv});
- if (grep(/^\Q$priv\E$/,@override)) {
- if ($levelscurrent{'course'}{$priv}) {
- push(@updatedoff,$priv);
- } else {
- push(@updatedon,$priv);
- }
- }
- }
- }
- if (@updatedon) {
- $newsettings{$role}{'on'} = join('', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedon));
- }
- if (@updatedoff) {
- $newsettings{$role}{'off'} = join(' ', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedoff));
- }
- if (ref($current{'overridden'}) eq 'HASH') {
- if (ref($current{'overridden'}{'on'}) eq 'ARRAY') {
- if (@updatedon) {
- my @diffs = &Apache::loncommon::compare_arrays(\@updatedon,$current{'overridden'}{'on'});
- if (@diffs) {
- $changed{$role}{'on'} = 1;
- }
- } else {
- $changed{$role}{'on'} = 1;
- }
- } elsif (@updatedon) {
- $changed{$role}{'on'} = 1;
- }
- if (ref($current{'overridden'}{'off'}) eq 'ARRAY') {
- if (@updatedoff) {
- my @diffs = &Apache::loncommon::compare_arrays(\@updatedoff,$current{'overridden'}{'off'});
- if (@diffs) {
- $changed{$role}{'off'} = 1;
- }
- } else {
- $changed{$role}{'off'} = 1;
- }
- } elsif (@updatedoff) {
- $changed{$role}{'off'} = 1;
- }
- } else {
- if (@updatedon) {
- $changed{$role}{'on'} = 1;
- }
- if (@updatedoff) {
- $changed{$role}{'off'} = 1;
- }
- }
- if (ref($changed{$role}) eq 'HASH') {
- if (($changed{$role}{'on'} || $changed{$role}{'off'})) {
- my $newpriv;
- if (@updatedon) {
- $newpriv = 'on='.join(':',@updatedon);
- }
- if (@updatedoff) {
- $newpriv .= ($newpriv ? ',' : '' ).'off='.join(':',@updatedoff);
- }
- if ($newpriv eq '') {
- push(@todelete,'internal.adhocpriv.'.$role);
- } else {
- $storehash{'internal.adhocpriv.'.$role} = $newpriv;
- }
- }
- }
- }
- }
- if (@incrs) {
- $storehash{'internal.adhocaccess'} = join(',',@incrs);
- } elsif (@todelete) {
- push(@todelete,'internal.adhocaccess');
- }
- if (keys(%changed)) {
- my ($putres,$delres);
- if (keys(%storehash)) {
- $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum);
- my %newenvhash;
- foreach my $key (keys(%storehash)) {
- $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $storehash{$key};
- }
- &Apache::lonnet::appenv(\%newenvhash);
- }
- if (@todelete) {
- $delres = &Apache::lonnet::del('environment',\@todelete,$cdom,$cnum);
- foreach my $key (@todelete) {
- &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key);
- }
- }
- if (($putres eq 'ok') || ($delres eq 'ok')) {
- my %domconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$cdom);
- my (%domcurrent,%ordered,%description,%domusage);
- if (ref($domconfig{'helpsettings'}) eq 'HASH') {
- if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') {
- %domcurrent = %{$domconfig{'helpsettings'}{'adhoc'}};
- }
- }
- my $count = 0;
- foreach my $role (sort(keys(%customroles))) {
- my ($order,$desc);
- if (ref($domcurrent{$role}) eq 'HASH') {
- $order = $domcurrent{$role}{'order'};
- $desc = $domcurrent{$role}{'desc'};
- }
- if ($order eq '') {
- $order = $count;
- }
- $ordered{$order} = $role;
- if ($desc ne '') {
- $description{$role} = $desc;
- } else {
- $description{$role}= $role;
- }
- $count++;
- }
- my @roles_by_num = ();
- foreach my $item (sort {$a <=> $b } (keys(%ordered))) {
- push(@roles_by_num,$ordered{$item});
- }
- %domusage = &domain_adhoc_access(\%changed,\%domcurrent,\@accesstypes,$usertypes,$othertitle);
- $r->print(&mt('Helpdesk access settings have been changed as follows').'');
- foreach my $role (@roles_by_num) {
- next unless (ref($changed{$role}) eq 'HASH');
- $r->print(''.&mt('Ad hoc role').': '.$description{$role}.' '.
- '');
- if ($changed{$role}{'access'} || $changed{$role}{'status'} || $changed{$role}{'inc'} || $changed{$role}{'exc'}) {
- $r->print('');
- if ($env{'form.'.$role.'_incrs'}) {
- if ($newsettings{$role}{'access'} eq 'all') {
- $r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.'));
- } elsif ($newsettings{$role}{'access'} eq 'dh') {
- $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
- &Apache::lonnet::plaintext('dh')));
- } elsif ($newsettings{$role}{'access'} eq 'da') {
- $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role',
- &Apache::lonnet::plaintext('da')));
- } elsif ($newsettings{$role}{'access'} eq 'none') {
- $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
- } elsif ($newsettings{$role}{'access'} eq 'status') {
- if ($newsettings{$role}{'status'}) {
- my ($access,$rest) = split(/=/,$storehash{'internal.adhoc.'.$role});
- if (split(/,/,$rest) > 1) {
- $r->print(&mt('Helpdesk staff can use this role if their institutional type is one of: [_1].',
- $newsettings{$role}{'status'}));
- } else {
- $r->print(&mt('Helpdesk staff can use this role if their institutional type is: [_1].',
- $newsettings{$role}{'status'}));
- }
- } else {
- $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
- }
- } elsif ($newsettings{$role}{'access'} eq 'exc') {
- if ($newsettings{$role}{'exc'}) {
- $r->print(&mt('Helpdesk staff who can use this role are as follows:').' '.$newsettings{$role}{'exc'}.'.');
- } else {
- $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.'));
- }
- } elsif ($newsettings{$role}{'access'} eq 'inc') {
- if ($newsettings{$role}{'inc'}) {
- $r->print(&mt('All helpdesk staff may use this role except the following:').' '.$newsettings{$role}{'inc'}.'.');
- } else {
- $r->print(&mt('All helpdesk staff may use this role.'));
- }
- }
- } else {
- $r->print(&mt('Default access set in the domain now applies.').''.$domusage{$role}.' ');
- }
- $r->print(' ');
- }
- unless ($newsettings{$role}{'access'} eq 'none') {
- if ($changed{$role}{'off'}) {
- if ($newsettings{$role}{'off'}) {
- $r->print(''.&mt('Privileges which are available by default for this ad hoc role, but are disabled for this specific '.lc($crstype).':').
- ''.$newsettings{$role}{'off'}.' ');
- } else {
- $r->print(''.&mt('All privileges available by default for this ad hoc role are enabled.').' ');
- }
- }
- if ($changed{$role}{'on'}) {
- if ($newsettings{$role}{'on'}) {
- $r->print(''.&mt('Privileges which are not available by default for this ad hoc role, but are enabled for this specific '.lc($crstype).':').
- ''.$newsettings{$role}{'on'}.' ');
- } else {
- $r->print(''.&mt('None of the privileges unavailable by default for this ad hoc role are enabled.').' ');
- }
- }
- }
- $r->print(' ');
- }
- $r->print(' ');
- }
- } else {
- $r->print(&mt('No changes made to helpdesk access settings.'));
- }
- }
- return;
-}
-
#-------------------------------------------------- functions for &phase_two
sub user_search_result {
my ($context,$srch) = @_;
@@ -8435,9 +6821,9 @@ sub user_search_result {
$response .= ''.$domd_chk.' '.$createdom.' ';
@@ -8838,20 +7216,18 @@ sub build_search_response {
.&mt("Click 'Search'")
.' '
- ,'')
- .''
+ ,'')
+ .'