version 1.220, 2007/12/21 18:16:39
|
version 1.224, 2007/12/24 16:00:13
|
Line 233 sub print_username_entry_form {
|
Line 233 sub print_username_entry_form {
|
text=>"Single user search", |
text=>"Single user search", |
faq=>282,bug=>'Instructor Interface',}); |
faq=>282,bug=>'Instructor Interface',}); |
} |
} |
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management'); |
my $helpitem = 'Course_Change_Privileges'; |
|
if ($env{'form.action'} eq 'custom') { |
|
$helpitem = 'Course_Editing_Custom_Roles'; |
|
} elsif ($env{'form.action'} eq 'singlestudent') { |
|
$helpitem = 'Course_Add_Student'; |
|
} |
|
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management', |
|
$helpitem); |
my %existingroles=&Apache::lonuserutils::my_custom_roles(); |
my %existingroles=&Apache::lonuserutils::my_custom_roles(); |
my $choice=&Apache::loncommon::select_form('make new role','rolename', |
my $choice=&Apache::loncommon::select_form('make new role','rolename', |
('make new role' => 'Generate new role ...',%existingroles)); |
('make new role' => 'Generate new role ...',%existingroles)); |
Line 249 sub print_username_entry_form {
|
Line 256 sub print_username_entry_form {
|
'enrl' => "to enroll one student", |
'enrl' => "to enroll one student", |
); |
); |
my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface'); |
my $help = &Apache::loncommon::help_open_menu(undef,undef,282,'Instructor Interface'); |
my $helpsiur=&Apache::loncommon::help_open_topic('Course_Change_Privileges'); |
|
my $helpsist=&Apache::loncommon::help_open_topic('Course_Add_Student'); |
|
my $helpecpr=&Apache::loncommon::help_open_topic('Course_Editing_Custom_Roles'); |
|
my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain'); |
my $sellink=&Apache::loncommon::selectstudent_link('crtuser','srchterm','srchdomain'); |
if ($sellink) { |
if ($sellink) { |
$sellink = "$lt{'or'} ".$sellink; |
$sellink = "$lt{'or'} ".$sellink; |
Line 263 sub print_username_entry_form {
|
Line 267 sub print_username_entry_form {
|
<form action="/adm/createuser" method="post" name="docustom"> |
<form action="/adm/createuser" method="post" name="docustom"> |
<input type="hidden" name="action" value="$env{'form.action'}" /> |
<input type="hidden" name="action" value="$env{'form.action'}" /> |
<input type="hidden" name="phase" value="selected_custom_edit" /> |
<input type="hidden" name="phase" value="selected_custom_edit" /> |
<h3>$lt{'ecrp'}$helpecpr</h3> |
<h3>$lt{'ecrp'}</h3> |
$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br /> |
$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br /> |
<input name="customeditor" type="submit" value="$lt{'cre'}" /> |
<input name="customeditor" type="submit" value="$lt{'cre'}" /> |
</form> |
</form> |
ENDCUSTOM |
ENDCUSTOM |
} |
} |
} else { |
} else { |
my $actiontext = $lt{'mod'}.$helpsiur; |
my $actiontext = $lt{'mod'}; |
if ($env{'form.action'} eq 'singlestudent') { |
if ($env{'form.action'} eq 'singlestudent') { |
$actiontext = $lt{'enrl'}.$helpsist; |
$actiontext = $lt{'enrl'}; |
} |
} |
$r->print(" |
$r->print(" |
<h3>$lt{'srch'} $sellink $actiontext</h3>"); |
<h3>$lt{'srch'} $sellink $actiontext</h3>"); |
Line 420 ENDSCRIPT
|
Line 424 ENDSCRIPT
|
{href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", |
{href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", |
text=>"Select User", |
text=>"Select User", |
faq=>282,bug=>'Instructor Interface',}); |
faq=>282,bug=>'Instructor Interface',}); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', |
|
'Course_Change_Privileges')); |
$r->print("<b>$lt{'usrch'}</b><br />"); |
$r->print("<b>$lt{'usrch'}</b><br />"); |
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); |
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); |
$r->print('<h3>'.$lt{'usel'}.'</h3>'); |
$r->print('<h3>'.$lt{'usel'}.'</h3>'); |
Line 432 ENDSCRIPT
|
Line 437 ENDSCRIPT
|
{href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", |
{href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", |
text=>"Select Student", |
text=>"Select Student", |
faq=>282,bug=>'Instructor Interface',}); |
faq=>282,bug=>'Instructor Interface',}); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', |
|
'Course_Add_Student')); |
$r->print($jscript."<b>$lt{'stusrch'}</b><br />"); |
$r->print($jscript."<b>$lt{'stusrch'}</b><br />"); |
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); |
$r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); |
$r->print('</form><h3>'.$lt{'stusel'}.'</h3>'); |
$r->print('</form><h3>'.$lt{'stusel'}.'</h3>'); |
Line 620 sub print_user_modification_page {
|
Line 626 sub print_user_modification_page {
|
({href=>"javascript:backPage($form,'$env{'form.phase'}','modify')", |
({href=>"javascript:backPage($form,'$env{'form.phase'}','modify')", |
text=>$breadcrumb_text{'modify'}, |
text=>$breadcrumb_text{'modify'}, |
faq=>282,bug=>'Instructor Interface',}); |
faq=>282,bug=>'Instructor Interface',}); |
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management'); |
my $helpitem = 'Course_Change_Privileges'; |
|
if ($env{'form.action'} eq 'singlestudent') { |
|
$helpitem = 'Course_Add_Student'; |
|
} |
|
my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management', |
|
$helpitem); |
|
|
my $forminfo =<<"ENDFORMINFO"; |
my $forminfo =<<"ENDFORMINFO"; |
<form action="/adm/createuser" method="post" name="$formname"> |
<form action="/adm/createuser" method="post" name="$formname"> |
Line 1508 sub update_user_data {
|
Line 1519 sub update_user_data {
|
{href=>"/adm/createuser", |
{href=>"/adm/createuser", |
text=>"Result", |
text=>"Result", |
faq=>282,bug=>'Instructor Interface',}); |
faq=>282,bug=>'Instructor Interface',}); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); |
my $helpitem = 'Course_Change_Privileges'; |
|
if ($env{'form.action'} eq 'singlestudent') { |
|
$helpitem = 'Course_Add_Student'; |
|
} |
|
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', |
|
$helpitem)); |
$r->print(&update_result_form($uhome)); |
$r->print(&update_result_form($uhome)); |
# Check Inputs |
# Check Inputs |
if (! $env{'form.ccuname'} ) { |
if (! $env{'form.ccuname'} ) { |
Line 2109 sub update_roles {
|
Line 2125 sub update_roles {
|
if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) { |
if ($url =~ m-^/($match_domain)/($match_courseid)/?(\w*)$-) { |
my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3); |
my $result = &Apache::loncommon::commit_studentrole(\$logmsg,$udom,$uname,$url,$role,$now,0,$1,$2,$3); |
if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course') || ($result eq 'refused')) { |
if (($result =~ /^error/) || ($result eq 'not_in_class') || ($result eq 'unknown_course') || ($result eq 'refused')) { |
$output = "Error: $result\n"; |
if ($result eq 'refused' && $logmsg) { |
|
$output = $logmsg; |
|
} else { |
|
$output = "Error: $result\n"; |
|
} |
} else { |
} else { |
$output = &mt('Assigning').' '.$role.' in '.$url. |
$output = &mt('Assigning').' '.$role.' in '.$url. |
&mt('starting').' '.localtime($now). |
&mt('starting').' '.localtime($now). |
Line 2475 sub custom_role_editor {
|
Line 2495 sub custom_role_editor {
|
{href=>"javascript:backPage(document.form1,'','')", |
{href=>"javascript:backPage(document.form1,'','')", |
text=>"Edit custom role", |
text=>"Edit custom role", |
faq=>282,bug=>'Instructor Interface',}); |
faq=>282,bug=>'Instructor Interface',}); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', |
|
'Course_Editing_Custom_Roles')); |
|
|
$r->print($body_top); |
$r->print($body_top); |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
Line 2615 sub set_custom_role {
|
Line 2636 sub set_custom_role {
|
{href=>"javascript:backPage(document.customresult,'set_custom_roles','')", |
{href=>"javascript:backPage(document.customresult,'set_custom_roles','')", |
text=>"Result", |
text=>"Result", |
faq=>282,bug=>'Instructor Interface',}); |
faq=>282,bug=>'Instructor Interface',}); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', |
|
'Course_Editing_Custom_Roles')); |
|
|
my ($rdummy,$roledef)= |
my ($rdummy,$roledef)= |
&Apache::lonnet::get('roles',["rolesdef_$rolename"]); |
&Apache::lonnet::get('roles',["rolesdef_$rolename"]); |
Line 2723 sub handler {
|
Line 2745 sub handler {
|
({href=>'/adm/createuser?action=upload&state=', |
({href=>'/adm/createuser?action=upload&state=', |
text=>"Upload Users List"}); |
text=>"Upload Users List"}); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List', |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Upload Users List', |
'User_Management_Upload')); |
'Course_Create_Class_List')); |
$r->print('<form name="studentform" method="post" '. |
$r->print('<form name="studentform" method="post" '. |
'enctype="multipart/form-data" '. |
'enctype="multipart/form-data" '. |
' action="/adm/createuser">'."\n"); |
' action="/adm/createuser">'."\n"); |
if (! exists($env{'form.state'})) { |
if (! exists($env{'form.state'})) { |
&Apache::lonuserutils::print_first_users_upload_form($r,$context); |
&Apache::lonuserutils::print_first_users_upload_form($r,$context); |
} elsif ($env{'form.state'} eq 'got_file') { |
} elsif ($env{'form.state'} eq 'got_file') { |
&Apache::lonuserutils::print_upload_manager_form($r,$context); |
&Apache::lonuserutils::print_upload_manager_form($r,$context, |
|
$permission); |
} elsif ($env{'form.state'} eq 'enrolling') { |
} elsif ($env{'form.state'} eq 'enrolling') { |
if ($env{'form.datatoken'}) { |
if ($env{'form.datatoken'}) { |
&Apache::lonuserutils::upfile_drop_add($r,$context); |
&Apache::lonuserutils::upfile_drop_add($r,$context,$permission); |
} |
} |
} else { |
} else { |
&Apache::lonuserutils::print_first_users_upload_form($r,$context); |
&Apache::lonuserutils::print_first_users_upload_form($r,$context); |
Line 2755 sub handler {
|
Line 2778 sub handler {
|
my $response; |
my $response; |
if ($env{'form.srchterm'} !~ /^$match_username$/) { |
if ($env{'form.srchterm'} !~ /^$match_username$/) { |
my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); |
my $response = &mt('You must specify a valid username. Only the following are allowed: letters numbers - . @'); |
|
$env{'form.phase'} = ''; |
&print_username_entry_form($r,$context,$response,$srch); |
&print_username_entry_form($r,$context,$response,$srch); |
} else { |
} else { |
my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'}); |
my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'}); |
my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'}); |
my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'}); |
&print_user_modification_page($r,$ccuname,$ccdomain, |
&print_user_modification_page($r,$ccuname,$ccdomain, |
$srch,$response,$context); |
$srch,$response,$context, |
|
$permission); |
} |
} |
} elsif ($env{'form.phase'} eq 'get_user_info') { |
} elsif ($env{'form.phase'} eq 'get_user_info') { |
my ($currstate,$response,$forcenewuser,$results) = |
my ($currstate,$response,$forcenewuser,$results) = |
&user_search_result($srch); |
&user_search_result($context,$srch); |
if ($env{'form.currstate'} eq 'modify') { |
if ($env{'form.currstate'} eq 'modify') { |
$currstate = $env{'form.currstate'}; |
$currstate = $env{'form.currstate'}; |
} |
} |
Line 2793 sub handler {
|
Line 2818 sub handler {
|
$response = ''; |
$response = ''; |
} |
} |
&print_user_modification_page($r,$ccuname,$ccdomain, |
&print_user_modification_page($r,$ccuname,$ccdomain, |
$srch,$response,$context); |
$srch,$response,$context, |
|
$permission); |
} elsif ($currstate eq 'query') { |
} elsif ($currstate eq 'query') { |
&print_user_query_page($r,'createuser'); |
&print_user_query_page($r,'createuser'); |
} else { |
} else { |
Line 2804 sub handler {
|
Line 2830 sub handler {
|
my $ccuname = &LONCAPA::clean_username($env{'form.seluname'}); |
my $ccuname = &LONCAPA::clean_username($env{'form.seluname'}); |
my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'}); |
my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'}); |
&print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', |
&print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', |
$context); |
$context,$permission); |
} |
} |
} elsif ($env{'form.phase'} eq 'update_user_data') { |
} elsif ($env{'form.phase'} eq 'update_user_data') { |
&update_user_data($r,$context); |
&update_user_data($r,$context); |
Line 2821 sub handler {
|
Line 2847 sub handler {
|
($permission->{'view'} || $permission->{'cusr'})) { |
($permission->{'view'} || $permission->{'cusr'})) { |
if ($env{'form.phase'} eq 'bulkchange') { |
if ($env{'form.phase'} eq 'bulkchange') { |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>'backPage(document.studentform)', |
({href=>'/adm/createuser?action=listusers', |
text=>"List Users"}); |
text=>"List Users"}, |
|
{href=>"/adm/createuser", |
|
text=>"Result"}); |
my $setting = $env{'form.roletype'}; |
my $setting = $env{'form.roletype'}; |
my $choice = $env{'form.bulkaction'}; |
my $choice = $env{'form.bulkaction'}; |
$r->print(&header()); |
$r->print(&header()); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users", |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users", |
'User_Management_List')); |
'Course_View_Class_List')); |
if ($permission->{'cusr'}) { |
if ($permission->{'cusr'}) { |
&Apache::lonuserutils::update_user_list($r,$context,$setting,$choice); |
&Apache::lonuserutils::update_user_list($r,$context,$setting,$choice); |
|
$r->print(&Apache::loncommon::end_page()); |
|
} else { |
|
$r->print(&mt('You are not authorized to make bulk changes to user roles')); |
|
$r->print('<p><a href="/adm/createuser?action=listusers">'.&mt('Display User Lists').'</a>'); |
|
$r->print(&Apache::loncommon::end_page()); |
} |
} |
} else { |
} else { |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
Line 2854 sub handler {
|
Line 2887 sub handler {
|
$r->print(&header(&add_script(&verify_user_display()))); |
$r->print(&header(&add_script(&verify_user_display()))); |
} |
} |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users", |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("List Users", |
'User_Management_List')); |
'Course_View_Class_List')); |
&Apache::lonuserutils::print_userlist($r,undef,$permission,$context, |
&Apache::lonuserutils::print_userlist($r,undef,$permission,$context, |
$formname,$totcodes,$codetitles,$idlist,$idlist_titles); |
$formname,$totcodes,$codetitles,$idlist,$idlist_titles); |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
Line 2882 sub handler {
|
Line 2915 sub handler {
|
} elsif ($env{'form.action'} eq 'dateselect') { |
} elsif ($env{'form.action'} eq 'dateselect') { |
if ($permission->{'cusr'}) { |
if ($permission->{'cusr'}) { |
$r->print(&header(undef,undef,{'no_nav_bar' => 1}). |
$r->print(&header(undef,undef,{'no_nav_bar' => 1}). |
&Apache::lonuserutils::date_section_selector($context). |
&Apache::lonuserutils::date_section_selector($context, |
|
$permission). |
&Apache::loncommon::end_page()); |
&Apache::loncommon::end_page()); |
} else { |
} else { |
$r->print(&header(). |
$r->print(&header(). |
Line 2936 sub print_main_menu {
|
Line 2970 sub print_main_menu {
|
my %links = ( |
my %links = ( |
domain => { |
domain => { |
upload => 'Upload a File of Users', |
upload => 'Upload a File of Users', |
singleuser => 'Add/Manage a Single User', |
singleuser => 'Add/Modify a Single User', |
listusers => 'Manage Multiple Users', |
listusers => 'Manage Multiple Users', |
}, |
}, |
author => { |
author => { |
upload => 'Upload a File of Co-authors', |
upload => 'Upload a File of Co-authors', |
singleuser => 'Add/Manage a Single Co-author', |
singleuser => 'Add/Modify a Single Co-author', |
listusers => 'Display Co-authors and Manage Multiple Users', |
listusers => 'Display Co-authors and Manage Multiple Users', |
}, |
}, |
course => { |
course => { |
upload => 'Upload a File of Course Users', |
upload => 'Upload a File of Course Users', |
singleuser => 'Add/Manage a Single Course User', |
singleuser => 'Add/Modify a Single Course User', |
listusers => 'Display Class Lists and Manage Multiple Users', |
listusers => 'Display Class Lists and Manage Multiple Users', |
}, |
}, |
); |
); |
my @menu = |
my @menu = |
( |
( |
{ text => $links{$context}{'upload'}, |
{ text => $links{$context}{'upload'}, |
help => 'User_Management_Upload', |
help => 'Course_Create_Class_List', |
action => 'upload', |
action => 'upload', |
permission => $permission->{'cusr'}, |
permission => $permission->{'cusr'}, |
}, |
}, |
{ text => $links{$context}{'singleuser'}, |
{ text => $links{$context}{'singleuser'}, |
help => 'User_Management_Single_User', |
help => 'Course_Change_Privileges', |
action => 'singleuser', |
action => 'singleuser', |
permission => $permission->{'cusr'}, |
permission => $permission->{'cusr'}, |
}, |
}, |
{ text => $links{$context}{'listusers'}, |
{ text => $links{$context}{'listusers'}, |
help => 'User_Management_List', |
help => 'Course_View_Class_List', |
action => 'listusers', |
action => 'listusers', |
permission => ($permission->{'view'} || $permission->{'cusr'}), |
permission => ($permission->{'view'} || $permission->{'cusr'}), |
}, |
}, |
); |
); |
if ($context eq 'domain' || $context eq 'course') { |
if ($context eq 'domain' || $context eq 'course') { |
my $customlink = { text => 'Edit Custom Roles', |
my $customlink = { text => 'Edit Custom Roles', |
help => 'Custom_Role_Edit', |
help => 'Course_Editing_Custom_Roles', |
action => 'custom', |
action => 'custom', |
permission => $permission->{'custom'}, |
permission => $permission->{'custom'}, |
}; |
}; |
Line 2981 sub print_main_menu {
|
Line 3015 sub print_main_menu {
|
my @courselinks = |
my @courselinks = |
( |
( |
{ text => 'Enroll a Single Student', |
{ text => 'Enroll a Single Student', |
help => 'Course_Single_Student', |
help => 'Course_Add_Student', |
action => 'singlestudent', |
action => 'singlestudent', |
permission => $permission->{'cusr'}, |
permission => $permission->{'cusr'}, |
}, |
}, |
Line 3040 sub restore_prev_selections {
|
Line 3074 sub restore_prev_selections {
|
|
|
#-------------------------------------------------- functions for &phase_two |
#-------------------------------------------------- functions for &phase_two |
sub user_search_result { |
sub user_search_result { |
my ($srch) = @_; |
my ($context,$srch) = @_; |
my %allhomes; |
my %allhomes; |
my %inst_matches; |
my %inst_matches; |
my %srch_results; |
my %srch_results; |
Line 3109 sub user_search_result {
|
Line 3143 sub user_search_result {
|
my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'}); |
my $uhome=&Apache::lonnet::homeserver($srch->{'srchterm'},$srch->{'srchdomain'}); |
if ($uhome eq 'no_host') { |
if ($uhome eq 'no_host') { |
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} else { |
} else { |
$currstate = 'modify'; |
$currstate = 'modify'; |
} |
} |
} else { |
} else { |
%srch_results = &Apache::lonnet::usersearch($srch); |
%srch_results = &Apache::lonnet::usersearch($srch); |
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} |
} |
} else { |
} else { |
my $courseusers = &get_courseusers(); |
my $courseusers = &get_courseusers(); |
Line 3125 sub user_search_result {
|
Line 3159 sub user_search_result {
|
$currstate = 'modify'; |
$currstate = 'modify'; |
} else { |
} else { |
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} |
} |
} else { |
} else { |
foreach my $user (keys(%$courseusers)) { |
foreach my $user (keys(%$courseusers)) { |
Line 3152 sub user_search_result {
|
Line 3186 sub user_search_result {
|
} |
} |
} |
} |
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} |
} |
} |
} |
} |
} |
Line 3162 sub user_search_result {
|
Line 3196 sub user_search_result {
|
($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); |
($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); |
if ($dirsrchres eq 'ok') { |
if ($dirsrchres eq 'ok') { |
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} else { |
} else { |
my $showdom = &display_domain_info($srch->{'srchdomain'}); |
my $showdom = &display_domain_info($srch->{'srchdomain'}); |
$response = '<span class="LC_warning">'. |
$response = '<span class="LC_warning">'. |
Line 3176 sub user_search_result {
|
Line 3210 sub user_search_result {
|
if ($srch->{'srchin'} eq 'dom') { |
if ($srch->{'srchin'} eq 'dom') { |
%srch_results = &Apache::lonnet::usersearch($srch); |
%srch_results = &Apache::lonnet::usersearch($srch); |
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} elsif ($srch->{'srchin'} eq 'crs') { |
} elsif ($srch->{'srchin'} eq 'crs') { |
my $courseusers = &get_courseusers(); |
my $courseusers = &get_courseusers(); |
foreach my $user (keys(%$courseusers)) { |
foreach my $user (keys(%$courseusers)) { |
Line 3228 sub user_search_result {
|
Line 3262 sub user_search_result {
|
} |
} |
} |
} |
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} elsif ($srch->{'srchin'} eq 'alc') { |
} elsif ($srch->{'srchin'} eq 'alc') { |
$currstate = 'query'; |
$currstate = 'query'; |
} elsif ($srch->{'srchin'} eq 'instd') { |
} elsif ($srch->{'srchin'} eq 'instd') { |
($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); |
($dirsrchres,%srch_results) = &Apache::lonnet::inst_directory_query($srch); |
if ($dirsrchres eq 'ok') { |
if ($dirsrchres eq 'ok') { |
($currstate,$response,$forcenewuser) = |
($currstate,$response,$forcenewuser) = |
&build_search_response($srch,%srch_results); |
&build_search_response($context,$srch,%srch_results); |
} else { |
} else { |
my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = '<span class="LC_warning">'. |
my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = '<span class="LC_warning">'. |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
&mt('Institutional directory search is not available in domain: [_1]',$showdom). |
Line 3341 sub get_courseusers {
|
Line 3375 sub get_courseusers {
|
} |
} |
|
|
sub build_search_response { |
sub build_search_response { |
my ($srch,%srch_results) = @_; |
my ($context,$srch,%srch_results) = @_; |
my ($currstate,$response,$forcenewuser); |
my ($currstate,$response,$forcenewuser); |
my %names = ( |
my %names = ( |
'uname' => 'username', |
'uname' => 'username', |
Line 3400 sub build_search_response {
|
Line 3434 sub build_search_response {
|
} |
} |
} |
} |
if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) { |
if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) { |
my $showdom = &display_domain_info($env{'request.role.domain'}); |
my $cancreate = |
|
&Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context); |
|
if ($cancreate) { |
|
my $showdom = &display_domain_info($env{'request.role.domain'}); |
$response .= '<br /><br />'.&mt("<b>To add a new user</b> (you can only create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>):",$env{'request.role.domain'}).'<ul><li>'.&mt("Set 'Domain/institution to search' to: <span class=\"LC_cusr_emph\">[_1]</span>",$showdom).'<li>'.&mt("Set 'Search criteria' to: <span class=\"LC_cusr_emph\">'username is ...... in selected LON-CAPA domain'").'</span></li><li>'.&mt('Provide the proposed username').'</li><li>'.&mt('Search').'</li></ul><br />'; |
$response .= '<br /><br />'.&mt("<b>To add a new user</b> (you can only create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>):",$env{'request.role.domain'}).'<ul><li>'.&mt("Set 'Domain/institution to search' to: <span class=\"LC_cusr_emph\">[_1]</span>",$showdom).'<li>'.&mt("Set 'Search criteria' to: <span class=\"LC_cusr_emph\">'username is ...... in selected LON-CAPA domain'").'</span></li><li>'.&mt('Provide the proposed username').'</li><li>'.&mt('Search').'</li></ul><br />'; |
|
} else { |
|
my $helplink = ' href="javascript:helpMenu('."'display'".')"'; |
|
$response .= '<br /><br />'.&mt("You are not authorized to create new users in your current role's domain - <span class=\"LC_cusr_emph\">[_1]</span>.",$env{'request.role.domain'}).'<br />'.&mt('Contact the <a[_1]>helpdesk</a> if you need to create a new user.',$helplink).'<br /><br />'; |
|
} |
} |
} |
} |
} |
} |
} |
Line 3503 sub course_level_table {
|
Line 3544 sub course_level_table {
|
} |
} |
my @roles = &Apache::lonuserutils::roles_by_context('course'); |
my @roles = &Apache::lonuserutils::roles_by_context('course'); |
foreach my $role (@roles) { |
foreach my $role (@roles) { |
|
my $plrole=&Apache::lonnet::plaintext($role); |
if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) { |
if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) { |
my $plrole=&Apache::lonnet::plaintext($role); |
$table .= &course_level_row($protectedcourse,$role,$area,$domain, |
$table .= &Apache::loncommon::start_data_table_row(). |
$plrole,\%sections_count,\%lt); |
'<td><input type="checkbox" name="act_'.$protectedcourse.'_'.$role.'" /></td> |
} elsif ($env{'request.course.sec'} ne '') { |
<td>'.$plrole.'</td> |
if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'. |
<td>'.$area.'<br />Domain: '.$domain.'</td>'."\n"; |
$env{'request.course.sec'})) { |
if ($role ne 'cc') { |
$table .= &course_level_row($protectedcourse,$role,$area,$domain, |
if (%sections_count) { |
$plrole,\%sections_count,\%lt); |
my $currsec = |
|
&Apache::lonuserutils::course_sections(\%sections_count, |
|
$protectedcourse.'_'.$role); |
|
$table .= |
|
'<td><table class="LC_createuser">'. |
|
'<tr class="LC_section_row"> |
|
<td valign="top">'.$lt{'exs'}.'<br />'. |
|
$currsec.'</td>'. |
|
'<td> </td>'. |
|
'<td valign="top"> '.$lt{'new'}.'<br />'. |
|
'<input type="text" name="newsec_'.$protectedcourse.'_'.$role.'" value="" />'. |
|
'<input type="hidden" '. |
|
'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'. |
|
'</tr></table></td>'; |
|
} else { |
|
$table .= '<td><input type="text" size="10" '. |
|
'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'; |
|
} |
|
} else { |
|
$table .= '<td> </td>'; |
|
} |
} |
$table .= <<ENDTIMEENTRY; |
|
<td><input type="hidden" name="start_$protectedcourse\_$role" value='' /> |
|
<a href= |
|
"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt{'ssd'}</a></td> |
|
<td><input type="hidden" name="end_$protectedcourse\_$role" value='' /> |
|
<a href= |
|
"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt{'sed'}</a></td> |
|
ENDTIMEENTRY |
|
$table.= &Apache::loncommon::end_data_table_row(); |
|
} |
} |
} |
} |
foreach my $cust (sort keys %customroles) { |
if (&Apache::lonnet::allowed('ccr',$thiscourse)) { |
if (&Apache::lonnet::allowed('ccr',$thiscourse)) { |
foreach my $cust (sort keys %customroles) { |
my $plrole=$cust; |
my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust; |
my $customrole=$protectedcourse.'_cr_cr_'.$env{'user.domain'}. |
$table .= &course_level_row($protectedcourse,$role,$area,$domain, |
'_'.$env{'user.name'}.'_'.$plrole; |
$cust,\%sections_count,\%lt); |
$table .= &Apache::loncommon::start_data_table_row(). |
} |
'<td><input type="checkbox" name="act_'.$customrole.'" /></td> |
|
<td>'.$plrole.'</td> |
|
<td>'.$area.'</td>'."\n"; |
|
if (%sections_count) { |
|
my $currsec = |
|
&Apache::lonuserutils::course_sections(\%sections_count, |
|
$customrole); |
|
$table.= |
|
'<td><table class="LC_createuser">'. |
|
'<tr class="LC_section_row"><td valign="top">'. |
|
$lt{'exs'}.'<br />'.$currsec.'</td>'. |
|
'<td> </td>'. |
|
'<td valign="top"> '.$lt{'new'}.'<br />'. |
|
'<input type="text" name="newsec_'.$customrole.'" value="" /></td>'. |
|
'<input type="hidden" '. |
|
'name="sec_'.$customrole.'" /></td>'. |
|
'</tr></table></td>'; |
|
} else { |
|
$table .= '<td><input type="text" size="10" '. |
|
'name="sec_'.$customrole.'" /></td>'; |
|
} |
|
$table .= <<ENDENTRY; |
|
<td><input type="hidden" name="start_$customrole" value='' /> |
|
<a href= |
|
"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$customrole.value,'start_$customrole','cu.pres','dateset')">$lt{'ssd'}</a></td> |
|
<td><input type="hidden" name="end_$customrole" value='' /> |
|
<a href= |
|
"javascript:pjump('date_end','End Date $plrole',document.cu.end_$customrole.value,'end_$customrole','cu.pres','dateset')">$lt{'sed'}</a></td> |
|
ENDENTRY |
|
$table .= &Apache::loncommon::end_data_table_row(); |
|
} |
|
} |
} |
} |
} |
return '' if ($table eq ''); # return nothing if there is nothing |
return '' if ($table eq ''); # return nothing if there is nothing |
Line 3599 $table.
|
Line 3581 $table.
|
return $result; |
return $result; |
} |
} |
|
|
|
sub course_level_row { |
|
my ($protectedcourse,$role,$area,$domain,$plrole,$sections_count,$lt) = @_; |
|
my $row = &Apache::loncommon::start_data_table_row(). |
|
' <td><input type="checkbox" name="act_'. |
|
$protectedcourse.'_'.$role.'" /></td>'."\n". |
|
' <td>'.$plrole.'</td>'."\n". |
|
' <td>'.$area.'<br />Domain: '.$domain.'</td>'."\n"; |
|
if ($role eq 'cc') { |
|
$row .= '<td> </td>'; |
|
} elsif ($env{'request.course.sec'} ne '') { |
|
$row .= ' <td><input type="hidden" value="'. |
|
$env{'request.course.sec'}.'" '. |
|
'name="sec_'.$protectedcourse.'_'.$role.'" />'. |
|
$env{'request.course.sec'}.'</td>'; |
|
} else { |
|
if (ref($sections_count) eq 'HASH') { |
|
my $currsec = |
|
&Apache::lonuserutils::course_sections($sections_count, |
|
$protectedcourse.'_'.$role); |
|
$row .= '<td><table class="LC_createuser">'."\n". |
|
'<tr class="LC_section_row">'."\n". |
|
' <td valign="top">'.$lt->{'exs'}.'<br />'. |
|
$currsec.'</td>'."\n". |
|
' <td> </td>'."\n". |
|
' <td valign="top"> '.$lt->{'new'}.'<br />'. |
|
'<input type="text" name="newsec_'.$protectedcourse.'_'.$role. |
|
'" value="" />'. |
|
'<input type="hidden" '. |
|
'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n". |
|
'</tr></table></td>'."\n"; |
|
} else { |
|
$row .= '<td><input type="text" size="10" '. |
|
'name="sec_'.$protectedcourse.'_'.$role.'" /></td>'."\n"; |
|
} |
|
} |
|
$row .= <<ENDTIMEENTRY; |
|
<td><input type="hidden" name="start_$protectedcourse\_$role" value="" /> |
|
<a href= |
|
"javascript:pjump('date_start','Start Date $plrole',document.cu.start_$protectedcourse\_$role.value,'start_$protectedcourse\_$role','cu.pres','dateset')">$lt->{'ssd'}</a></td> |
|
<td><input type="hidden" name="end_$protectedcourse\_$role" value="" /> |
|
<a href= |
|
"javascript:pjump('date_end','End Date $plrole',document.cu.end_$protectedcourse\_$role.value,'end_$protectedcourse\_$role','cu.pres','dateset')">$lt->{'sed'}</a></td> |
|
ENDTIMEENTRY |
|
$row .= &Apache::loncommon::end_data_table_row(); |
|
return $row; |
|
} |
|
|
sub course_level_dc { |
sub course_level_dc { |
my ($dcdom) = @_; |
my ($dcdom) = @_; |
my %customroles=&Apache::lonuserutils::my_custom_roles(); |
my %customroles=&Apache::lonuserutils::my_custom_roles(); |
Line 3645 sub course_level_dc {
|
Line 3674 sub course_level_dc {
|
'<td> </td>'. |
'<td> </td>'. |
'<td valign="top"> <b>'.$lt{'new'}.'</b><br />'. |
'<td valign="top"> <b>'.$lt{'new'}.'</b><br />'. |
'<input type="text" name="newsec" value="" />'. |
'<input type="text" name="newsec" value="" />'. |
|
'<input type="hidden" name="sections" value="" />'. |
'<input type="hidden" name="groups" value="" /></td>'. |
'<input type="hidden" name="groups" value="" /></td>'. |
'</tr></table></td>'; |
'</tr></table></td>'; |
$otheritems .= <<ENDTIMEENTRY; |
$otheritems .= <<ENDTIMEENTRY; |