');
+ my $personal_table =
&personal_data_display($ccuname,$ccdomain,$newuser,$context,
$inst_results{$ccuname.':'.$ccdomain});
$r->print($personal_table);
- if ($showforceid) {
- $r->print('
'.&Apache::lonuserutils::forceid_change($context).'
');
- }
if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
$r->print('
'.&mt('User Can Request Creation of Courses/Communities in this Domain?').' '.
&Apache::loncommon::start_data_table());
@@ -2169,13 +2161,37 @@ sub modify_login_block {
}
sub personal_data_display {
- my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_;
- my ($output,$showforceid,%userenv,%canmodify,%canmodify_status);
+ my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
+ $now,$captchaform,$emailusername) = @_;
+ my ($output,%userenv,%canmodify,%canmodify_status);
my @userinfo = ('firstname','middlename','lastname','generation',
'permanentemail','id');
my $rowcount = 0;
my $editable = 0;
- %canmodify_status =
+ my %textboxsize = (
+ firstname => '15',
+ middlename => '15',
+ lastname => '15',
+ generation => '5',
+ permanentemail => '25',
+ id => '15',
+ );
+
+ my %lt=&Apache::lonlocal::texthash(
+ 'pd' => "Personal Data",
+ 'firstname' => "First Name",
+ 'middlename' => "Middle Name",
+ 'lastname' => "Last Name",
+ 'generation' => "Generation",
+ 'permanentemail' => "Permanent e-mail address",
+ 'id' => "Student/Employee ID",
+ 'lg' => "Login Data",
+ 'inststatus' => "Affiliation",
+ 'email' => 'E-mail address',
+ 'valid' => 'Validation',
+ );
+
+ %canmodify_status =
&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
['inststatus'],$rolesarray);
if (!$newuser) {
@@ -2187,31 +2203,53 @@ sub personal_data_display {
&Apache::lonuserutils::can_modify_userinfo($context,$ccdomain,
\@userinfo,$rolesarray);
} elsif ($context eq 'selfcreate') {
- %canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,
- $inst_results,$rolesarray);
+ if ($newuser eq 'email') {
+ if (ref($emailusername) eq 'HASH') {
+ my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
+ @userinfo = ();
+ if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
+ foreach my $field (@{$infofields}) {
+ if ($emailusername->{$field}) {
+ push(@userinfo,$field);
+ $canmodify{$field} = 1;
+ unless ($textboxsize{$field}) {
+ $textboxsize{$field} = 25;
+ }
+ unless ($lt{$field}) {
+ $lt{$field} = $infotitles->{$field};
+ }
+ }
+ }
+ }
+ }
+ } else {
+ %canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo,
+ $inst_results,$rolesarray);
+ }
}
- my %lt=&Apache::lonlocal::texthash(
- 'pd' => "Personal Data",
- 'firstname' => "First Name",
- 'middlename' => "Middle Name",
- 'lastname' => "Last Name",
- 'generation' => "Generation",
- 'permanentemail' => "Permanent e-mail address",
- 'id' => "Student/Employee ID",
- 'lg' => "Login Data",
- 'inststatus' => "Affiliation",
- );
- my %textboxsize = (
- firstname => '15',
- middlename => '15',
- lastname => '15',
- generation => '5',
- permanentemail => '25',
- id => '15',
- );
+
my $genhelp=&Apache::loncommon::help_open_topic('Generation');
$output = '
'.$lt{'pd'}.' '.
&Apache::lonhtmlcommon::start_pick_box();
+ if (($context eq 'selfcreate') && ($newuser eq 'email')) {
+ $output .= &Apache::lonhtmlcommon::row_title($lt{'email'},undef,
+ 'LC_oddrow_value')."\n".
+ '
';
+ $rowcount ++;
+ $output .= &Apache::lonhtmlcommon::row_closure(1);
+ my $upassone = '
';
+ my $upasstwo = '
';
+ $output .= &Apache::lonhtmlcommon::row_title(&mt('Password'),
+ 'LC_pick_box_title',
+ 'LC_oddrow_value')."\n".
+ $upassone."\n".
+ &Apache::lonhtmlcommon::row_closure(1)."\n".
+ &Apache::lonhtmlcommon::row_title(&mt('Confirm password'),
+ 'LC_pick_box_title',
+ 'LC_oddrow_value')."\n".
+ $upasstwo.
+ &Apache::lonhtmlcommon::row_closure()."\n";
+ }
foreach my $item (@userinfo) {
my $rowtitle = $lt{$item};
my $hiderow = 0;
@@ -2225,7 +2263,7 @@ sub personal_data_display {
$row .= '
'.$inst_results->{$item};
} else {
if ($context eq 'selfcreate') {
- if ($canmodify{$item}) {
+ if ($canmodify{$item}) {
$row .= '
';
$editable ++;
} else {
@@ -2241,7 +2279,11 @@ sub personal_data_display {
$row .= $ccuname;
} else {
if ($canmodify{$item}) {
- $row .= '
';
+ if ($newuser eq 'email') {
+ $row .= '
';
+ } else {
+ $row .= '
';
+ }
$editable ++;
} else {
$hiderow = 1;
@@ -2257,8 +2299,8 @@ sub personal_data_display {
} else {
$row .= $userenv{$item};
}
- if ($item eq 'id') {
- $showforceid = $canmodify{$item};
+ if (($item eq 'id') && ($canmodify{$item})) {
+ $row .= '
'.&Apache::lonuserutils::forceid_change($context);
}
}
$row .= &Apache::lonhtmlcommon::row_closure(1);
@@ -2294,7 +2336,7 @@ sub personal_data_display {
}
}
if (!$hiderow) {
- my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n".
+ my $row = &Apache::lonhtmlcommon::row_title(&mt('Affiliations'),undef,'LC_oddrow_value')."\n".
$shown.&Apache::lonhtmlcommon::row_closure(1);
if ($context eq 'selfcreate') {
$rowcount ++;
@@ -2304,12 +2346,26 @@ sub personal_data_display {
}
}
}
+ if (($context eq 'selfcreate') && ($newuser eq 'email')) {
+ if ($captchaform) {
+ $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'},
+ 'LC_pick_box_title')."\n".
+ $captchaform."\n".'
'.
+ &Apache::lonhtmlcommon::row_closure(1);
+ $rowcount ++;
+ }
+ my $submit_text = &mt('Create account');
+ $output .= &Apache::lonhtmlcommon::row_title()."\n".
+ '
'.
+ &Apache::lonhtmlcommon::row_closure(1);
+ }
$output .= &Apache::lonhtmlcommon::end_pick_box();
if (wantarray) {
if ($context eq 'selfcreate') {
return($output,$rowcount,$editable);
} else {
- return ($output,$showforceid);
+ return $output;
}
} else {
return $output;
@@ -2474,9 +2530,12 @@ sub update_user_data {
if (! exists($env{'form.makeuser'})) {
# Modifying an existing user, so check the validity of the name
if ($uhome eq 'no_host') {
- $r->print($error.&mt('Unable to determine home server for ').
- $env{'form.ccuname'}.&mt(' in domain ').
- $env{'form.ccdomain'}.'.');
+ $r->print(
+ $error
+ .'
'
+ .&mt('Unable to determine home server for [_1] in domain [_2].',
+ '"'.$env{'form.ccuname'}.'"','"'.$env{'form.ccdomain'}.'"')
+ .'
');
return;
}
}
@@ -2966,8 +3025,8 @@ sub update_user_data {
}
}
foreach my $name ('portfolio','author') {
- $oldsettings{'quota'}{$name} = $oldquota{$name}.' MB';
- $newsettings{'quota'}{$name} = $newquota{$name}.' MB';
+ $oldsettings{'quota'}{$name} = &mt('[_1] MB',$oldquota{$name});
+ $newsettings{'quota'}{$name} = &mt('[_1] MB',$newquota{$name});
}
if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) {
my ($chgresult,$namechgresult);
@@ -3066,9 +3125,12 @@ sub update_user_data {
&Apache::lonnet::appenv(\%newenvhash);
}
} else { # error occurred
- $r->print('
'.&mt('Unable to successfully change environment for').' '.
- $env{'form.ccuname'}.' '.&mt('in domain').' '.
- $env{'form.ccdomain'}.' ');
+ $r->print(
+ '
'
+ .&mt('Unable to successfully change environment for [_1] in domain [_2].',
+ '"'.$env{'form.ccuname'}.'"',
+ '"'.$env{'form.ccdomain'}.'"')
+ .'
');
}
} else { # End of if ($env ... ) logic
# They did not want to change the users name, quota, tool availability,
@@ -3116,13 +3178,14 @@ sub update_user_data {
if ($env{'form.action'} eq 'singlestudent') {
&enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,
$crstype,$showcredits,$defaultcredits);
- $r->print('
');
- if ($crstype eq 'Community') {
- $r->print(&mt('Enroll Another Member'));
- } else {
- $r->print(&mt('Enroll Another Student'));
- }
- $r->print('
');
+ my $linktext = ($crstype eq 'Community' ?
+ &mt('Enroll Another Member') : &mt('Enroll Another Student'));
+ $r->print(
+ &Apache::lonhtmlcommon::actionbox([
+ '
'
+ .($crstype eq 'Community' ?
+ &mt('Enroll Another Member') : &mt('Enroll Another Student'))
+ .' ']));
} else {
my @rolechanges = &update_roles($r,$context,$showcredits);
if (keys(%namechanged) > 0) {
@@ -3944,7 +4007,7 @@ sub enroll_single_student {
}
$r->print('.
'.$showstart.'; '.$showend);
if ($startdate <= $now && !$newuser) {
- $r->print('
');
+ $r->print('
');
if ($crstype eq 'Community') {
$r->print(&mt('If the member is currently logged-in to LON-CAPA, the new role will be available when the member next logs in.'));
} else {
@@ -4435,25 +4498,43 @@ sub set_custom_role {
$sysrole.=':'.$item;
}
}
- $r->print('
'
- .&mt('Create or edit another custom role')
- .'
'
+ &Apache::loncommon::confirmwrapper($message)
+ .'
'
+ .&Apache::lonhtmlcommon::actionbox([
+ '
'
+ .&mt('Create or edit another custom role')
+ .' '])
.'
'
+ .&Apache::lonhtmlcommon::echo_form_input([])
+ .''
);
}
@@ -4477,12 +4558,12 @@ sub handler {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['action','state','callingform','roletype','showrole','bulkaction','popup','phase',
- 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype']);
+ 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $args;
my $brcrum = [];
my $bread_crumbs_component = 'User Management';
- if ($env{'form.action'} ne 'dateselect') {
+ if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) {
$brcrum = [{href=>"/adm/createuser",
text=>"User Management",
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'}
@@ -4649,7 +4730,8 @@ sub handler {
}
$args = { bread_crumbs => $brcrum,
bread_crumbs_component => $bread_crumbs_component};
- $r->print(&header(undef,$args));
+ my $js = &usernamerequest_javascript();
+ $r->print(&header(&add_script($js),$args));
if (!exists($env{'form.state'})) {
$r->print(&Apache::loncoursequeueadmin::display_queued_requests('requestauthor',
$env{'request.role.domain'}));
@@ -4658,6 +4740,103 @@ sub handler {
$r->print(&Apache::loncoursequeueadmin::update_request_queue('requestauthor',
$env{'request.role.domain'}));
}
+ } elsif (($env{'form.action'} eq 'processusernamereq') &&
+ ($permission->{'cusr'}) &&
+ (&Apache::lonnet::allowed('cau',$env{'request.role.domain'}))) {
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=processusernamereq',
+ text => 'LON-CAPA account requests',
+ help => 'Domain_Username_Approvals'});
+ $bread_crumbs_component = 'Account requests';
+ if ($env{'form.state'} eq 'done') {
+ push(@{$brcrum},
+ {href => '/adm/createuser?action=usernamereqqueue',
+ text => 'Result',
+ help => 'Domain_Username_Approvals'});
+ $bread_crumbs_component = 'LON-CAPA account request result';
+ }
+ $args = { bread_crumbs => $brcrum,
+ bread_crumbs_component => $bread_crumbs_component};
+ my $js = &usernamerequest_javascript();
+ $r->print(&header(&add_script($js),$args));
+ if (!exists($env{'form.state'})) {
+ $r->print(&Apache::loncoursequeueadmin::display_queued_requests('requestusername',
+ $env{'request.role.domain'}));
+ } elsif ($env{'form.state'} eq 'done') {
+ $r->print('
'.&mt('LON-CAPA account request processing').' '."\n");
+ $r->print(&Apache::loncoursequeueadmin::update_request_queue('requestusername',
+ $env{'request.role.domain'}));
+ }
+ } elsif (($env{'form.action'} eq 'displayuserreq') &&
+ ($permission->{'cusr'})) {
+ my $dom = $env{'form.domain'};
+ my $uname = $env{'form.username'};
+ my $warning;
+ if (($dom =~ /^$match_domain$/) && (&Apache::lonnet::domain($dom) ne '')) {
+ if (($dom eq $env{'request.role.domain'}) && (&Apache::lonnet::allowed('ccc',$dom))) {
+ if (($uname =~ /^$match_username$/) && ($env{'form.queue'} eq 'approval')) {
+ my $uhome = &Apache::lonnet::homeserver($uname,$dom);
+ if ($uhome eq 'no_host') {
+ my $queue = $env{'form.queue'};
+ my $reqkey = &escape($uname).'_'.$queue;
+ my $namespace = 'usernamequeue';
+ my $domconfig = &Apache::lonnet::get_domainconfiguser($dom);
+ my %queued =
+ &Apache::lonnet::get($namespace,[$reqkey],$dom,$domconfig);
+ unless ($queued{$reqkey}) {
+ $warning = &mt('No information was found for this LON-CAPA account request.');
+ }
+ } else {
+ $warning = &mt('A LON-CAPA account already exists for the requested username and domain.');
+ }
+ } else {
+ $warning = &mt('LON-CAPA account request status check is for an invalid username.');
+ }
+ } else {
+ $warning = &mt('You do not have rights to view LON-CAPA account requests in the domain specified.');
+ }
+ } else {
+ $warning = &mt('LON-CAPA account request status check is for an invalid domain.');
+ }
+ my $args = { only_body => 1 };
+ $r->print(&header(undef,$args).
+ '
'.&mt('LON-CAPA Account Request Details').' ');
+ if ($warning ne '') {
+ $r->print('
'.$warning.'
');
+ } else {
+ my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
+ my $domconfiguser = &Apache::lonnet::get_domainconfiguser($dom);
+ my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
+ if (ref($domconfig{'usercreation'}) eq 'HASH') {
+ if (ref($domconfig{'usercreation'}{'cancreate'}) eq 'HASH') {
+ if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}) eq 'HASH') {
+ my $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}}));
+ my %info =
+ &Apache::lonnet::get('nohist_requestedusernames',[$uname],$dom,$domconfiguser);
+ if (ref($info{$uname}) eq 'HASH') {
+ if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
+ $r->print('
'.&Apache::lonhtmlcommon::start_pick_box());
+ my $num;
+ foreach my $field (@{$infofields}) {
+ next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$field});
+ next unless ($infotitles->{$field});
+ $r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
+ $info{$uname}{$field});
+ $num ++;
+ if ($count == $num) {
+ $r->print(&Apache::lonhtmlcommon::row_closure(1));
+ } else {
+ $r->print(&Apache::lonhtmlcommon::row_closure());
+ }
+ }
+ $r->print(&Apache::lonhtmlcommon::end_pick_box().'
');
+ }
+ }
+ }
+ }
+ }
+ $r->print(&close_popup_form());
+ }
} elsif (($env{'form.action'} eq 'listusers') &&
($permission->{'view'} || $permission->{'cusr'})) {
if ($env{'form.phase'} eq 'bulkchange') {
@@ -4857,6 +5036,32 @@ sub add_script {
.''."\n";
}
+sub usernamerequest_javascript {
+ my $js = <
+END
+}
+
sub verify_user_display {
my ($context) = @_;
my %lt = &Apache::lonlocal::texthash (
@@ -5110,6 +5315,14 @@ sub print_main_menu {
linktitle => 'Approve or reject author role requests',
},
{
+ linktext => 'LON-CAPA Account Requests',
+ icon => 'list-add.png',
+ #help => 'Domain_Username_Approvals',
+ url => '/adm/createuser?action=processusernamereq',
+ permission => $permission->{'cusr'},
+ linktitle => 'Approve or reject LON-CAPA account requests',
+ },
+ {
linktext => 'Change Log',
icon => 'document-properties.png',
#help => 'Course_User_Logs',
@@ -6977,22 +7190,22 @@ sub course_level_dc {
my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
''."\n";
+ ''."\n";
foreach my $role (@roles) {
my $plrole=&Apache::lonnet::plaintext($role);
- $otheritems .= ' '.$plrole;
+ $otheritems .= ' '.$plrole.' ';
}
if ( keys %customroles > 0) {
foreach my $cust (sort keys %customroles) {
my $custrole='cr_cr_'.$env{'user.domain'}.
'_'.$env{'user.name'}.'_'.$cust;
- $otheritems .= ' '.$cust;
+ $otheritems .= ' '.$cust.' ';
}
}
$otheritems .= ' '.
'