'.
&personal_data_display($ccuname,$ccdomain,$newuser,
@@ -889,7 +897,7 @@ ENDNOPORTPRIV
unless ($tmp =~ /^(con_lost|error)/i) {
my $now=time;
my %lt=&Apache::lonlocal::texthash(
- 'rer' => "Revoke Existing Roles",
+ 'rer' => "Existing Roles",
'rev' => "Revoke",
'del' => "Delete",
'ren' => "Re-Enable",
@@ -1129,13 +1137,15 @@ ENDNOPORTPRIV
"javascript:pjump('."'date_end','End Date Assistant Co-Author',document.cu.end_$cudom\_$cuname\_aa.value,'end_$cudom\_$cuname\_aa','cu.pres','dateset'".')">'.$lt{'sed'}.''."\n".
&Apache::loncommon::end_data_table_row()."\n".
&Apache::loncommon::end_data_table());
- } elsif (!(&authorpriv($env{'user.name'},$env{'request.role.domain'}))) {
- $r->print('
'.
- &mt('You do not have privileges to assign co-author roles.').
- '');
- } elsif (($env{'user.name'} eq $ccuname) &&
+ } elsif ($env{'request.role'} =~ /^au\./) {
+ if (!(&authorpriv($env{'user.name'},$env{'request.role.domain'}))) {
+ $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 your own author area in Construction Space is not permitted'));
+ $r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Construction Space is not permitted'));
+ }
}
#
# Domain level
@@ -1236,7 +1246,7 @@ sub user_authentication {
);
if (&Apache::lonnet::allowed('mau',$ccdomain)) {
&initialize_authen_forms($ccdomain);
- my $choices = &set_login($ccdomain);
+ my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
$outcome = <
$loginscript
@@ -1307,34 +1317,6 @@ ENDNOPRIV
return $outcome;
}
-sub set_login {
- my ($dom) = @_;
- my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
- my $response;
- my ($authnum,%can_assign) =
- &Apache::loncommon::get_assignable_auth($dom);
- if ($authnum) {
- $response = &Apache::loncommon::start_data_table();
- if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) {
- $response .= &Apache::loncommon::start_data_table_row().
- ''.$authformkrb.' | '.
- &Apache::loncommon::end_data_table_row()."\n";
- }
- if ($can_assign{'int'}) {
- $response .= &Apache::loncommon::start_data_table_row().
- ''.$authformint.' | '.
- &Apache::loncommon::end_data_table_row()."\n"
- }
- if ($can_assign{'loc'}) {
- $response .= &Apache::loncommon::start_data_table_row().
- ''.$authformloc.' | '.
- &Apache::loncommon::end_data_table_row()."\n";
- }
- $response .= &Apache::loncommon::end_data_table();
- }
- return $response;
-}
-
sub modify_login_block {
my ($dom,$currentauth) = @_;
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom);
@@ -1432,7 +1414,6 @@ sub personal_data_display {
'generation' => "Generation",
'permanentemail' => "Permanent e-mail address",
'id' => "ID/Student Number",
- 'hs' => "Home Server",
'lg' => "Login Data"
);
my @userinfo = ('firstname','middlename','lastname','generation',
@@ -1480,8 +1461,8 @@ sub update_user_data {
$env{'form.ccdomain'});
# Error messages
my $error = ''.&mt('Error').': ';
- my $end = '
'.
- ''.
&mt('Return to previous page').''.&Apache::loncommon::end_page();
my $title;
@@ -1498,7 +1479,7 @@ sub update_user_data {
$r->print(&Apache::loncommon::start_page($title,$jscript));
&Apache::lonhtmlcommon::add_breadcrumb
({href=>"javascript:backPage(document.userupdate)",
- text=>"User modify/custom role edit",
+ text=>"Create/modify user",
faq=>282,bug=>'Instructor Interface',});
if ($env{'form.prevphase'} eq 'userpicked') {
&Apache::lonhtmlcommon::add_breadcrumb
@@ -1519,25 +1500,25 @@ sub update_user_data {
$r->print(&update_result_form($uhome));
# Check Inputs
if (! $env{'form.ccuname'} ) {
- $r->print($error.&mt('No login name specified').'.'.$end);
+ $r->print($error.&mt('No login name specified').'.'.$end.$rtnlink);
return;
}
if ( $env{'form.ccuname'} ne
&LONCAPA::clean_username($env{'form.ccuname'}) ) {
$r->print($error.&mt('Invalid login name').'. '.
&mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'.
- $end);
+ $end.$rtnlink);
return;
}
if (! $env{'form.ccdomain'} ) {
- $r->print($error.&mt('No domain specified').'.'.$end);
+ $r->print($error.&mt('No domain specified').'.'.$end.$rtnlink);
return;
}
if ( $env{'form.ccdomain'} ne
&LONCAPA::clean_domain($env{'form.ccdomain'}) ) {
$r->print($error.&mt ('Invalid domain name').'. '.
&mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'.
- $end);
+ $end.$rtnlink);
return;
}
if (! exists($env{'form.makeuser'})) {
@@ -1573,19 +1554,19 @@ sub update_user_data {
# If they are creating a new user but have not specified login
# information this will be caught below.
} else {
- $r->print($error.&mt('Invalid login mode or password').$end);
+ $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);
return;
}
$r->print(''.&mt('User [_1] in domain [_2]',
$env{'form.ccuname'}, $env{'form.ccdomain'}).'
');
-
+ my (%alerts,%rulematch,%inst_results,%curr_rules);
if ($env{'form.makeuser'}) {
$r->print(''.&mt('Creating new account.').'
');
# Check for the authentication mode and password
if (! $amode || ! $genpwd) {
- $r->print($error.&mt('Invalid login mode or password').$end);
+ $r->print($error.&mt('Invalid login mode or password').$end.$rtnlink);
return;
}
# Determine desired host
@@ -1596,13 +1577,39 @@ sub update_user_data {
my %home_servers =
&Apache::lonnet::get_servers($env{'form.ccdomain'},'library');
if (! exists($home_servers{$desiredhost})) {
- $r->print($error.&mt('Invalid home server specified'));
+ $r->print($error.&mt('Invalid home server specified').$end.$rtnlink);
+ return;
+ }
+ }
+ # Check ID format
+ my %checkhash;
+ my %checks = ('id' => 1);
+ %{$checkhash{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}} = (
+ 'status' => 'new',
+ 'id' => $env{'form.cid'}
+ );
+ &Apache::loncommon::user_rule_check(\%checkhash,\%checks,\%alerts,
+ \%rulematch,\%inst_results,\%curr_rules);
+ if (ref($alerts{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}) eq 'HASH') {
+ if ($alerts{$env{'form.ccuname'}.':'.$env{'form.ccdomain'}}{'id'}) {
+ my $domdesc =
+ &Apache::lonnet::domain($env{'form.ccdomain'},'description');
+ my $userchkmsg;
+ if (ref($curr_rules{$env{'form.ccdomain'}}) eq 'HASH') {
+ $userchkmsg =
+ &Apache::loncommon::instrule_disallow_msg('id',
+ $domdesc,1).
+ &Apache::loncommon::user_rule_formats($env{'form.ccdomain'},
+ $domdesc,$curr_rules{$env{'form.ccdomain'}}{'id'},'id');
+ }
+ $r->print($error.&mt('Invalid ID format').$end.
+ $userchkmsg.$rtnlink);
return;
}
}
# Call modifyuser
my $result = &Apache::lonnet::modifyuser
- ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cstid'},
+ ($env{'form.ccdomain'},$env{'form.ccuname'},$env{'form.cid'},
$amode,$genpwd,$env{'form.cfirstname'},
$env{'form.cmiddlename'},$env{'form.clastname'},
$env{'form.cgeneration'},undef,$desiredhost,
@@ -1616,7 +1623,7 @@ sub update_user_data {
($env{'form.login'} ne '' )) {
# Modify user privileges
if (! $amode || ! $genpwd) {
- $r->print($error.'Invalid login mode or password'.$end);
+ $r->print($error.'Invalid login mode or password'.$end.$rtnlink);
return;
}
# Only allow authentification modification if the person has authority
@@ -1629,7 +1636,7 @@ sub update_user_data {
($env{'form.ccuname'},$env{'form.ccdomain'}));
} else {
# Okay, this is a non-fatal error.
- $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.');
+ $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end);
}
}
##
@@ -1796,9 +1803,11 @@ END
}
##
my $now=time;
+ my $rolechanges = 0;
$r->print(''.&mt('Modifying Roles').'
');
foreach my $key (keys (%env)) {
next if (! $env{$key});
+ next if ($key eq 'form.action');
# Revoke roles
if ($key=~/^form\.rev/) {
if ($key=~/^form\.rev\:([^\_]+)\_([^\_\.]+)$/) {
@@ -1824,6 +1833,7 @@ END
$env{'form.ccuname'},$1,$2,$3,$4).
'
');
}
+ $rolechanges ++;
} elsif ($key=~/^form\.del/) {
if ($key=~/^form\.del\:([^\_]+)\_([^\_\.]+)$/) {
# Delete standard role
@@ -1849,6 +1859,7 @@ END
$env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
0,1).'
');
}
+ $rolechanges ++;
} elsif ($key=~/^form\.ren/) {
my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};
@@ -1887,6 +1898,7 @@ END
$r->print(&mt('Re-enabling custom role [_1] by [_2]@[_3] in [_4] : [_5]',
$rolename,$rnam,$rdom,$url,$result).'
');
}
+ $rolechanges ++;
} elsif ($key=~/^form\.act/) {
my $udom = $env{'form.ccdomain'};
my $uname = $env{'form.ccuname'};
@@ -1990,7 +2002,7 @@ END
}
}
} else {
- $r->print(''.&mt('ERROR').': '.&mt('Unknown command').' '.$key.'
');
+ $r->print(''.&mt('ERROR').': '.&mt('Unknown command').' '.$key.'
');
}
foreach my $key (sort(keys(%disallowed))) {
if (($key eq 'none') || ($key eq 'all')) {
@@ -2000,10 +2012,14 @@ END
}
$r->print(' '.&mt('Please go back and choose a different section name.').'
');
}
+ $rolechanges ++;
}
} # End of foreach (keys(%env))
# Flush the course logs so reverse user roles immediately updated
&Apache::lonnet::flushcourselogs();
+ if (!$rolechanges) {
+ $r->print(&mt('No roles to modify'));
+ }
$r->print(&Apache::loncommon::end_page());
}
@@ -2024,6 +2040,7 @@ sub update_result_form {
}
$outcome .= ''."\n".
''."\n".
+ ''."\n".
'';
return $outcome;
}
@@ -2108,7 +2125,7 @@ sub custom_role_editor {
$rolename=~s/[^A-Za-z0-9]//gs;
- if (!$rolename) {
+ if (!$rolename || $env{'form.phase'} eq 'pickrole') {
&print_username_entry_form($r);
return;
}
@@ -2177,8 +2194,8 @@ sub custom_role_editor {
$head_script .= "\n".$jsback."\n".''."\n";
$r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:backPage(document.form1,'','')",
- text=>"User modify/custom role edit",
+ ({href=>"javascript:backPage(document.form1,'pickrole','')",
+ text=>"Pick custom role",
faq=>282,bug=>'Instructor Interface',},
{href=>"javascript:backPage(document.form1,'','')",
text=>"Edit custom role",
@@ -2221,6 +2238,7 @@ ENDCCF
&Apache::loncommon::end_data_table_row());
}
$r->print(&Apache::loncommon::end_data_table().
+ ''.
''."\n".''."\n".
''."\n".
@@ -2302,23 +2320,19 @@ sub make_button_code {
# ---------------------------------------------------------- Call to definerole
sub set_custom_role {
my ($r) = @_;
-
my $rolename=$env{'form.rolename'};
-
$rolename=~s/[^A-Za-z0-9]//gs;
-
if (!$rolename) {
- &print_username_entry_form($r);
+ &custom_role_editor($r);
return;
}
-
my ($jsback,$elements) = &crumb_utilities();
my $jscript = '';
$r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
&Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"javascript:backPage(document.customresult,'','')",
- text=>"User modify/custom role edit",
+ ({href=>"javascript:backPage(document.customresult,'pickrole','')",
+ text=>"Pick custom role",
faq=>282,bug=>'Instructor Interface',},
{href=>"javascript:backPage(document.customresult,'selected_custom_edit','')",
text=>"Edit custom role",
@@ -2381,7 +2395,7 @@ sub set_custom_role {
$env{'user.name'},
$rolename));
}
- $r->print('Create another role, or Create/Modify a user.
');
$r->print(&Apache::loncommon::end_page());
}
@@ -2389,81 +2403,316 @@ sub set_custom_role {
# ================================================================ Main Handler
sub handler {
my $r = shift;
-
if ($r->header_only) {
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
return OK;
}
+ my $context;
+ if ($env{'request.course.id'}) {
+ $context = 'course';
+ } elsif ($env{'request.role'} =~ /^au\./) {
+ $context = 'construction_space';
+ } else {
+ $context = 'domain';
+ }
+ &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
+ ['action','state']);
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/createuser",
+ text=>"User Management"});
+ my ($permission,$allowed) = &get_permission($context);
+ if (!$allowed) {
+ $env{'user.error.msg'}=
+ "/adm/createuser:cst:0:0:Cannot create/modify user data ".
+ "or view user status.";
+ return HTTP_NOT_ACCEPTABLE;
+ }
+
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
+
+ # Main switch on form.action and form.state, as appropriate
+ if (! exists($env{'form.action'})) {
+ $r->print(&header());
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management'));
+ $r->print(&print_main_menu($permission));
+ $r->print(&Apache::loncommon::end_page());
+ } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) {
+ $r->print(&header());
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/createuser?action=upload&state=',
+ text=>"Upload Users List"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List',
+ 'User_Management_Upload'));
+ $r->print(''.&Apache::loncommon::end_page());
+ } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
+ $r->print(&header());
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/createuser?action=expire',
+ text=>"Expire User Roles"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles',
+ 'User_Management_Drops'));
+ if (! exists($env{'form.state'})) {
+ &Apache::lonuserutils::print_expire_menu($r,$context);
+ } elsif ($env{'form.state'} eq 'done') {
+ &Apache::lonuserutils::expire_user_list($r);
+ } else {
+ &Apache::lonuserutils::print_expire_menu($r,$context);
+ }
+ $r->print(&Apache::loncommon::end_page());
+ } elsif ($env{'form.action'} eq 'singleuser' && $permission->{'cusr'}) {
+ my $phase = $env{'form.phase'};
+ my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
+ &Apache::loncreateuser::restore_prev_selections();
+ my $srch;
+ foreach my $item (@search) {
+ $srch->{$item} = $env{'form.'.$item};
+ }
- if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) ||
- (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) ||
- (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) ||
- (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) ||
- (&authorpriv($env{'user.name'},$env{'request.role.domain'})) ||
- (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
- &Apache::lonhtmlcommon::clear_breadcrumbs();
-
- my $phase = $env{'form.phase'};
- my @search = ('srchterm','srchby','srchin','srchtype','srchdomain');
-
- if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
- my $srch;
- foreach my $item (@search) {
- $srch->{$item} = $env{'form.'.$item};
- }
- if ($env{'form.phase'} eq 'get_user_info') {
- my ($currstate,$response,$forcenewuser,$results) =
- &user_search_result($srch);
- if ($env{'form.currstate'} eq 'modify') {
- $currstate = $env{'form.currstate'};
- }
- if ($currstate eq 'select') {
- &print_user_selection_page($r,$response,$srch,$results,'createuser',\@search);
- } elsif ($currstate eq 'modify') {
- my ($ccuname,$ccdomain);
- if (($srch->{'srchby'} eq 'uname') &&
- ($srch->{'srchtype'} eq 'exact')) {
- $ccuname = $srch->{'srchterm'};
- $ccdomain= $srch->{'srchdomain'};
- } else {
- my @matchedunames = keys(%{$results});
- ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
- }
- $ccuname =&LONCAPA::clean_username($ccuname);
- $ccdomain=&LONCAPA::clean_domain($ccdomain);
- if ($env{'form.forcenewuser'}) {
- $response = '';
- }
- &print_user_modification_page($r,$ccuname,$ccdomain,$srch,
- $response);
- } elsif ($currstate eq 'query') {
- &print_user_query_page($r,'createuser');
- } else {
- &print_username_entry_form($r,$response,$srch,$forcenewuser);
- }
- } elsif ($env{'form.phase'} eq 'userpicked') {
- my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
- my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
- &print_user_modification_page($r,$ccuname,$ccdomain,$srch);
- }
- } elsif ($env{'form.phase'} eq 'update_user_data') {
- &update_user_data($r);
- } elsif ($env{'form.phase'} eq 'selected_custom_edit') {
- &custom_role_editor($r);
- } elsif ($env{'form.phase'} eq 'set_custom_roles') {
- &set_custom_role($r);
- } else {
- &print_username_entry_form($r);
- }
- } else {
- $env{'user.error.msg'}=
- "/adm/createuser:mau:0:0:Cannot modify user data";
- return HTTP_NOT_ACCEPTABLE;
- }
- return OK;
+ if (($phase eq 'get_user_info') || ($phase eq 'userpicked')) {
+ if ($env{'form.phase'} eq 'get_user_info') {
+ my ($currstate,$response,$forcenewuser,$results) =
+ &user_search_result($srch);
+ if ($env{'form.currstate'} eq 'modify') {
+ $currstate = $env{'form.currstate'};
+ }
+ if ($currstate eq 'select') {
+ &print_user_selection_page($r,$response,$srch,$results,
+ 'createuser',\@search);
+ } elsif ($currstate eq 'modify') {
+ my ($ccuname,$ccdomain);
+ if (($srch->{'srchby'} eq 'uname') &&
+ ($srch->{'srchtype'} eq 'exact')) {
+ $ccuname = $srch->{'srchterm'};
+ $ccdomain= $srch->{'srchdomain'};
+ } else {
+ my @matchedunames = keys(%{$results});
+ ($ccuname,$ccdomain) = split(/:/,$matchedunames[0]);
+ }
+ $ccuname =&LONCAPA::clean_username($ccuname);
+ $ccdomain=&LONCAPA::clean_domain($ccdomain);
+ if ($env{'form.forcenewuser'}) {
+ $response = '';
+ }
+ &print_user_modification_page($r,$ccuname,$ccdomain,
+ $srch,$response);
+ } elsif ($currstate eq 'query') {
+ &print_user_query_page($r,'createuser');
+ } else {
+ &print_username_entry_form($r,$response,$srch,
+ $forcenewuser);
+ }
+ } elsif ($env{'form.phase'} eq 'userpicked') {
+ my $ccuname = &LONCAPA::clean_username($env{'form.seluname'});
+ my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'});
+ &print_user_modification_page($r,$ccuname,$ccdomain,$srch);
+ }
+ } elsif ($env{'form.phase'} eq 'update_user_data') {
+ &update_user_data($r);
+ } else {
+ &print_username_entry_form($r,undef,$srch);
+ }
+ } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) {
+ if ($env{'form.phase'} eq 'set_custom_roles') {
+ &set_custom_role($r);
+ } else {
+ &custom_role_editor($r);
+ }
+ } elsif ($env{'form.action'} eq 'listusers' && $permission->{'view'}) {
+ my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles);
+ my $formname = 'studentform';
+ if ($context eq 'domain' && $env{'form.roletype'} eq 'course') {
+ ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) =
+ &Apache::lonuserutils::courses_selector($env{'request.role.domain'},
+ $formname);
+ my $js = &add_script($jscript).$cb_jscript;
+ my $loadcode =
+ &Apache::lonuserutils::course_selector_loadcode($formname);
+ if ($loadcode ne '') {
+ $r->print(&header($js,{'onload' => $loadcode,}));
+ } else {
+ $r->print(&header($js));
+ }
+ } else {
+ $r->print(&header());
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/createuser?action=listusers',
+ text=>"List Users"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users",
+ 'User_Management_List'));
+ &Apache::lonuserutils::print_userlist($r,undef,$permission,$context,
+ $formname,$totcodes,$codetitles,$idlist,$idlist_titles);
+ $r->print(&Apache::loncommon::end_page());
+ } elsif ($env{'form.action'} eq 'expire' && $permission->{'cusr'}) {
+ $r->print(&header());
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>'/adm/createuser?action=drop',
+ text=>"Expire Users"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Expire User Roles',
+ 'User_Management_Drops'));
+ if (! exists($env{'form.state'})) {
+ &Apache::lonuserutils::print_expire_menu($r,$context);
+ } elsif ($env{'form.state'} eq 'done') {
+ &Apache::lonuserutiles::expire_user_list($r);
+ } else {
+ &print_expire_menu($r,$context);
+ }
+ $r->print(&Apache::loncommon::end_page());
+ } else {
+ $r->print(&header());
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); $r->print(&print_main_menu($permission));
+ $r->print(&Apache::loncommon::end_page());
+ }
+ return OK;
+}
+
+sub header {
+ my ($jscript,$loaditems) = @_;
+ my $start_page;
+ if (ref($loaditems) eq 'HASH') {
+ $start_page=&Apache::loncommon::start_page('User Management',$jscript,{'add_entries' => $loaditems,});
+ } else {
+ $start_page=&Apache::loncommon::start_page('User Management',$jscript);
+ }
+ return $start_page;
+}
+
+sub add_script {
+ my ($js) = @_;
+ return '';
+}
+
+###############################################################
+###############################################################
+# Menu Phase One
+sub print_main_menu {
+ my ($permission) = @_;
+ my @menu =
+ (
+ { text => 'Upload a File of Users to Modify/Create Users and/or Add roles',
+ help => 'User_Management_Upload',
+ action => 'upload',
+ permission => $permission->{'cusr'},
+ },
+ { text => 'Create User/Set User Roles for a single user',
+ help => 'User_Management_Single_User',
+ action => 'singleuser',
+ permission => $permission->{'cusr'},
+ },
+ { text => 'Display Lists of Users',
+ help => 'User_Management_List',
+ action => 'listusers',
+ permission => $permission->{'view'},
+ },
+# { text => 'Expire User Roles',
+# help => 'User_Management_Drops',
+# action => 'expire',
+# permission => $permission->{'cusr'},
+# },
+ { text => 'Edit Custom Roles',
+ help => 'Custom_Role_Edit',
+ action => 'custom',
+ permission => $permission->{'custom'},
+ },
+ );
+ my $menu_html = '';
+ foreach my $menu_item (@menu) {
+ next if (! $menu_item->{'permission'});
+ $menu_html.='';
+ $menu_html.='';
+ if (exists($menu_item->{'url'})) {
+ $menu_html.=qq{};
+ } else {
+ $menu_html.=
+ qq{};
+ }
+ $menu_html.= &mt($menu_item->{'text'}).'';
+ if (exists($menu_item->{'help'})) {
+ $menu_html.=
+ &Apache::loncommon::help_open_topic($menu_item->{'help'});
+ }
+ $menu_html.='
';
+ }
+ return $menu_html;
+}
+
+sub get_permission {
+ my ($context) = @_;
+ my %permission;
+ if ($context eq 'course') {
+ if ((&Apache::lonnet::allowed('cta',$env{'request.course.id'})) ||
+ (&Apache::lonnet::allowed('cin',$env{'request.course.id'})) ||
+ (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) ||
+ (&Apache::lonnet::allowed('cep',$env{'request.course.id'})) ||
+ (&Apache::lonnet::allowed('cst',$env{'request.course.id'}))) {
+ $permission{'cusr'} = 1;
+ $permission{'view'} =
+ &Apache::lonnet::allowed('vcl',$env{'request.course.id'});
+
+ }
+ if (&Apache::lonnet::allowed('ccr',$env{'request.course.id'})) {
+ $permission{'custom'} = 1;
+ }
+ if (&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) {
+ $permission{'view'} = 1;
+ if (!$permission{'view'}) {
+ my $scope = $env{'request.course.id'}.'/'.$env{'request.course.sec'};
+ $permission{'view'} = &Apache::lonnet::allowed('vcl',$scope);
+ if ($permission{'view'}) {
+ $permission{'view_section'} = $env{'request.course.sec'};
+ }
+ }
+ }
+ } elsif ($context eq 'construction_space') {
+ $permission{'cusr'} = &authorpriv($env{'user.name'},$env{'request.role.domain'});
+ $permission{'view'} = $permission{'cusr'};
+ } else {
+ if ((&Apache::lonnet::allowed('cad',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('cli',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('csc',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('cdg',$env{'request.role.domain'})) ||
+ (&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))) {
+ $permission{'cusr'} = 1;
+ }
+ if (&Apache::lonnet::allowed('ccr',$env{'request.role.domain'})) {
+ $permission{'custom'} = 1;
+ }
+ $permission{'view'} = $permission{'cusr'};
+ }
+ my $allowed = 0;
+ foreach my $perm (values(%permission)) {
+ if ($perm) { $allowed=1; last; }
+ }
+ return (\%permission,$allowed);
+}
+
+sub restore_prev_selections {
+ my %saveable_parameters = ('srchby' => 'scalar',
+ 'srchin' => 'scalar',
+ 'srchtype' => 'scalar',
+ );
+ &Apache::loncommon::store_settings('user','user_picker',
+ \%saveable_parameters);
+ &Apache::loncommon::restore_settings('user','user_picker',
+ \%saveable_parameters);
}
#-------------------------------------------------- functions for &phase_two
@@ -2574,7 +2823,8 @@ sub user_search_result {
{&Apache::lonnet::get('environment',
['firstname',
'lastname',
- 'permanentemail'])};
+ 'permanentemail'],
+ $cudomain,$cuname)};
}
}
}
@@ -2884,7 +3134,7 @@ sub course_level_table {
my $table = '';
# Custom Roles?
- my %customroles=&my_custom_roles();
+ my %customroles=&Apache::lonuserutils::my_custom_roles();
my %lt=&Apache::lonlocal::texthash(
'exs' => "Existing sections",
'new' => "Define new section",
@@ -3031,7 +3281,7 @@ sub course_sections {
sub course_level_dc {
my ($dcdom) = @_;
- my %customroles=&my_custom_roles();
+ my %customroles=&Apache::lonuserutils::my_custom_roles();
my $hiddenitems = ''.
''.
'';