--- loncom/interface/loncreateuser.pm 2016/10/22 17:57:54 1.406.2.5
+++ loncom/interface/loncreateuser.pm 2016/10/10 03:02:48 1.416
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Create a user
#
-# $Id: loncreateuser.pm,v 1.406.2.5 2016/10/22 17:57:54 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.416 2016/10/10 03:02:48 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -251,13 +251,15 @@ sub build_tools_display {
'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',
+ 'placement' => 'Can request creation of placement tests',
'requestauthor' => 'Can request author space',
);
if ($context eq 'requestcourses') {
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'requestcourses.official','requestcourses.unofficial',
- 'requestcourses.community','requestcourses.textbook');
- @usertools = ('official','unofficial','community','textbook');
+ 'requestcourses.community','requestcourses.textbook',
+ 'requestcourses.placement');
+ @usertools = ('official','unofficial','community','textbook','placement');
@options =('norequest','approval','autolimit','validate');
%validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
%reqtitles = &courserequest_titles();
@@ -447,12 +449,14 @@ sub coursereq_externaluser {
'unofficial' => 'Can request creation of unofficial courses',
'community' => 'Can request creation of communities',
'textbook' => 'Can request creation of textbook courses',
+ 'placement' => 'Can request creation of placement tests',
);
%userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
- 'reqcrsotherdom.community','reqcrsotherdom.textbook');
- @usertools = ('official','unofficial','community','textbook');
+ 'reqcrsotherdom.community','reqcrsotherdom.textbook',
+ 'reqcrsotherdom.placement');
+ @usertools = ('official','unofficial','community','textbook','placement');
@options = ('approval','validate','autolimit');
%validations = &Apache::lonnet::auto_courserequest_checks($cdom);
my $optregex = join('|',@options);
@@ -529,13 +533,13 @@ sub domainrole_req {
sub domadhocroles {
my ($ccuname,$ccdomain) = @_;
- my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'});
+ my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'});
my %existing=&Apache::lonnet::dump('roles',$env{'request.role.domain'},
$confname,'rolesdef_');
my $output;
if (keys(%existing) > 0) {
my @current;
- my $curradhoc = 'adhocroles.'.$env{'request.role.domain'};
+ my $curradhoc = 'adhocroles.'.$env{'request.role.domain'};
my %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,$curradhoc);
if ($userenv{$curradhoc}) {
@current = split(/,/,$userenv{$curradhoc});
@@ -556,7 +560,7 @@ sub domadhocroles {
&Apache::loncommon::start_data_table_header_row().
'| '.&mt('Action').' | '.&mt('Role').' | '.
''.&mt('Privileges in Course').' | '.
- &Apache::loncommon::end_data_table_header_row();
+ &Apache::loncommon::end_data_table_header_row();
foreach my $key (sort(keys(%customroles))) {
$output .= &Apache::loncommon::start_data_table_row();
if (grep(/^\Q$key\E$/,@current)) {
@@ -579,7 +583,7 @@ sub domadhocroles {
}
my @privs = split(/:/,$customroles{$key}{$level});
foreach my $item (@privs) {
- next if ($item eq '');
+ next if ($item eq '');
my ($priv,$cond) = split(/\&/,$item);
$output .= &Apache::lonnet::plaintext($priv,'Course').$suffix.'
';
}
@@ -599,6 +603,7 @@ sub courserequest_titles {
unofficial => 'Unofficial',
community => 'Communities',
textbook => 'Textbook',
+ placement => 'Placement Tests',
norequest => 'Not allowed',
approval => 'Approval by Dom. Coord.',
validate => 'With validation',
@@ -817,7 +822,7 @@ sub print_username_entry_form {
$actiontext = $lt{'srst'};
}
} elsif ($env{'form.action'} eq 'accesslogs') {
- $actiontext = $lt{'srva'};
+ $actiontext = $lt{'srva'};
}
$r->print("$actiontext");
if ($env{'form.origform'} ne 'crtusername') {
@@ -2679,7 +2684,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'});
@@ -2793,7 +2798,7 @@ sub update_user_data {
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'}) {
@@ -2858,7 +2863,8 @@ sub update_user_data {
'requestcourses.community','requestcourses.textbook',
'reqcrsotherdom.official','reqcrsotherdom.unofficial',
'reqcrsotherdom.community','reqcrsotherdom.textbook',
- 'requestauthor','adhocroles.'.$env{'request.role.domain'}],
+ 'reqcrsotherdom.placement','requestauthor',
+ 'adhocroles.'.$env{'request.role.domain'}],
$env{'form.ccdomain'},$env{'form.ccuname'});
my ($tmp) = keys(%userenv);
if ($tmp =~ /^(con_lost|error)/i) {
@@ -3138,7 +3144,7 @@ sub update_user_data {
if (&adhocrole_changes(\%changeHash,\%userenv)) {
$changed{'adhocroles'} = 1;
$oldsettings{'adhocroles'} = $userenv{'adhocroles.'.$env{'request.role.domain'}};
- $newsettings{'adhocroles'} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
+ $newsettings{'adhocroles'} = $changeHash{'adhocroles.'.$env{'request.role.domain'}};
}
}
foreach my $item (@userinfo) {
@@ -3161,8 +3167,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}) {
@@ -3231,7 +3238,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 =
@@ -3374,6 +3381,7 @@ 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",
@@ -3754,7 +3762,7 @@ sub adhocrole_changes {
@current = split(/,/,$userenv->{$adhoc_key});
if (@dels) {
foreach my $curr (@current) {
- next if ($curr eq '');
+ next if ($curr eq '');
unless (grep(/\Q$curr\E$/,@dels)) {
push(@saved,$curr);
}
@@ -3792,7 +3800,7 @@ sub adhocrole_changes {
push(@alladhoc,@saved);
}
if (@alladhoc) {
- my $adhocstr = join(',',sort(@alladhoc));
+ my $adhocstr = join(',',sort(@alladhoc));
$changehashref->{$adhoc_key} = $adhocstr;
} elsif (@dels) {
&Apache::lonnet::del('environment',[$adhoc_key],$env{'form.ccdomain'},$env{'form.ccuname'});
@@ -4371,7 +4379,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//;
}
@@ -4386,7 +4394,7 @@ sub custom_role_editor {
# ------------------------------------------------------- What can be assigned?
my %full=();
- my %levels=(
+ my %levels=(
course => {},
domain => {},
system => {},
@@ -4399,7 +4407,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},
@@ -4414,7 +4422,7 @@ sub custom_role_editor {
);
my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};
-
+
$r->print(&Apache::loncommon::start_page('Custom Role Editor',
$head_script,$args).
$body_top);
@@ -4431,7 +4439,7 @@ ENDCCF
$r->print(&Apache::loncommon::end_data_table().
''.
''."\n".''."\n".
+ '" />'."\n".''."\n".
''."\n".
'');
}
@@ -5351,7 +5359,7 @@ sub print_main_menu {
push(@{ $menu[0]->{items} }, # Single Users
{
linktext => 'User Access Log',
- icon => 'document-properties.png',
+ icon => 'document-properties.png',
#help => 'User_Access_Logs',
url => '/adm/createuser?action=accesslogs',
permission => $permission->{'activity'},
@@ -5409,6 +5417,7 @@ sub print_main_menu {
groups => 'Community Groups',
},
);
+ $linktext{'Placement'} = $linktext{'Course'};
my %linktitle = (
'Course' => {
@@ -5423,6 +5432,8 @@ sub print_main_menu {
},
);
+ $linktitle{'Placement'} = $linktitle{'Course'};
+
push(@{ $menu[0]->{items} }, #Category: Single Users
{
linktext => $linktext{$crstype}{'single'},
@@ -6667,7 +6678,7 @@ sub print_useraccesslogs_display {
my $args = { bread_crumbs => $brcrum,
bread_crumbs_component => 'User Management'};
-# set javascript
+# set javascript
my ($jsback,$elements) = &crumb_utilities();
my $jsnav = &userlogdisplay_js($formname);
@@ -6683,7 +6694,7 @@ $jsnav
ENDSCRIPT
-# print page header
+# print page header
$r->print(&header($jscript,$args));
# early out unless log data can be displayed.
@@ -6700,7 +6711,7 @@ ENDSCRIPT
.&mt("User's domain must match role's domain")
.''
.&earlyout_accesslog_form($formname,$prevphasestr,$udom));
- return;
+ return;
}
if (($uname eq '') || ($udom eq '')) {
@@ -6825,7 +6836,7 @@ ENDSCRIPT
if ($rolecode eq 'au') {
$extra = '';
} elsif ($rolecode =~ /^(ca|aa)$/) {
- $extra = &mt('Authoring Space: [_1]',$name.':'.$dom);
+ $extra = &mt('Authoring Space: [_1]',$name.':'.$dom);
} elsif ($rolecode =~ /^(li|dg|dh|dc|sc)$/) {
$extra = &mt('Domain: [_1]',$dom);
}
@@ -6833,10 +6844,10 @@ ENDSCRIPT
my $rolename;
if ($rolecode =~ m{^cr/($match_domain)/($match_username)/(\w+)}) {
my $role = $3;
- my $owner = "($2:$1)";
+ my $owner = "($2:$1)";
if ($2 eq $1.'-domainconfig') {
$owner = '(ad hoc)';
- }
+ }
$rolename = &mt('Custom role: [_1]',$role.' '.$owner);
} else {
$rolename = &Apache::lonnet::plaintext($rolecode,$crstype);
@@ -7184,7 +7195,7 @@ sub user_search_result {
$response .= '
';
}
} else {
- unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
+ unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
my $domd_chk = &domdirectorysrch_check($srch);
if ($domd_chk ne 'ok') {
my $instd_chk = &instdirectorysrch_check($srch);
|