--- loncom/interface/loncreateuser.pm 2010/11/01 13:54:00 1.295.2.36 +++ loncom/interface/loncreateuser.pm 2009/06/30 14:02:33 1.296 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.295.2.36 2010/11/01 13:54:00 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.296 2009/06/30 14:02:33 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -51,14 +51,13 @@ In LON-CAPA, roles are actually collecti Assistant", "Course Coordinator", and other such roles are really just collection of privileges that are useful in many circumstances. -Custom roles can be defined by a Domain Coordinator, Course Coordinator -or Community Coordinator via the Manage User functionality. -The custom role editor screen will show all privileges which can be -assigned to users. For a complete list of privileges, please see -C. +Creating custom roles can be done by the Domain Coordinator through +the Create User functionality. That screen will show all privileges +that can be assigned to users. For a complete list of privileges, +please see C. -Custom role definitions are stored in the C file of the creator -of the role. +Custom role definitions are stored in the C file of the role +author. =cut @@ -69,7 +68,7 @@ use Apache::loncommon; use Apache::lonlocal; use Apache::longroup; use Apache::lonuserutils; -use Apache::loncoursequeueadmin; +use Apache::selfenroll(); use LONCAPA qw(:DEFAULT :match); my $loginscript; # piece of javascript used in two separate instances @@ -111,7 +110,6 @@ sub initialize_authen_forms { sub auth_abbrev { my %abv_auth = ( - krb5 => 'krb', krb4 => 'krb', internal => 'int', localuth => 'loc', @@ -145,7 +143,6 @@ sub portfolio_quota { $custom_off = ' checked="checked" '; my $quota_javascript = <<"END_SCRIPT"; END_SCRIPT if ($quotatype eq 'custom') { @@ -218,8 +214,7 @@ END_SCRIPT sub build_tools_display { my ($ccuname,$ccdomain,$context) = @_; - my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, - $colspan,$isadv,%domconfig); + my (@usertools,%userenv,$output); my %lt = &Apache::lonlocal::texthash ( 'blog' => "Personal User Blog", 'aboutme' => "Personal Information Page", @@ -230,256 +225,67 @@ sub build_tools_display { 'usde' => "Use default", 'uscu' => "Use custom", 'official' => 'Can request creation of official courses', - 'unofficial' => 'Can request creation of unofficial courses', - 'community' => 'Can request creation of communities', + 'unofficial' => 'Can request creation of unofficial courses', ); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, - 'requestcourses.official','requestcourses.unofficial', - 'requestcourses.community'); - @usertools = ('official','unofficial','community'); - @options =('norequest','approval','autolimit','validate'); - %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); - %reqtitles = &courserequest_titles(); - %reqdisplay = &courserequest_display(); - $colspan = ' colspan="2"'; - %domconfig = - &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain); - $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); + 'requestcourses.official','requestcourses.unofficial'); + @usertools = ('official','unofficial'); } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'tools.aboutme','tools.portfolio','tools.blog'); @usertools = ('aboutme','blog','portfolio'); } foreach my $item (@usertools) { - my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off, - $currdisp,$custdisp,$custradio); + my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off); $cust_off = 'checked="checked" '; $tool_on = 'checked="checked" '; $curr_access = &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef, $context); - if ($userenv{$context.'.'.$item} ne '') { - $cust_on = ' checked="checked" '; - $cust_off = ''; - } - if ($context eq 'requestcourses') { - if ($userenv{$context.'.'.$item} eq '') { - $custom_access = &mt('Currently from default setting.'); - } else { - $custom_access = &mt('Currently from custom setting.'); + if ($userenv{$context.'.'.$item} eq '') { + $custom_access = 'default'; + if (!$curr_access) { + $tool_off = 'checked="checked" '; + $tool_on = ''; } } else { - if ($userenv{$context.'.'.$item} eq '') { - $custom_access = - &mt('Availability determined currently from default setting.'); - if (!$curr_access) { - $tool_off = 'checked="checked" '; - $tool_on = ''; - } - } else { - $custom_access = - &mt('Availability determined currently from custom setting.'); - if ($userenv{$context.'.'.$item} == 0) { - $tool_off = 'checked="checked" '; - $tool_on = ''; - } + $custom_access = 'custom'; + $cust_on = ' checked="checked" '; + $cust_off = ''; + if ($userenv{$context.'.'.$item} == 0) { + $tool_off = 'checked="checked" '; + $tool_on = ''; } } $output .= ' '."\n". - ' '.$lt{$item}.''."\n". + ' '.$lt{$item}.''."\n". ' '."\n". - &Apache::loncommon::start_data_table_row()."\n"; - if ($context eq 'requestcourses') { - my ($curroption,$currlimit); - if ($userenv{$context.'.'.$item} ne '') { - $curroption = $userenv{$context.'.'.$item}; - } else { - my (@inststatuses); - $curroption = - &Apache::loncoursequeueadmin::get_processtype($ccuname,$ccdomain,$isadv,$ccdomain, - $item,\@inststatuses,\%domconfig); - } - if (!$curroption) { - $curroption = 'norequest'; - } - if ($curroption =~ /^autolimit=(\d*)$/) { - $currlimit = $1; - if ($currlimit eq '') { - $currdisp = &mt('Yes, automatic creation'); - } else { - $currdisp = &mt('Yes, up to [quant,_1,request]/user',$currlimit); - } - } else { - $currdisp = $reqdisplay{$curroption}; - } - $custdisp = ''; - foreach my $option (@options) { - my $val = $option; - if ($option eq 'norequest') { - $val = 0; - } - if ($option eq 'validate') { - my $canvalidate = 0; - if (ref($validations{$item}) eq 'HASH') { - if ($validations{$item}{'_custom_'}) { - $canvalidate = 1; - } - } - next if (!$canvalidate); - } - my $checked = ''; - if ($option eq $curroption) { - $checked = ' checked="checked"'; - } elsif ($option eq 'autolimit') { - if ($curroption =~ /^autolimit/) { - $checked = ' checked="checked"'; - } - } - $custdisp .= ''; - } - $custdisp .= '
 '; - if ($option eq 'autolimit') { - $custdisp .= '
'. - $reqtitles{'unlimited'}; - } else { - $custdisp .= ''; - } - $custdisp .= '
'; - $custradio = ''.&mt('Custom setting').'
'.$custdisp; - } else { - $currdisp = ($curr_access?&mt('Yes'):&mt('No')); - $custdisp = ' '; - $custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp. - ''; - } - $output .= ' '.$custom_access.(' 'x4). - $lt{'avai'}.': '.$currdisp.''."\n". + &Apache::loncommon::start_data_table_row()."\n". + ' '.&mt('Availability determined currently from [_1] setting.',$custom_access). + '     '.$lt{'avai'}.': '. + ($curr_access?&mt('Yes'):&mt('No')).''."\n". &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". - ' '. - $lt{'chse'}.':    '. + '  --  '. + $lt{'cusa'}.':  '."\n". &Apache::loncommon::end_data_table_row()."\n"; } return $output; } -sub courserequest_titles { - my %titles = &Apache::lonlocal::texthash ( - official => 'Official', - unofficial => 'Unofficial', - community => 'Communities', - norequest => 'Not allowed', - approval => 'Approval by Dom. Coord.', - validate => 'With validation', - autolimit => 'Numerical limit', - unlimited => '(blank for unlimited)', - ); - return %titles; -} - -sub courserequest_display { - my %titles = &Apache::lonlocal::texthash ( - approval => 'Yes, need approval', - validate => 'Yes, with validation', - norequest => 'No', - ); - return %titles; -} - # =================================================================== Phase one sub print_username_entry_form { - my ($r,$context,$response,$srch,$forcenewuser,$crstype) = @_; + my ($r,$context,$response,$srch,$forcenewuser) = @_; my $defdom=$env{'request.role.domain'}; my $formtoset = 'crtuser'; if (exists($env{'form.startrolename'})) { @@ -493,20 +299,13 @@ sub print_username_entry_form { my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n". ''."\n"; - my %existingroles=&Apache::lonuserutils::my_custom_roles($crstype); - if (($env{'form.action'} eq 'custom') && (keys(%existingroles) > 0) - && (&Apache::lonnet::allowed('mcr','/'))) { - $jscript .= &customrole_javascript(); - } my %loaditems = ( 'onload' => "javascript:setFormElements(document.$formtoset)", ); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb(); my $start_page = &Apache::loncommon::start_page('User Management', $jscript,{'add_entries' => \%loaditems,}); @@ -528,112 +327,48 @@ sub print_username_entry_form { } my $crumbs = &Apache::lonhtmlcommon::breadcrumbs('User Management', $helpitem); + my %existingroles=&Apache::lonuserutils::my_custom_roles(); + my $choice=&Apache::loncommon::select_form('make new role','rolename', + ('make new role' => 'Generate new role ...',%existingroles)); my %lt=&Apache::lonlocal::texthash( 'srst' => 'Search for a user and enroll as a student', - 'srme' => 'Search for a user and enroll as a member', 'srad' => 'Search for a user and modify/add user information or roles', 'usr' => "Username", 'dom' => "Domain", - 'ecrp' => "Define or Edit Custom Role", - 'nr' => "role name", + 'ecrp' => "Edit Custom Role Privileges", + 'nr' => "Name of Role", 'cre' => "Next", ); $r->print($start_page."\n".$crumbs); if ($env{'form.action'} eq 'custom') { if (&Apache::lonnet::allowed('mcr','/')) { - my $newroletext = &mt('Define new custom role:'); - $r->print('
'. - ''. - ''. - '

'.$lt{'ecrp'}.'

'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_row(). - ''); - if (keys(%existingroles) > 0) { - $r->print('
'); - } else { - $r->print('
'.$newroletext.''); - } - $r->print(''.$lt{'nr'}.'
'. - &Apache::loncommon::end_data_table_row()); - if (keys(%existingroles) > 0) { - $r->print(&Apache::loncommon::start_data_table_row().'
'. - ''. - '
'. - ''. - ''. - &Apache::loncommon::end_data_table_row()); - } - $r->print(&Apache::loncommon::end_data_table().'

'. - '

'. - '
'); + $r->print(< + + +

$lt{'ecrp'}

+$choice $lt{'nr'}:
+ + +ENDCUSTOM } } else { my $actiontext = $lt{'srad'}; if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $actiontext = $lt{'srme'}; - } else { - $actiontext = $lt{'srst'}; - } + $actiontext = $lt{'srst'}; } - $r->print("

$actiontext

"); + $r->print(" +

$actiontext

"); if ($env{'form.origform'} ne 'crtusername') { $r->print("\n".$response); } - $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype)); + $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response)); } $r->print(&Apache::loncommon::end_page()); } -sub customrole_javascript { - my $js = <<"END"; - -END - return $js; -} - sub entry_form { - my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_; + my ($dom,$srch,$forcenewuser,$context,$responsemsg) = @_; my %domconf = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); my ($usertype,$inexact); if (ref($srch) eq 'HASH') { @@ -673,7 +408,6 @@ ENDBLOCK my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); my %lt=&Apache::lonlocal::texthash( 'enro' => 'Enroll one student', - 'enrm' => 'Enroll one member', 'admo' => 'Add/modify a single user', 'crea' => 'create new user if required', 'uskn' => "username is known", @@ -686,11 +420,7 @@ ENDBLOCK my $sellink=&Apache::loncommon::selectstudent_link('crtusername','srchterm','srchdomain'); my ($title,$buttontext,$showresponse); if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $title = $lt{'enrm'}; - } else { - $title = $lt{'enro'}; - } + $title = $lt{'enro'}; $buttontext = $lt{'enrl'}; } else { $title = $lt{'admo'}; @@ -736,7 +466,6 @@ sub user_modification_js { return < -// + END } # =================================================================== Phase two sub print_user_selection_page { - my ($r,$response,$srch,$srch_results,$srcharray,$context,$opener_elements,$crstype) = @_; + my ($r,$response,$srch,$srch_results,$srcharray,$context) = @_; my @fields = ('username','domain','lastname','firstname','permanentemail'); my $sortby = $env{'form.sortby'}; @@ -773,7 +502,6 @@ sub print_user_selection_page { my $jscript = (< -// ENDSCRIPT my %lt=&Apache::lonlocal::texthash( 'usrch' => "User Search to add/modify roles", 'stusrch' => "User Search to enroll student", - 'memsrch' => "User Search to enroll member", 'usel' => "Select a user to add/modify roles", - 'stusel' => "Select a user to enroll as a student", - 'memsel' => "Select a user to enroll as a member", + 'stusel' => "Select a user to enroll as a student", 'username' => "username", 'domain' => "domain", 'lastname' => "last name", 'firstname' => "first name", 'permanentemail' => "permanent e-mail", ); - if ($context eq 'requestcrs') { - $r->print('
'); - } else { - $r->print(&Apache::loncommon::start_page('User Management',$jscript)); + $r->print(&Apache::loncommon::start_page('User Management',$jscript)); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); - &Apache::lonhtmlcommon::add_breadcrumb - ({href=>"javascript:backPage(document.usersrchform,'','')", - text=>$breadcrumb_text{'search'}, - faq=>282,bug=>'Instructor Interface',}, - {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", - text=>$breadcrumb_text{'userpicked'}, - faq=>282,bug=>'Instructor Interface',}); - if ($env{'form.action'} eq 'singleuser') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', - 'Course_Change_Privileges')); - $r->print("$lt{'usrch'}
"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype)); - $r->print('

'.$lt{'usel'}.'

'); - } elsif ($env{'form.action'} eq 'singlestudent') { - $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', - 'Course_Add_Student')); - $r->print($jscript.""); - if ($crstype eq 'Community') { - $r->print($lt{'memsrch'}); - } else { - $r->print($lt{'stusrch'}); - } - $r->print("
"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype)); - $r->print('

'); - if ($crstype eq 'Community') { - $r->print($lt{'memsel'}); - } else { - $r->print($lt{'stusel'}); - } - $r->print('

'); - } + my %breadcrumb_text = &singleuser_breadcrumb(); + &Apache::lonhtmlcommon::add_breadcrumb + ({href=>"javascript:backPage(document.usersrchform,'','')", + text=>$breadcrumb_text{'search'}, + faq=>282,bug=>'Instructor Interface',}, + {href=>"javascript:backPage(document.usersrchform,'get_user_info','select')", + text=>$breadcrumb_text{'userpicked'}, + faq=>282,bug=>'Instructor Interface',}); + if ($env{'form.action'} eq 'singleuser') { + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', + 'Course_Change_Privileges')); + $r->print("$lt{'usrch'}
"); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); + $r->print('

'.$lt{'usel'}.'

'); + } elsif ($env{'form.action'} eq 'singlestudent') { + $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management', + 'Course_Add_Student')); + $r->print($jscript."$lt{'stusrch'}
"); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); + $r->print('

'.$lt{'stusel'}.'

'); } $r->print('
'. &Apache::loncommon::start_data_table()."\n". @@ -861,20 +570,8 @@ ENDSCRIPT foreach my $user (@sorted_users) { my ($uname,$udom) = split(/:/,$user); - my $onclick; - if ($context eq 'requestcrs') { - $onclick = - 'onclick="javascript:gochoose('."'$uname','$udom',". - "'$srch_results->{$user}->{firstname}',". - "'$srch_results->{$user}->{lastname}',". - "'$srch_results->{$user}->{permanentemail}'".');"'; - } else { - $onclick = - ' onclick="javascript:pickuser('."'".$uname."'".','."'".$udom."'".');"'; - } $r->print(&Apache::loncommon::start_data_table_row(). - ''. + ''. ''.$uname.''. ''.$udom.''); foreach my $field ('lastname','firstname','permanentemail') { @@ -894,11 +591,7 @@ ENDSCRIPT ' '."\n". ' '."\n". ' '."\n"); - if ($context eq 'requestcrs') { - $r->print($opener_elements.'
'); - } else { - $r->print($response.''.&Apache::loncommon::end_page()); - } + $r->print($response.''.&Apache::loncommon::end_page()); } sub print_user_query_page { @@ -910,11 +603,11 @@ sub print_user_query_page { } sub print_user_modification_page { - my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission,$crstype) = @_; + my ($r,$ccuname,$ccdomain,$srch,$response,$context,$permission) = @_; if (($ccuname eq '') || ($ccdomain eq '')) { my $usermsg = &mt('No username and/or domain provided.'); $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$usermsg,'','',$crstype); + &print_username_entry_form($r,$context,$usermsg); return; } my ($form,$formname); @@ -945,7 +638,7 @@ sub print_user_modification_page { ); my $response; if ($env{'form.origform'} eq 'crtusername') { - $response = ''.&mt('No match found for the username [_1] in LON-CAPA domain: [_2]',''.$ccuname.'',$ccdomain). + $response = ''.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain). '
'; } $response .= '

' @@ -955,7 +648,7 @@ sub print_user_modification_page { ,'','') .'


'; $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$response,undef,undef,$crstype); + &print_username_entry_form($r,$context,$response); return; } $newuser = 1; @@ -979,7 +672,7 @@ sub print_user_modification_page { 'username'); } $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype); + &print_username_entry_form($r,$context,$userchkmsg); return; } } @@ -1006,7 +699,7 @@ sub print_user_modification_page { } my $start_page = &Apache::loncommon::start_page('User Management',$js,$args); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage($form)", text=>$breadcrumb_text{'search'}, @@ -1038,24 +731,10 @@ sub print_user_modification_page { ENDFORMINFO - my (%inccourses,$roledom); - if ($context eq 'course') { - $inccourses{$env{'request.course.id'}}=1; - $roledom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - } elsif ($context eq 'author') { - $roledom = $env{'request.role.domain'}; - } elsif ($context eq 'domain') { - foreach my $key (keys(%env)) { - $roledom = $env{'request.role.domain'}; - if ($key=~/^user\.priv\.cm\.\/($roledom)\/($match_username)/) { - $inccourses{$1.'_'.$2}=1; - } - } - } else { - foreach my $key (keys(%env)) { - if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { - $inccourses{$1.'_'.$2}=1; - } + my %inccourses; + foreach my $key (keys(%env)) { + if ($key=~/^user\.priv\.cm\.\/($match_domain)\/($match_username)/) { + $inccourses{$1.'_'.$2}=1; } } if ($newuser) { @@ -1069,7 +748,6 @@ ENDFORMINFO my %lt=&Apache::lonlocal::texthash( 'cnu' => 'Create New User', 'ast' => 'as a student', - 'ame' => 'as a member', 'ind' => 'in domain', 'lg' => 'Login Data', 'hs' => "Home Server", @@ -1080,19 +758,13 @@ $crumbs $response $forminfo

$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain ENDTITLE if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $r->print(' ('.$lt{'ame'}.')'); - } else { - $r->print(' ('.$lt{'ast'}.')'); - } + $r->print(' ('.$lt{'ast'}.')'); } $r->print('

'."\n".'
'); my $personal_table = @@ -1110,13 +782,6 @@ $lt{'hs'}: $home_server_pick } else { $r->print($home_server_pick); } - 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(). - &build_tools_display($ccuname,$ccdomain, - 'requestcourses'). - &Apache::loncommon::end_data_table()); - } $r->print('
'."\n".'

'. $lt{'lg'}.'

'); my ($fixedauth,$varauth,$authmsg); @@ -1150,7 +815,7 @@ KERB } else { if ($authtype eq 'int') { $varauth = '
'. -&mt('[_1] Internally authenticated (with initial password [_2])','','')."'; +&mt('[_1] Internally authenticated (with initial password [_2])','','')."'; } elsif ($authtype eq 'loc') { $varauth = '
'. &mt('[_1] Local Authentication with argument [_2]','','')."\n"; @@ -1185,7 +850,6 @@ ENDAUTH my %lt=&Apache::lonlocal::texthash( 'cup' => "Modify existing user: ", 'ens' => "Enroll one student: ", - 'enm' => "Enroll one member: ", 'id' => "in domain", ); $r->print(< ENDCHANGEUSER if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $r->print($lt{'enm'}); - } else { - $r->print($lt{'ens'}); - } + $r->print($lt{'ens'}); } else { $r->print($lt{'cup'}); } @@ -1213,15 +873,10 @@ ENDCHANGEUSER $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()); - if ($env{'request.role.domain'} eq $ccdomain) { - $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); - } else { - $r->print(&coursereq_externaluser($ccuname,$ccdomain, - $env{'request.role.domain'})); - } - $r->print(&Apache::loncommon::end_data_table()); + $r->print('

'.&mt('User Can Request Creation of Courses?').'

'. + &Apache::loncommon::start_data_table(). + &build_tools_display($ccuname,$ccdomain,'requestcourses'). + &Apache::loncommon::end_data_table()); } $r->print('
'); my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname); @@ -1292,18 +947,12 @@ ENDNOTOOLSPRIV } $r->print('
'); if ($env{'form.action'} ne 'singlestudent') { - &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context, - $roledom,$crstype); + &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses); } } ## End of new user/old user logic + if ($env{'form.action'} eq 'singlestudent') { - my $btntxt; - if ($crstype eq 'Community') { - $btntxt = &mt('Enroll Member'); - } else { - $btntxt = &mt('Enroll Student'); - } - $r->print('
'."\n"); + $r->print('
'."\n"); } else { $r->print('

'.&mt('Add Roles').'

'); my $addrolesdisplay = 0; @@ -1316,14 +965,14 @@ ENDNOTOOLSPRIV $addrolesdisplay = $add_domainroles; } $r->print(&course_level_dc($env{'request.role.domain'},'Course')); - $r->print('
'."\n"); + $r->print('
'."\n"); } elsif ($context eq 'author') { if ($addrolesdisplay) { $r->print('
print(' onclick="auth_check()" \>'."\n"); + $r->print(' onClick="auth_check()" \>'."\n"); } else { - $r->print('onclick="this.form.submit()" \>'."\n"); + $r->print('onClick="this.form.submit()" \>'."\n"); } } else { $r->print('
'. @@ -1331,7 +980,7 @@ ENDNOTOOLSPRIV } } else { $r->print(&course_level_table(%inccourses)); - $r->print('
'."\n"); + $r->print('
'."\n"); } } $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain'])); @@ -1342,14 +991,9 @@ ENDNOTOOLSPRIV } sub singleuser_breadcrumb { - my ($crstype) = @_; my %breadcrumb_text; if ($env{'form.action'} eq 'singlestudent') { - if ($crstype eq 'Community') { - $breadcrumb_text{'search'} = 'Enroll a member'; - } else { - $breadcrumb_text{'search'} = 'Enroll a student'; - } + $breadcrumb_text{'search'} = 'Enroll a student'; $breadcrumb_text{'userpicked'} = 'Select a user', $breadcrumb_text{'modify'} = 'Set section/dates', } else { @@ -1404,18 +1048,18 @@ sub validation_javascript { $nondc_setsection_code,$groupslist); my ($jsback,$elements) = &crumb_utilities(); $js .= "\n". - ''."\n"; + ''; return $js; } sub display_existing_roles { - my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype) = @_; - my $now=time; - my %lt=&Apache::lonlocal::texthash( + my ($r,$ccuname,$ccdomain,$inccourses) = @_; + my %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname); + # Build up table of user roles to allow revocation and re-enabling of roles. + my ($tmp) = keys(%rolesdump); + if ($tmp !~ /^(con_lost|error)/i) { + my $now=time; + my %lt=&Apache::lonlocal::texthash( 'rer' => "Existing Roles", 'rev' => "Revoke", 'del' => "Delete", @@ -1425,261 +1069,197 @@ sub display_existing_roles { 'sta' => "Start", 'end' => "End", ); - my (%rolesdump,%roletext,%sortrole,%roleclass,%rolepriv); - if ($context eq 'course' || $context eq 'author') { - my @roles = &Apache::lonuserutils::roles_by_context($context,1,$crstype); - my %roleshash = - &Apache::lonnet::get_my_roles($ccuname,$ccdomain,'userroles', - ['active','previous','future'],\@roles,$roledom,1); - foreach my $key (keys(%roleshash)) { - my ($start,$end) = split(':',$roleshash{$key}); - next if ($start eq '-1' || $end eq '-1'); - my ($rnum,$rdom,$role,$sec) = split(':',$key); - if ($context eq 'course') { - next unless (($rnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) - && ($rdom eq $env{'course.'.$env{'request.course.id'}.'.domain'})); - } elsif ($context eq 'author') { - next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'})); - } - my ($newkey,$newvalue,$newrole); - $newkey = '/'.$rdom.'/'.$rnum; - if ($sec ne '') { - $newkey .= '/'.$sec; - } - $newvalue = $role; - if ($role =~ /^cr/) { - $newrole = 'cr'; - } else { - $newrole = $role; - } - $newkey .= '_'.$newrole; - if ($start ne '' && $end ne '') { - $newvalue .= '_'.$end.'_'.$start; - } elsif ($end ne '') { - $newvalue .= '_'.$end; - } - $rolesdump{$newkey} = $newvalue; - } - } else { - my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1}); - %rolesdump=&Apache::lonnet::dump('roles',$ccdomain,$ccuname,'.',undef,$extra); - } - # Build up table of user roles to allow revocation and re-enabling of roles. - my ($tmp) = keys(%rolesdump); - return if ($tmp =~ /^(con_lost|error)/i); - foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]); - my $b1=join('_',(split('_',$b))[1,0]); - return $a1 cmp $b1; - } keys(%rolesdump)) { - next if ($area =~ /^rolesdef/); - my $envkey=$area; - my $role = $rolesdump{$area}; - my $thisrole=$area; - $area =~ s/\_\w\w$//; - my ($role_code,$role_end_time,$role_start_time) = - split(/_/,$role); + my (%roletext,%sortrole,%roleclass,%rolepriv); + foreach my $area (sort { my $a1=join('_',(split('_',$a))[1,0]); + my $b1=join('_',(split('_',$b))[1,0]); + return $a1 cmp $b1; + } keys(%rolesdump)) { + next if ($area =~ /^rolesdef/); + my $envkey=$area; + my $role = $rolesdump{$area}; + my $thisrole=$area; + $area =~ s/\_\w\w$//; + my ($role_code,$role_end_time,$role_start_time) = + split(/_/,$role); # Is this a custom role? Get role owner and title. - my ($croleudom,$croleuname,$croletitle)= - ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); - my $allowed=0; - my $delallowed=0; - my $sortkey=$role_code; - my $class='Unknown'; - if ($area =~ m{^/($match_domain)/($match_courseid)} ) { - $class='Course'; - my ($coursedom,$coursedir) = ($1,$2); - my $cid = $1.'_'.$2; - # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3). - my %coursedata= - &Apache::lonnet::coursedescription($cid); - if ($coursedir =~ /^$match_community$/) { - $class='Community'; - } - $sortkey.="\0$coursedom"; - my $carea; - if (defined($coursedata{'description'})) { - $carea=$coursedata{'description'}. - '
'.&mt('Domain').': '.$coursedom.(' 'x8). + my ($croleudom,$croleuname,$croletitle)= + ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); + my $allowed=0; + my $delallowed=0; + my $sortkey=$role_code; + my $class='Unknown'; + if ($area =~ m{^/($match_domain)/($match_courseid)} ) { + $class='Course'; + my ($coursedom,$coursedir) = ($1,$2); + $sortkey.="\0$coursedom"; + # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3). + my %coursedata= + &Apache::lonnet::coursedescription($1.'_'.$2); + my $carea; + if (defined($coursedata{'description'})) { + $carea=$coursedata{'description'}. + '
'.&mt('Domain').': '.$coursedom.(' 'x8). &Apache::loncommon::syllabuswrapper(&mt('Syllabus'),$coursedir,$coursedom); - $sortkey.="\0".$coursedata{'description'}; - } else { - if ($class eq 'Community') { - $carea=&mt('Unavailable community').': '.$area; - $sortkey.="\0".&mt('Unavailable community').': '.$area; + $sortkey.="\0".$coursedata{'description'}; + $class=$coursedata{'type'}; } else { $carea=&mt('Unavailable course').': '.$area; $sortkey.="\0".&mt('Unavailable course').': '.$area; } - } - $sortkey.="\0$coursedir"; - $inccourses->{$cid}=1; - if ((&Apache::lonnet::allowed('c'.$role_code,$coursedom.'/'.$coursedir)) || - (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { - $allowed=1; - } - unless ($allowed) { - my $isowner = &is_courseowner($cid,$coursedata{'internal.courseowner'}); - if ($isowner) { - if (($role_code eq 'co') && ($class eq 'Community')) { - $allowed = 1; - } elsif (($role_code eq 'cc') && ($class eq 'Course')) { - $allowed = 1; - } - } - } - if ((&Apache::lonnet::allowed('dro',$coursedom)) || - (&Apache::lonnet::allowed('dro',$ccdomain))) { - $delallowed=1; - } -# - custom role. Needs more info, too - if ($croletitle) { - if (&Apache::lonnet::allowed('ccr',$coursedom.'/'.$coursedir)) { - $allowed=1; - $thisrole.='.'.$role_code; - } - } - if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { - $carea.='
Section: '.$3; - $sortkey.="\0$3"; - if (!$allowed) { - if ($env{'request.course.sec'} eq $3) { - if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { - $allowed = 1; - } - } - } - } - $area=$carea; - } else { - $sortkey.="\0".$area; - # Determine if current user is able to revoke privileges - if ($area=~m{^/($match_domain)/}) { - if ((&Apache::lonnet::allowed('c'.$role_code,$1)) || + $sortkey.="\0$coursedir"; + $inccourses->{$1.'_'.$2}=1; + if ((&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2)) || (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { $allowed=1; } - if (((&Apache::lonnet::allowed('dro',$1)) || - (&Apache::lonnet::allowed('dro',$ccdomain))) && - ($role_code ne 'dc')) { + if ((&Apache::lonnet::allowed('dro',$1)) || + (&Apache::lonnet::allowed('dro',$ccdomain))) { $delallowed=1; } - } else { - if (&Apache::lonnet::allowed('c'.$role_code,'/')) { - $allowed=1; +# - custom role. Needs more info, too + if ($croletitle) { + if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) { + $allowed=1; + $thisrole.='.'.$role_code; + } } - } - if ($role_code eq 'ca' || $role_code eq 'au') { - $class='Construction Space'; - } elsif ($role_code eq 'su') { - $class='System'; + # Compute the background color based on $area + if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { + $carea.='
Section: '.$3; + $sortkey.="\0$3"; + if (!$allowed) { + if ($env{'request.course.sec'} eq $3) { + if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { + $allowed = 1; + } + } + } + } + $area=$carea; } else { - $class='Domain'; + $sortkey.="\0".$area; + # Determine if current user is able to revoke privileges + if ($area=~m{^/($match_domain)/}) { + if ((&Apache::lonnet::allowed('c'.$role_code,$1)) || + (&Apache::lonnet::allowed('c'.$role_code,$ccdomain))) { + $allowed=1; + } + if (((&Apache::lonnet::allowed('dro',$1)) || + (&Apache::lonnet::allowed('dro',$ccdomain))) && + ($role_code ne 'dc')) { + $delallowed=1; + } + } else { + if (&Apache::lonnet::allowed('c'.$role_code,'/')) { + $allowed=1; + } + } + if ($role_code eq 'ca' || $role_code eq 'au') { + $class='Construction Space'; + } elsif ($role_code eq 'su') { + $class='System'; + } else { + $class='Domain'; + } } - } - if (($role_code eq 'ca') || ($role_code eq 'aa')) { - $area=~m{/($match_domain)/($match_username)}; - if (&Apache::lonuserutils::authorpriv($2,$1)) { - $allowed=1; - } else { - $allowed=0; + if (($role_code eq 'ca') || ($role_code eq 'aa')) { + $area=~m{/($match_domain)/($match_username)}; + if (&Apache::lonuserutils::authorpriv($2,$1)) { + $allowed=1; + } else { + $allowed=0; + } } - } - my $row = ''; - $row.= ''; - my $active=1; - $active=0 if (($role_end_time) && ($now>$role_end_time)); - if (($active) && ($allowed)) { - $row.= ''; - } else { - if ($active) { - $row.=' '; + my $row = ''; + $row.= ''; + my $active=1; + $active=0 if (($role_end_time) && ($now>$role_end_time)); + if (($active) && ($allowed)) { + $row.= ''; } else { - $row.=&mt('expired or revoked'); + if ($active) { + $row.=' '; + } else { + $row.=&mt('expired or revoked'); + } } - } - $row.=''; - if ($allowed && !$active) { - $row.= ''; - } else { - $row.=' '; - } - $row.=''; - if ($delallowed) { - $row.= ''; - } else { - $row.=' '; - } - my $plaintext=''; - if (!$croletitle) { - $plaintext=&Apache::lonnet::plaintext($role_code,$class) - } else { - $plaintext= - &mt('Customrole [_1][_2]defined by [_3]', - '"'.$croletitle.'"', - '
', - $croleuname.':'.$croleudom); - } - $row.= ''.$plaintext. - ''.$area. - ''.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) - : ' ' ). - ''.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) - : ' ' ) - .""; - $sortrole{$sortkey}=$envkey; - $roletext{$envkey}=$row; - $roleclass{$envkey}=$class; - $rolepriv{$envkey}=$allowed; - } # end of foreach (table building loop) - - my $rolesdisplay = 0; - my %output = (); - foreach my $type ('Construction Space','Course','Community','Domain','System','Unknown') { - $output{$type} = ''; - foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { - if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { - $output{$type}.= - &Apache::loncommon::start_data_table_row(). - $roletext{$sortrole{$which}}. - &Apache::loncommon::end_data_table_row(); - } - } - unless($output{$type} eq '') { - $output{$type} = ''. - "".&mt($type)."". - $output{$type}; - $rolesdisplay = 1; - } - } - if ($rolesdisplay == 1) { - my $contextrole=''; - if ($env{'request.course.id'}) { - if (&Apache::loncommon::course_type() eq 'Community') { - $contextrole = &mt('Existing Roles in this Community'); + $row.=''; + if ($allowed && !$active) { + $row.= ''; + } else { + $row.=' '; + } + $row.=''; + if ($delallowed) { + $row.= ''; + } else { + $row.=' '; + } + my $plaintext=''; + if (!$croletitle) { + $plaintext=&Apache::lonnet::plaintext($role_code,$class) + } else { + $plaintext= + "Customrole '$croletitle'
defined by $croleuname\@$croleudom"; + } + $row.= ''.$plaintext. + ''.$area. + ''.($role_start_time?localtime($role_start_time) + : ' ' ). + ''.($role_end_time ?localtime($role_end_time) + : ' ' ) + .""; + $sortrole{$sortkey}=$envkey; + $roletext{$envkey}=$row; + $roleclass{$envkey}=$class; + $rolepriv{$envkey}=$allowed; + #$r->print($row); + } # end of foreach (table building loop) + my $rolesdisplay = 0; + my %output = (); + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { + $output{$type} = ''; + foreach my $which (sort {uc($a) cmp uc($b)} (keys(%sortrole))) { + if ( ($roleclass{$sortrole{$which}} =~ /^\Q$type\E/ ) && ($rolepriv{$sortrole{$which}}) ) { + $output{$type}.= + &Apache::loncommon::start_data_table_row(). + $roletext{$sortrole{$which}}. + &Apache::loncommon::end_data_table_row(); + } + } + unless($output{$type} eq '') { + $output{$type} = ''. + "".&mt($type)."". + $output{$type}; + $rolesdisplay = 1; + } + } + if ($rolesdisplay == 1) { + my $contextrole=''; + if ($env{'request.course.id'}) { + $contextrole = 'Existing Roles in this Course'; + } elsif ($env{'request.role'} =~ /^au\./) { + $contextrole = 'Existing Co-Author Roles in your Construction Space'; } else { - $contextrole = &mt('Existing Roles in this Course'); + $contextrole = 'Existing Roles in this Domain'; } - } elsif ($env{'request.role'} =~ /^au\./) { - $contextrole = &mt('Existing Co-Author Roles in your Construction Space'); - } else { - $contextrole = &mt('Existing Roles in this Domain'); - } - $r->print(' + $r->print('

'.$lt{'rer'}.'

'. -'
'.$contextrole.'
'. +'
'.&mt($contextrole).'
'. &Apache::loncommon::start_data_table("LC_createuser"). &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 ('Construction Space','Course','Community','Domain','System','Unknown') { - if ($output{$type}) { - $r->print($output{$type}."\n"); + foreach my $type ('Construction Space','Course','Group','Domain','System','Unknown') { + if ($output{$type}) { + $r->print($output{$type}."\n"); + } } + $r->print(&Apache::loncommon::end_data_table()); } - $r->print(&Apache::loncommon::end_data_table()); - } + } # End of check for keys in rolesdump return; } @@ -1769,10 +1349,8 @@ sub new_domain_roles { &mt('Extent').''. ''.&mt('Start').''.&mt('End').''. &Apache::loncommon::end_data_table_header_row(); - my @allroles = &Apache::lonuserutils::roles_by_context('domain'); foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { - foreach my $role (@allroles) { - next if ($role eq 'ad'); + foreach my $role ('dc','li','dg','au','sc') { if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { my $plrole=&Apache::lonnet::plaintext($role); my %lt=&Apache::lonlocal::texthash( @@ -1823,9 +1401,7 @@ sub user_authentication { my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc); $outcome = < -// $lt{'err'}: $lt{'uuas'} ($currentauth). $lt{'sldb'}. @@ -1854,9 +1430,7 @@ ENDBADAUTH ); $outcome = ''."\n". '

'.$lt{'ld'}.'

'. &Apache::loncommon::start_data_table(). @@ -2069,22 +1643,9 @@ sub personal_data_display { if ($canmodify_status{'inststatus'}) { $shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types); } else { + $shown .= $userenv{'inststatus'}; if ($userenv{'inststatus'} eq '') { $hiderow = 1; - } else { - my @showitems; - foreach my $item ( map { &unescape($_); } split(':',$userenv{'inststatus'})) { - if (exists($usertypes->{$item})) { - push(@showitems,$usertypes->{$item}); - } else { - push(@showitems,$item); - } - } - if (@showitems) { - $shown = join(', ',@showitems); - } else { - $hiderow = 1; - } } } if (!$hiderow) { @@ -2180,7 +1741,7 @@ sub get_inststatuses { # ================================================================= Phase Three sub update_user_data { - my ($r,$context,$crstype) = @_; + my ($r,$context) = @_; my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); # Error messages @@ -2200,11 +1761,8 @@ sub update_user_data { my $newuser = 0; my ($jsback,$elements) = &crumb_utilities(); my $jscript = ''."\n"; - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + $jsback."\n".''."\n"; + my %breadcrumb_text = &singleuser_breadcrumb(); my $args; if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; @@ -2301,16 +1859,11 @@ sub update_user_data { $r->print('

'.&mt('User [_1] in domain [_2]', $env{'form.ccuname'}, $env{'form.ccdomain'}).'

'); - $r->print('

'.&mt('Please be patient').'

'); my (%alerts,%rulematch,%inst_results,%curr_rules); - my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); my @usertools = ('aboutme','blog','portfolio'); - my @requestcourses = ('official','unofficial','community'); + my @requestcourses = ('official','unofficial'); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); - my %canmodify_status = - &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'}, - ['inststatus']); if ($env{'form.makeuser'}) { $r->print('

'.&mt('Creating new account.').'

'); # Check for the authentication mode and password @@ -2370,52 +1923,43 @@ sub update_user_data { $r->print(&mt('Generating user').': '.$result); $uhome = &Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); - my (%changeHash,%newcustom,%changed,%changedinfo); + my (%changeHash,%newcustom,%changed); if ($uhome ne 'no_host') { - if ($context eq 'domain') { - if ($env{'form.customquota'} == 1) { - if ($env{'form.portfolioquota'} eq '') { - $newcustom{'quota'} = 0; - } else { - $newcustom{'quota'} = $env{'form.portfolioquota'}; - $newcustom{'quota'} =~ s/[^\d\.]//g; - } - $changed{'quota'} = "a_admin($newcustom{'quota'},\%changeHash); - } - foreach my $item (@usertools) { - if ($env{'form.custom'.$item} == 1) { - $newcustom{$item} = $env{'form.tools_'.$item}; - $changed{$item} = &tool_admin($item,$newcustom{$item}, - \%changeHash,'tools'); - } - } - foreach my $item (@requestcourses) { - if ($env{'form.custom'.$item} == 1) { - $newcustom{$item} = $env{'form.crsreq_'.$item}; - if ($env{'form.crsreq_'.$item} eq 'autolimit') { - $newcustom{$item} .= '='; - unless ($env{'form.crsreq_'.$item.'_limit'} =~ /\D/) { - $newcustom{$item} .= $env{'form.crsreq_'.$item.'_limit'}; - } - } - $changed{$item} = &tool_admin($item,$newcustom{$item}, - \%changeHash,'requestcourses'); - } + if ($env{'form.customquota'} == 1) { + if ($env{'form.portfolioquota'} eq '') { + $newcustom{'quota'} = 0; + } else { + $newcustom{'quota'} = $env{'form.portfolioquota'}; + $newcustom{'quota'} =~ s/[^\d\.]//g; } + $changed{'quota'} = "a_admin($newcustom{'quota'},\%changeHash); } - if ($canmodify_status{'inststatus'}) { - if (exists($env{'form.inststatus'})) { - my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); - if (@inststatuses > 0) { - $changeHash{'inststatus'} = join(',',@inststatuses); - $changed{'inststatus'} = $changeHash{'inststatus'}; - } + foreach my $item (@usertools) { + if ($env{'form.custom'.$item} == 1) { + $newcustom{$item} = $env{'form.tools_'.$item}; + $changed{$item} = &tool_admin($item,$newcustom{$item}, + \%changeHash,'tools'); + } + } + foreach my $item (@requestcourses) { + $newcustom{$item} = $env{'form.requestcourses_'.$item}; + $changed{$item} = &tool_admin($item,$newcustom{$item}, + \%changeHash,'requestcourses'); + } + if (exists($env{'form.inststatus'})) { + my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); + if (@inststatuses > 0) { + $changeHash{'inststatus'} = join(',',@inststatuses); + $changed{'inststatus'} = $changeHash{'inststatus'}; } } if (keys(%changed)) { - foreach my $item (@userinfo) { - $changeHash{$item} = $env{'form.c'.$item}; - } + $changeHash{'firstname'} = $env{'form.cfirstname'}; + $changeHash{'middlename'} = $env{'form.cmiddlename'}; + $changeHash{'lastname'} = $env{'form.clastname'}; + $changeHash{'generation'} = $env{'form.cgeneration'}; + $changeHash{'id'} = $env{'form.cid'}; + $changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; my $chgresult = &Apache::lonnet::put('environment',\%changeHash, $env{'form.ccdomain'},$env{'form.ccuname'}); @@ -2443,14 +1987,10 @@ sub update_user_data { $r->print($error.&mt('You do not have the authority to modify this users authentification information').'.'.$end); } } - - $r->rflush(); # Finish display of header before time consuming actions start - ## - my (@userroles,%userupdate,$cnum,$cdom,%namechanged); + my (@userroles,%userupdate,$cnum,$cdom,$namechanged); if ($context eq 'course') { ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); - $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum); } if (! $env{'form.makeuser'} ) { # Check for need to change @@ -2458,9 +1998,7 @@ sub update_user_data { ('environment',['firstname','middlename','lastname','generation', 'id','permanentemail','portfolioquota','inststatus','tools.aboutme', 'tools.blog','tools.portfolio','requestcourses.official', - 'requestcourses.unofficial','requestcourses.community', - 'reqcrsotherdom.official','reqcrsotherdom.unofficial', - 'reqcrsotherdom.community'], + 'requestcourses.unofficial'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -2534,9 +2072,10 @@ sub update_user_data { if ($role eq 'cr') { push(@longroles,'Custom'); } else { - push(@longroles,&Apache::lonnet::plaintext($role,$crstype)); + push(@longroles,&Apache::lonnet::plaintext($role)); } } + my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); my %canmodify = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},\@userinfo,\@userroles); foreach my $item (@userinfo) { # Strip leading and trailing whitespace @@ -2583,48 +2122,38 @@ sub update_user_data { } } my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus, - $newinststatus,$oldisdefault,$newisdefault,%oldsettings, - %oldsettingstext,%newsettings,%newsettingstext,@disporder, - $olddefquota,$oldsettingstatus,$newdefquota,$newsettingstatus); - @disporder = ('inststatus'); - if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) { - push(@disporder,'requestcourses'); - } else { - push(@disporder,'reqcrsotherdom'); - } - push(@disporder,('quota','tools')); - $oldinststatus = $userenv{'inststatus'}; - ($olddefquota,$oldsettingstatus) = - &Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus); - ($newdefquota,$newsettingstatus) = ($olddefquota,$oldsettingstatus); - my %canshow; + $inststatus,$newinststatus,$oldisdefault,$newisdefault,$olddefquotatext, + $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext, + $oldinststatuses,$newinststatuses); + my ($defquota,$settingstatus) = + &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); + my ($showquota,$showtools,$showrequestcourses,$showinststatus); if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { - $canshow{'quota'} = 1; + $showquota = 1; } if (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { - $canshow{'tools'} = 1; + $showtools = 1; } if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { - $canshow{'requestcourses'} = 1; - } elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { - $canshow{'reqcrsotherdom'} = 1; + $showrequestcourses = 1; } if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { - $canshow{'inststatus'} = 1; + $showinststatus = 1; } my (%changeHash,%changed); + $oldinststatus = $userenv{'inststatus'}; if ($oldinststatus eq '') { - $oldsettings{'inststatus'} = $othertitle; + $oldinststatuses = $othertitle; } else { if (ref($usertypes) eq 'HASH') { - $oldsettings{'inststatus'} = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'}))); + $oldinststatuses = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'}))); } else { - $oldsettings{'inststatus'} = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'}))); + $oldinststatuses = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'}))); } } $changeHash{'inststatus'} = $userenv{'inststatus'}; - if ($canmodify_status{'inststatus'}) { - $canshow{'inststatus'} = 1; + my %canmodify_inststatus = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},['inststatus'],\@userroles); + if ($canmodify_inststatus{'inststatus'}) { if (exists($env{'form.inststatus'})) { my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); if (@inststatuses > 0) { @@ -2632,88 +2161,81 @@ sub update_user_data { $changeHash{'inststatus'} = $newinststatus; if ($newinststatus ne $oldinststatus) { $changed{'inststatus'} = $newinststatus; - ($newdefquota,$newsettingstatus) = - &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus); } if (ref($usertypes) eq 'HASH') { - $newsettings{'inststatus'} = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); } else { - $newsettings{'inststatus'} = join(', ',@inststatuses); + $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + } + } else { + $newinststatus = ''; + $changeHash{'inststatus'} = $newinststatus; + $newinststatuses = $othertitle; + if ($newinststatus ne $oldinststatus) { + $changed{'inststatus'} = $changeHash{'inststatus'}; } - } - } else { - $newinststatus = ''; - $changeHash{'inststatus'} = $newinststatus; - $newsettings{'inststatus'} = $othertitle; - if ($newinststatus ne $oldinststatus) { - $changed{'inststatus'} = $changeHash{'inststatus'}; - ($newdefquota,$newsettingstatus) = - &Apache::loncommon::default_quota($env{'form.ccdomain'},$newinststatus); } } - } elsif ($context ne 'selfcreate') { - $canshow{'inststatus'} = 1; - $newsettings{'inststatus'} = $oldsettings{'inststatus'}; } $changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; - if ($context eq 'domain') { - if ($userenv{'portfolioquota'} ne '') { - $oldportfolioquota = $userenv{'portfolioquota'}; - if ($env{'form.customquota'} == 1) { - if ($env{'form.portfolioquota'} eq '') { - $newportfolioquota = 0; - } else { - $newportfolioquota = $env{'form.portfolioquota'}; - $newportfolioquota =~ s/[^\d\.]//g; - } - if ($newportfolioquota != $oldportfolioquota) { - $changed{'quota'} = "a_admin($newportfolioquota,\%changeHash); - } + if ($userenv{'portfolioquota'} ne '') { + $oldportfolioquota = $userenv{'portfolioquota'}; + if ($env{'form.customquota'} == 1) { + if ($env{'form.portfolioquota'} eq '') { + $newportfolioquota = 0; } else { - $changed{'quota'} = "a_admin('',\%changeHash); - $newportfolioquota = $newdefquota; - $newisdefault = 1; + $newportfolioquota = $env{'form.portfolioquota'}; + $newportfolioquota =~ s/[^\d\.]//g; } - } else { - $oldisdefault = 1; - $oldportfolioquota = $olddefquota; - if ($env{'form.customquota'} == 1) { - if ($env{'form.portfolioquota'} eq '') { - $newportfolioquota = 0; - } else { - $newportfolioquota = $env{'form.portfolioquota'}; - $newportfolioquota =~ s/[^\d\.]//g; - } + if ($newportfolioquota != $oldportfolioquota) { $changed{'quota'} = "a_admin($newportfolioquota,\%changeHash); - } else { - $newportfolioquota = $newdefquota; - $newisdefault = 1; } - } - if ($oldisdefault) { - $oldsettingstext{'quota'} = &get_defaultquota_text($oldsettingstatus); - } - if ($newisdefault) { - $newsettingstext{'quota'} = &get_defaultquota_text($newsettingstatus); - } - &tool_changes('tools',\@usertools,\%oldsettings,\%oldsettingstext,\%userenv, - \%changeHash,\%changed,\%newsettings,\%newsettingstext); - if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) { - &tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext, - \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); } else { - &tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext, - \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); + $changed{'quota'} = "a_admin('',\%changeHash); + $newportfolioquota = $defquota; + $newisdefault = 1; } - } - foreach my $item (@userinfo) { - if ($env{'form.c'.$item} ne $userenv{$item}) { - $namechanged{$item} = 1; + } else { + $oldisdefault = 1; + $oldportfolioquota = $defquota; + if ($env{'form.customquota'} == 1) { + if ($env{'form.portfolioquota'} eq '') { + $newportfolioquota = 0; + } else { + $newportfolioquota = $env{'form.portfolioquota'}; + $newportfolioquota =~ s/[^\d\.]//g; + } + $changed{'quota'} = "a_admin($newportfolioquota,\%changeHash); + } else { + $newportfolioquota = $defquota; + $newisdefault = 1; } } - $oldsettings{'quota'} = $oldportfolioquota.' Mb'; - $newsettings{'quota'} = $newportfolioquota.' Mb'; - if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) { + if ($oldisdefault) { + $olddefquotatext = &get_defaultquota_text($settingstatus); + } + if ($newisdefault) { + $newdefquotatext = &get_defaultquota_text($settingstatus); + } + &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv, + \%changeHash,\%changed,\%newaccess,\%newaccesstext); + &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext, + \%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext); + if ($env{'form.cfirstname'} ne $userenv{'firstname'} || + $env{'form.cmiddlename'} ne $userenv{'middlename'} || + $env{'form.clastname'} ne $userenv{'lastname'} || + $env{'form.cgeneration'} ne $userenv{'generation'} || + $env{'form.cid'} ne $userenv{'id'} || + $env{'form.cpermanentemail'} ne $userenv{'permanentemail'} ) { + $namechanged = 1; + } + if (($namechanged) || (keys(%changed) > 0)) { + $changeHash{'firstname'} = $env{'form.cfirstname'}; + $changeHash{'middlename'} = $env{'form.cmiddlename'}; + $changeHash{'lastname'} = $env{'form.clastname'}; + $changeHash{'generation'} = $env{'form.cgeneration'}; + $changeHash{'id'} = $env{'form.cid'}; + $changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; my ($chgresult,$namechgresult); if (keys(%changed) > 0) { $chgresult = @@ -2724,12 +2246,12 @@ 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')) { + if (($key eq 'official') || ($key eq 'unofficial')) { $newenvhash{'environment.requestcourses.'.$key} = $changeHash{'requestcourses.'.$key}; if ($changeHash{'requestcourses.'.$key} ne '') { - $newenvhash{'environment.canrequest.'.$key} = 1; + $newenvhash{'environment.canrequest.'.$key} = + $changeHash{'requestcourses.'.$key}; } else { $newenvhash{'environment.canrequest.'.$key} = &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, @@ -2753,17 +2275,14 @@ sub update_user_data { } } } - if (keys(%namechanged) > 0) { - foreach my $field (@userinfo) { - $changeHash{$field} = $env{'form.c'.$field}; - } -# Make the change + if ($namechanged) { + # Make the change $namechgresult = &Apache::lonnet::modifyuser($env{'form.ccdomain'}, $env{'form.ccuname'},$changeHash{'id'},undef,undef, $changeHash{'firstname'},$changeHash{'middlename'}, $changeHash{'lastname'},$changeHash{'generation'}, - $changeHash{'id'},undef,$changeHash{'permanentemail'},undef,\@userinfo); + $changeHash{'id'},undef,$changeHash{'permanentemail'}); %userupdate = ( lastname => $env{'form.clastname'}, middlename => $env{'form.cmiddlename'}, @@ -2772,14 +2291,123 @@ sub update_user_data { id => $env{'form.cid'}, ); } - if (((keys(%namechanged) > 0) && $namechgresult eq 'ok') || + if (($namechanged && $namechgresult eq 'ok') || ((keys(%changed) > 0) && $chgresult eq 'ok')) { # Tell the user we changed the name - &display_userinfo($r,1,\@disporder,\%canshow,\@requestcourses, - \@usertools,\%userenv,\%changed,\%namechanged, - \%oldsettings, \%oldsettingstext,\%newsettings, - \%newsettingstext); - + my %lt=&Apache::lonlocal::texthash( + 'uic' => 'User Information Changed', + 'frst' => 'First Name', + 'mddl' => 'Middle Name', + 'lst' => 'Last Name', + 'gen' => 'Generation', + 'id' => 'Student/Employee ID', + 'mail' => 'Permanent e-mail address', + 'disk' => 'Disk space allocated to portfolio files', + 'blog' => 'Blog Availability', + 'aboutme' => 'Personal Information Page Availability', + 'portfolio' => 'Portfolio Availability', + 'official' => 'Can Request Official Courses', + 'unofficial' => 'Can Request Unofficial Courses', + 'inststatus' => "Affiliation", + 'prvs' => 'Previous Value:', + 'chto' => 'Changed To:' + ); + $r->print('

'.$lt{'uic'}.'

'. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row()); + $r->print(<<"END"); +   + $lt{'frst'} + $lt{'mddl'} + $lt{'lst'} + $lt{'gen'} + $lt{'id'} + $lt{'mail'} +END + if ($showinststatus) { + $r->print(" + $lt{'inststatus'}\n"); + } + if ($showrequestcourses) { + foreach my $item (@requestcourses) { + $r->print(" + $lt{$item}\n"); + } + } + if ($showquota) { + $r->print(" + $lt{'disk'}\n"); + } + if ($showtools) { + foreach my $item (@usertools) { + $r->print(" + $lt{$item}\n"); + } + } + $r->print(&Apache::loncommon::end_data_table_header_row(). + &Apache::loncommon::start_data_table_row()); + $r->print(<<"END"); + $lt{'prvs'} + $userenv{'firstname'} + $userenv{'middlename'} + $userenv{'lastname'} + $userenv{'generation'} + $userenv{'id'} + $userenv{'permanentemail'} +END + if ($showinststatus) { + $r->print(" + $oldinststatuses\n"); + } + if ($showrequestcourses) { + foreach my $item (@requestcourses) { + $r->print(" + $oldaccess{$item} $oldaccesstext{$item}\n"); + } + } + if ($showquota) { + $r->print(" + $oldportfolioquota Mb $olddefquotatext \n"); + } + if ($showtools) { + foreach my $item (@usertools) { + $r->print(" + $oldaccess{$item} $oldaccesstext{$item} \n"); + } + } + $r->print(&Apache::loncommon::end_data_table_row(). + &Apache::loncommon::start_data_table_row()); + $r->print(<<"END"); + $lt{'chto'} + $env{'form.cfirstname'} + $env{'form.cmiddlename'} + $env{'form.clastname'} + $env{'form.cgeneration'} + $env{'form.cid'} + $env{'form.cpermanentemail'} +END + if ($showinststatus) { + $r->print(" + $newinststatuses\n"); + } + if ($showrequestcourses) { + foreach my $item (@requestcourses) { + $r->print(" + $newaccess{$item} $newaccesstext{$item} \n"); + } + } + if ($showquota) { + $r->print(" + $newportfolioquota Mb $newdefquotatext \n"); + } + if ($showtools) { + foreach my $item (@usertools) { + $r->print(" + $newaccess{$item} $newaccesstext{$item} \n"); + } + } + $r->print(&Apache::loncommon::end_data_table_row(). + &Apache::loncommon::end_data_table().'
'); if ($env{'form.cid'} ne $userenv{'id'}) { &Apache::lonnet::idput($env{'form.ccdomain'}, ($env{'form.ccuname'} => $env{'form.cid'})); @@ -2805,13 +2433,48 @@ sub update_user_data { $env{'form.ccuname'}.' '.&mt('in domain').' '. $env{'form.ccdomain'}.'
'); } - } else { # End of if ($env ... ) logic + } else { # End of if ($env ... ) logic # They did not want to change the users name, quota, tool availability, # or ability to request creation of courses, # but we can still tell them what the name and quota and availabilities are - &display_userinfo($r,undef,\@disporder,\%canshow,\@requestcourses, - \@usertools,\%userenv,\%changed,\%namechanged,\%oldsettings, - \%oldsettingstext,\%newsettings,\%newsettingstext); + my %lt=&Apache::lonlocal::texthash( + 'id' => "Student/Employee ID", + 'mail' => "Permanent e-mail address", + 'disk' => "Disk space allocated to user's portfolio files", + 'blog' => "Blog Availability", + 'aboutme' => "Personal Information Page Availability", + 'portfolio' => "Portfolio Availability", + 'official' => "Can Request Official Courses", + 'unofficial' => "Can Request Unofficial Course", + 'inststatus' => "Affiliation", + ); + $r->print(<<"END"); +

$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} +END + if ($userenv{'permanentemail'} ne '') { + $r->print('
['.$lt{'mail'}.': '. + $userenv{'permanentemail'}.']'); + } + if ($showinststatus) { + $r->print('
['.$lt{'inststatus'}.': '.$oldinststatuses.']'); + } + if ($showrequestcourses) { + foreach my $item (@requestcourses) { + $r->print('
['.$lt{$item}.': '.$newaccess{$item}.' '. + $newaccesstext{$item}.']'."\n"); + } + } + if ($showtools) { + foreach my $item (@usertools) { + $r->print('
['.$lt{$item}.': '.$newaccess{$item}.' '. + $newaccesstext{$item}.']'."\n"); + } + } + if ($showquota) { + $r->print('
['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '. + $olddefquotatext.']'); + } + $r->print('

'); } if (@mod_disallowed) { my ($rolestr,$contextname); @@ -2848,17 +2511,12 @@ sub update_user_data { .''); } if ($env{'form.action'} eq 'singlestudent') { - &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype); - $r->print('

'); - if ($crstype eq 'Community') { - $r->print(&mt('Enroll Another Member')); - } else { - $r->print(&mt('Enroll Another Student')); - } - $r->print('

'); + &enroll_single_student($r,$uhome,$amode,$genpwd,$now,$newuser,$context); + $r->print('

'. + &mt('Enroll Another Student').'

'); } else { my @rolechanges = &update_roles($r,$context); - if (keys(%namechanged) > 0) { + if ($namechanged) { if ($context eq 'course') { if (@userroles > 0) { if ((@rolechanges == 0) || @@ -2887,136 +2545,6 @@ sub update_user_data { $r->print(&Apache::loncommon::end_page()); } -sub display_userinfo { - my ($r,$changed,$order,$canshow,$requestcourses,$usertools,$userenv, - $changedhash,$namechangedhash,$oldsetting,$oldsettingtext, - $newsetting,$newsettingtext) = @_; - return unless (ref($order) eq 'ARRAY' && - ref($canshow) eq 'HASH' && - ref($requestcourses) eq 'ARRAY' && - ref($usertools) eq 'ARRAY' && - ref($userenv) eq 'HASH' && - ref($changedhash) eq 'HASH' && - ref($oldsetting) eq 'HASH' && - ref($oldsettingtext) eq 'HASH' && - ref($newsetting) eq 'HASH' && - ref($newsettingtext) eq 'HASH'); - my %lt=&Apache::lonlocal::texthash( - 'ui' => 'User Information (unchanged)', - 'uic' => 'User Information Changed', - 'firstname' => 'First Name', - 'middlename' => 'Middle Name', - 'lastname' => 'Last Name', - 'generation' => 'Generation', - 'id' => 'Student/Employee ID', - 'permanentemail' => 'Permanent e-mail address', - 'quota' => 'Disk space allocated to portfolio files', - 'blog' => 'Blog Availability', - 'aboutme' => 'Personal Information Page Availability', - 'portfolio' => 'Portfolio Availability', - 'official' => 'Can Request Official Courses', - 'unofficial' => 'Can Request Unofficial Courses', - 'community' => 'Can Request Communities', - 'inststatus' => "Affiliation", - 'prvs' => 'Previous Value:', - 'chto' => 'Changed To:' - ); - my $title = $lt{'ui'}; - if ($changed) { - $title = $lt{'uic'}; - } - $r->print('

'.$title.'

'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row()); - if ($changed) { - $r->print(" \n"); - } - my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); - foreach my $item (@userinfo) { - $r->print("$lt{$item}\n"); - } - foreach my $entry (@{$order}) { - if ($canshow->{$entry}) { - if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { - foreach my $item (@{$requestcourses}) { - $r->print("$lt{$item}\n"); - } - } elsif ($entry eq 'tools') { - foreach my $item (@{$usertools}) { - $r->print("$lt{$item}\n"); - } - } else { - $r->print("$lt{$entry}\n"); - } - } - } - $r->print(&Apache::loncommon::end_data_table_header_row(). - &Apache::loncommon::start_data_table_row()); - if ($changed) { - $r->print(''.$lt{'prvs'}.''."\n"); - } - foreach my $item (@userinfo) { - $r->print(''.$userenv->{$item}.' '."\n"); - } - foreach my $entry (@{$order}) { - if ($canshow->{$entry}) { - if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { - foreach my $item (@{$requestcourses}) { - $r->print("$oldsetting->{$item} $oldsettingtext->{$item}\n"); - } - } elsif ($entry eq 'tools') { - foreach my $item (@{$usertools}) { - $r->print("$oldsetting->{$item} $oldsettingtext->{$item}\n"); - } - } else { - $r->print("$oldsetting->{$entry} $oldsettingtext->{$entry} \n"); - } - } - } - $r->print(&Apache::loncommon::end_data_table_row()); - if ($changed) { - $r->print(&Apache::loncommon::start_data_table_row(). - ''.$lt{'chto'}.''."\n"); - foreach my $item (@userinfo) { - my $value = $env{'form.c'.$item}; - if ($namechangedhash->{$item}) { - $value = ''.$value.''; - } - $r->print("$value \n"); - } - foreach my $entry (@{$order}) { - if ($canshow->{$entry}) { - if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom')) { - foreach my $item (@{$requestcourses}) { - my $value = $newsetting->{$item}.' '.$newsettingtext->{$item}; - if ($changedhash->{$item}) { - $value = ''.$value.''; - } - $r->print("$value \n"); - } - } elsif ($entry eq 'tools') { - foreach my $item (@{$usertools}) { - my $value = $newsetting->{$item}.' '.$newsettingtext->{$item}; - if ($changedhash->{$item}) { - $value = ''.$value.''; - } - $r->print("$value \n"); - } - } else { - my $value = $newsetting->{$entry}.' '.$newsettingtext->{$entry}; - if ($changedhash->{$entry}) { - $value = ''.$value.''; - } - $r->print("$value \n"); - } - } - } - $r->print(&Apache::loncommon::end_data_table_row()); - } - $r->print(&Apache::loncommon::end_data_table().'
'); - return; -} - sub tool_changes { my ($context,$usertools,$oldaccess,$oldaccesstext,$userenv,$changeHash, $changed,$newaccess,$newaccesstext) = @_; @@ -3026,101 +2554,7 @@ sub tool_changes { (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) { return; } - if ($context eq 'reqcrsotherdom') { - my @options = ('approval','validate','autolimit'); - my $optregex = join('|',@options); - my %reqdisplay = &courserequest_display(); - my $cdom = $env{'request.role.domain'}; - foreach my $tool (@{$usertools}) { - $oldaccesstext->{$tool} = &mt('No'); - $newaccesstext->{$tool} = $oldaccesstext->{$tool}; - $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; - my $newop; - if ($env{'form.'.$context.'_'.$tool}) { - $newop = $env{'form.'.$context.'_'.$tool}; - if ($newop eq 'autolimit') { - my $limit = $env{'form.'.$context.'_'.$tool.'_limit'}; - $limit =~ s/\D+//g; - $newop .= '='.$limit; - } - } - if ($userenv->{$context.'.'.$tool} eq '') { - if ($newop) { - $changed->{$tool}=&tool_admin($tool,$cdom.':'.$newop, - $changeHash,$context); - if ($changed->{$tool}) { - $newaccesstext->{$tool} = &mt('Yes'); - } else { - $newaccesstext->{$tool} = $oldaccesstext->{$tool}; - } - } - } else { - my @curr = split(',',$userenv->{$context.'.'.$tool}); - my @new; - my $changedoms; - foreach my $req (@curr) { - if ($req =~ /^\Q$cdom\E\:($optregex\=?\d*)$/) { - $oldaccesstext->{$tool} = &mt('Yes'); - my $oldop = $1; - if ($oldop ne $newop) { - $changedoms = 1; - foreach my $item (@curr) { - my ($reqdom,$option) = split(':',$item); - unless ($reqdom eq $cdom) { - push(@new,$item); - } - } - if ($newop) { - push(@new,$cdom.':'.$newop); - } - @new = sort(@new); - } - last; - } - } - if ((!$changedoms) && ($newop)) { - $changedoms = 1; - @new = sort(@curr,$cdom.':'.$newop); - } - if ($changedoms) { - my $newdomstr; - if (@new) { - $newdomstr = join(',',@new); - } - $changed->{$tool}=&tool_admin($tool,$newdomstr,$changeHash, - $context); - if ($changed->{$tool}) { - if ($env{'form.'.$context.'_'.$tool}) { - if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') { - my $limit = $env{'form.'.$context.'_'.$tool.'_limit'}; - $limit =~ s/\D+//g; - if ($limit) { - $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user.',$limit); - } else { - $newaccesstext->{$tool} = &mt('Yes, processed automatically'); - } - } else { - $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}}; - } - } else { - $newaccesstext->{$tool} = &mt('No'); - } - } - } - } - } - return; - } foreach my $tool (@{$usertools}) { - my $newval; - if ($context eq 'requestcourses') { - $newval = $env{'form.crsreq_'.$tool}; - if ($newval eq 'autolimit') { - $newval .= '='.$env{'form.crsreq_'.$tool.'_limit'}; - } - } else { - $newval = $env{'form.'.$context.'_'.$tool}; - } if ($userenv->{$context.'.'.$tool} ne '') { $oldaccess->{$tool} = &mt('custom'); if ($userenv->{$context.'.'.$tool}) { @@ -3130,12 +2564,12 @@ sub tool_changes { } $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; if ($env{'form.custom'.$tool} == 1) { - if ($newval ne $userenv->{$context.'.'.$tool}) { - $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, - $context); + if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) { + $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, + $changeHash,$context); if ($changed->{$tool}) { $newaccess->{$tool} = &mt('custom'); - if ($newval) { + if ($env{'form.'.$context.'_'.$tool}) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); @@ -3159,20 +2593,20 @@ sub tool_changes { } else { $newaccess->{$tool} = $oldaccess->{$tool}; if ($userenv->{$context.'.'.$tool}) { - $newaccesstext->{$tool} = &mt("availability set to 'on'"); + $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { - $newaccesstext->{$tool} = &mt("availability set to 'off'"); + $newaccesstext->{$tool} = &mt("availability set to 'off'"); } } } } else { $oldaccess->{$tool} = &mt('default'); if ($env{'form.custom'.$tool} == 1) { - $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, - $context); + $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, + $changeHash,$context); if ($changed->{$tool}) { $newaccess->{$tool} = &mt('custom'); - if ($newval) { + if ($env{'form.'.$context.'_'.$tool}) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); @@ -3454,14 +2888,8 @@ sub update_roles { } sub enroll_single_student { - my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context,$crstype) = @_; - $r->print('

'); - if ($crstype eq 'Community') { - $r->print(&mt('Enrolling Member')); - } else { - $r->print(&mt('Enrolling Student')); - } - $r->print('

'); + my ($r,$uhome,$amode,$genpwd,$now,$newuser,$context) = @_; + $r->print('

'.&mt('Enrolling Student').'

'); # Remove non alphanumeric values from section $env{'form.sections'}=~s/\W//g; @@ -3494,13 +2922,7 @@ sub enroll_single_student { } $r->print('.
'.$showstart.'; '.$showend); if ($startdate <= $now && !$newuser) { - $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 { - $r->print(&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')); - } - $r->print('

'); + $r->print("

".&mt('If the student is currently logged-in to LON-CAPA, the new role will be available when the student next logs in.')."

"); } } else { $r->print(&mt('unable to enroll').": ".$enroll_result); @@ -3570,10 +2992,6 @@ sub tool_admin { if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { $canchange = 1; } - } elsif ($context eq 'reqcrsotherdom') { - if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { - $canchange = 1; - } } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { # Current user has quota modification privileges $canchange = 1; @@ -3625,27 +3043,18 @@ sub build_roles { sub custom_role_editor { my ($r) = @_; - my $action = $env{'form.customroleaction'}; - my $rolename; - if ($action eq 'new') { - $rolename=$env{'form.newrolename'}; - } else { - $rolename=$env{'form.rolename'}; + my $rolename=$env{'form.rolename'}; + + if ($rolename eq 'make new role') { + $rolename=$env{'form.newrolename'}; } $rolename=~s/[^A-Za-z0-9]//gs; + if (!$rolename || $env{'form.phase'} eq 'pickrole') { &print_username_entry_form($r); return; } - my ($crstype,$context); - if ($env{'request.course.id'}) { - $crstype = &Apache::loncommon::course_type(); - $context = 'course'; - } else { - $context = 'domain'; - $crstype = $env{'form.templatecrstype'}; - } # ------------------------------------------------------- What can be assigned? my %full=(); my %courselevel=(); @@ -3654,6 +3063,7 @@ sub custom_role_editor { my $dompriv=''; my $coursepriv=''; my $body_top; + my ($disp_dummy,$disp_roles) = &Apache::lonnet::get('roles',["st"]); my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); # ------------------------------------------------------- Does this role exist? @@ -3662,9 +3072,6 @@ sub custom_role_editor { $body_top .= &mt('Existing Role').' "'; # ------------------------------------------------- Get current role privileges ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); - if ($crstype eq 'Community') { - $syspriv =~ s/bre\&S//; - } } else { $body_top .= &mt('New Role').' "'; $roledef=''; @@ -3704,56 +3111,15 @@ sub custom_role_editor { my ($jsback,$elements) = &crumb_utilities(); my $button_code = "\n"; my $head_script = "\n"; - $head_script .= ''."\n"; + $head_script .= "\n".$jsback."\n".''."\n"; $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script)); - &Apache::lonhtmlcommon::add_breadcrumb + &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.form1,'pickrole','')", text=>"Pick custom role", faq=>282,bug=>'Instructor Interface',}, @@ -3770,21 +3136,13 @@ sub custom_role_editor { 'dml' => "Domain Level", 'ssl' => "System Level"); - $r->print('
' + $r->print('
' .'
' .''.&mt('Select a Template').'' .$button_code - .'
'); - if ($context_code) { - $r->print('
' - .'
' - .''.&mt('Context').'' - .$context_code - .'' - .'
' - ); - } - $r->print('
'); + .'' + .'
' + ); $r->print(< @@ -3796,8 +3154,8 @@ ENDCCF ''.$lt{'prv'}.''.$lt{'crl'}.''.$lt{'dml'}. ''.$lt{'ssl'}.''. &Apache::loncommon::end_data_table_header_row()); - foreach my $priv (sort(keys(%full))) { - my $privtext = &Apache::lonnet::plaintext($priv,$crstype); + foreach my $priv (sort keys %full) { + my $privtext = &Apache::lonnet::plaintext($priv); $r->print(&Apache::loncommon::start_data_table_row(). ''.$privtext.''. ($courselevel{$priv}?''. ($domainlevel{$priv}?'':' '). - ''); - if ($priv eq 'bre' && $crstype eq 'Community') { - $r->print(' '); - } else { - $r->print($systemlevel{$priv}?'':' '); - } - $r->print(''. - &Apache::loncommon::end_data_table_row()); + ''. + ($systemlevel{$priv}?'':' '). + ''. + &Apache::loncommon::end_data_table_row()); } $r->print(&Apache::loncommon::end_data_table(). ''. @@ -3825,7 +3179,7 @@ ENDCCF } # -------------------------------------------------------- sub make_script_template { - my ($role,$crstype) = @_; + my ($role) = @_; my %full_c=(); my %full_d=(); my %full_s=(); @@ -3839,7 +3193,6 @@ sub make_script_template { $full_d{$priv}=1; } foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { - next if (($crstype eq 'Community') && ($item eq 'bre&S')); my ($priv,$restrict)=split(/\&/,$item); $full_s{$priv}=1; } @@ -3892,9 +3245,9 @@ sub make_script_template { } # ---------------------------------------------------------- sub make_button_code { - my ($role,$crstype) = @_; - my $label = &Apache::lonnet::plaintext($role,$crstype); - my $button_code = ''; + my ($role) = @_; + my $label = &Apache::lonnet::plaintext($role); + my $button_code = ''; return ($button_code); } # ---------------------------------------------------------- Call to definerole @@ -3907,11 +3260,7 @@ sub set_custom_role { return; } my ($jsback,$elements) = &crumb_utilities(); - my $jscript = ''; + my $jscript = ''; $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript); &Apache::lonhtmlcommon::add_breadcrumb @@ -3993,10 +3342,9 @@ sub handler { $r->send_http_header; return OK; } - my ($context,$crstype); + my $context; if ($env{'request.course.id'}) { $context = 'course'; - $crstype = &Apache::loncommon::course_type(); } elsif ($env{'request.role'} =~ /^au\./) { $context = 'author'; } else { @@ -4015,7 +3363,7 @@ sub handler { #SD Following files not added to help, because the corresponding .tex-files seem to #be missing: Course_Approve_Selfenroll,Course_User_Logs, my ($permission,$allowed) = - &Apache::lonuserutils::get_permission($context,$crstype); + &Apache::lonuserutils::get_permission($context); if (!$allowed) { $env{'user.error.msg'}= "/adm/createuser:cst:0:0:Cannot create/modify user data ". @@ -4030,7 +3378,7 @@ sub handler { if (! exists($env{'form.action'})) { $r->print(&header()); $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); - $r->print(&print_main_menu($permission,$context,$crstype)); + $r->print(&print_main_menu($permission,$context)); $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) { $r->print(&header()); @@ -4046,7 +3394,7 @@ sub handler { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } elsif ($env{'form.state'} eq 'got_file') { &Apache::lonuserutils::print_upload_manager_form($r,$context, - $permission,$crstype); + $permission); } elsif ($env{'form.state'} eq 'enrolling') { if ($env{'form.datatoken'}) { &Apache::lonuserutils::upfile_drop_add($r,$context,$permission); @@ -4071,13 +3419,13 @@ sub handler { if ($env{'form.srchterm'} !~ /^$match_username$/) { 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,undef,$crstype); + &print_username_entry_form($r,$context,$response,$srch); } else { my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'}); my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'}); &print_user_modification_page($r,$ccuname,$ccdomain, $srch,$response,$context, - $permission,$crstype); + $permission); } } elsif ($env{'form.phase'} eq 'get_user_info') { my ($currstate,$response,$forcenewuser,$results) = @@ -4087,7 +3435,7 @@ sub handler { } if ($currstate eq 'select') { &print_user_selection_page($r,$response,$srch,$results, - \@search,$context,undef,$crstype); + \@search,$context); } elsif ($currstate eq 'modify') { my ($ccuname,$ccdomain); if (($srch->{'srchby'} eq 'uname') && @@ -4105,24 +3453,24 @@ sub handler { } &print_user_modification_page($r,$ccuname,$ccdomain, $srch,$response,$context, - $permission,$crstype); + $permission); } elsif ($currstate eq 'query') { &print_user_query_page($r,'createuser'); } else { $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response,$srch, - $forcenewuser,$crstype); + $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,'', - $context,$permission,$crstype); + $context,$permission); } } elsif ($env{'form.phase'} eq 'update_user_data') { - &update_user_data($r,$context,$crstype); + &update_user_data($r,$context); } else { - &print_username_entry_form($r,$context,undef,$srch,undef,$crstype); + &print_username_entry_form($r,$context,undef,$srch); } } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) { if ($env{'form.phase'} eq 'set_custom_roles') { @@ -4144,7 +3492,7 @@ sub handler { $r->print(&Apache::lonhtmlcommon::breadcrumbs("Update Users", 'Course_View_Class_List')); if ($permission->{'cusr'}) { - &Apache::lonuserutils::update_user_list($r,$context,$setting,$choice,$crstype); + &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')); @@ -4157,22 +3505,10 @@ sub handler { text=>"List Users"}); my ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles); my $formname = 'studentform'; - if (($context eq 'domain') && (($env{'form.roletype'} eq 'course') || - ($env{'form.roletype'} eq 'community'))) { - if ($env{'form.roletype'} eq 'course') { - ($cb_jscript,$jscript,$totcodes,$codetitles,$idlist,$idlist_titles) = - &Apache::lonuserutils::courses_selector($env{'request.role.domain'}, - $formname); - } elsif ($env{'form.roletype'} eq 'community') { - $cb_jscript = - &Apache::loncommon::coursebrowser_javascript($env{'request.role.domain'}); - my %elements = ( - coursepick => 'radio', - coursetotal => 'text', - courselist => 'text', - ); - $jscript = &Apache::lonhtmlcommon::set_form_elements(\%elements); - } + 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); $jscript .= &verify_user_display(); my $js = &add_script($jscript).$cb_jscript; my $loadcode = @@ -4193,25 +3529,19 @@ sub handler { } } elsif ($env{'form.action'} eq 'drop' && $permission->{'cusr'}) { $r->print(&header()); - my $brtext; - if ($crstype eq 'Community') { - $brtext = 'Drop Members'; - } else { - $brtext = 'Drop Students'; - } &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/createuser?action=drop', - text=>$brtext}); + text=>"Drop Students"}); if (!exists($env{'form.state'})) { - $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext, + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students', 'Course_Drop_Student')); - &Apache::lonuserutils::print_drop_menu($r,$context,$permission,$crstype); + &Apache::lonuserutils::print_drop_menu($r,$context,$permission); } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/createuser?action=drop', text=>"Result"}); - $r->print(&Apache::lonhtmlcommon::breadcrumbs($brtext, + $r->print(&Apache::lonhtmlcommon::breadcrumbs('Drop Students', 'Course_Drop_Student')); &Apache::lonuserutils::update_user_list($r,$context,undef, $env{'form.action'}); @@ -4221,7 +3551,7 @@ sub handler { if ($permission->{'cusr'}) { $r->print(&header(undef,undef,{'no_nav_bar' => 1}). &Apache::lonuserutils::date_section_selector($context, - $permission,$crstype). + $permission). &Apache::loncommon::end_page()); } else { $r->print(&header(). @@ -4256,14 +3586,11 @@ sub handler { 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(&Apache::lonhtmlcommon::breadcrumbs('Enrollment requests', 'Course_SelfEnrollment_Approval')); $r->print('

'.&mt('Pending enrollment requests').'

'."\n"); - $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context, - $cdom,$cnum)); - + &display_selfenroll_queue($r,$context,$permission,$cnum,$cdom); } elsif ($env{'form.state'} eq 'done') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>'/adm/createuser?action=selfenrollqueue', @@ -4271,8 +3598,7 @@ sub handler { $r->print(&Apache::lonhtmlcommon::breadcrumbs('Enrollment result', 'Course_Self_Enrollment')); $r->print('

'.&mt('Enrollment request processing').'

'."\n"); - $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, - $cdom,$cnum,$coursedesc)); + &update_selfenroll_queue($r,$context,$permission,$cid,$cnum,$cdom); } $r->print(&Apache::loncommon::end_page()); } elsif ($env{'form.action'} eq 'changelogs') { @@ -4287,7 +3613,7 @@ sub handler { } else { $r->print(&header()); $r->print(&Apache::lonhtmlcommon::breadcrumbs('User Management')); - $r->print(&print_main_menu($permission,$context,$crstype)); + $r->print(&print_main_menu($permission,$context)); $r->print(&Apache::loncommon::end_page()); } return OK; @@ -4306,11 +3632,7 @@ sub header { sub add_script { my ($js) = @_; - return ''."\n"; + return ''; } sub verify_user_display { @@ -4331,137 +3653,150 @@ END ############################################################### # Menu Phase One sub print_main_menu { - my ($permission,$context,$crstype) = @_; - my $linkcontext = $context; - my $stuterm = lc(&Apache::lonnet::plaintext('st',$crstype)); - if (($context eq 'course') && ($crstype eq 'Community')) { - $linkcontext = lc($crstype); - $stuterm = 'Members'; - } - + my ($permission,$context) = @_; my %links = ( domain => { upload => 'Upload a File of Users', - singleuser => 'Add/Modify a User', - listusers => 'Manage Users', + singleuser => 'Add/Modify a Single User', + listusers => 'Manage Multiple Users', }, author => { upload => 'Upload a File of Co-authors', - singleuser => 'Add/Modify a Co-author', - listusers => 'Manage Co-authors', + singleuser => 'Add/Modify a Single Co-author', + listusers => 'Display Co-authors and Manage Multiple Users', }, course => { - upload => 'Upload a File of Course Users', - singleuser => 'Add/Modify a Course User', - listusers => 'Display Class Lists and Manage Multiple Users', + upload => 'File of Course Users', + singleuser => 'Single Course User', + listusers => 'Course User Lists', }, - community => { - upload => 'Upload a File of Community Users', - singleuser => 'Add/Modify a Community User', - listusers => 'Manage Community Users', - }, - ); - my @menu = - ( - { text => $links{$context}{'upload'}, - help => 'Course_Create_Class_List', - action => 'upload', - permission => $permission->{'cusr'}, - }, - { text => $links{$context}{'singleuser'}, - help => 'Course_Change_Privileges', - action => 'singleuser', - permission => $permission->{'cusr'}, - }, - { text => $links{$context}{'listusers'}, - help => 'Course_View_Class_List', - action => 'listusers', - permission => ($permission->{'view'} || $permission->{'cusr'}), - }, - ); - if ($context eq 'domain' || $context eq 'course') { - my $customlink = { text => 'Edit Custom Roles', - help => 'Course_Editing_Custom_Roles', - action => 'custom', - permission => $permission->{'custom'}, - }; - push(@menu,$customlink); - } - if ($context eq 'course') { - my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); - my @courselinks = - ( - { text => 'Enroll a Single Student', - help => 'Course_Add_Student', - action => 'singlestudent', - permission => $permission->{'cusr'}, - }, - { text => 'Drop Students', - help => 'Course_Drop_Student', - action => 'drop', - permission => $permission->{'cusr'}, - }); - if (!exists($permission->{'cusr_section'})) { - if ($crstype ne 'Community') { - push(@courselinks, - { text => 'Automated Enrollment Manager', - help => 'Course_Automated_Enrollment', - permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && $permission->{'cusr'}), - url => '/adm/populate', - }); - } - push(@courselinks, - { text => 'Configure User Self-enrollment', - help => 'Course_Self_Enrollment', - action => 'selfenroll', - permission => $permission->{'cusr'}, - }); - } + ); + my @menu = ( {categorytitle => 'Add Users', + items => + [{ + linktext => $links{$context}{'upload'}, + icon => 'sctr.png', + #help => 'Course_Create_Class_List', + url => '/adm/createuser?action=upload', + permission => $permission->{'cusr'}, + linktitle => 'Upload a CSV or a text file containing users.', + }, + { + linktext => $links{$context}{'singleuser'}, + icon => 'edit-redo.png', + #help => 'Course_Change_Privileges', + url => '/adm/createuser?action=singleuser', + permission => $permission->{'cusr'}, + linktitle => 'Add a user with a certain role to this course.', + }]}, + {categorytitle => 'Administration', + items => + [{ + linktext => $links{$context}{'listusers'}, + icon => 'edit-find.png', + #help => 'Course_View_Class_List', + url => '/adm/createuser?action=listusers', + permission => ($permission->{'view'} || $permission->{'cusr'}), + linktitle => 'Show and manage users of this course.', + }]}, + {categorytitle => 'Configuration', + items => + [ + ]}, + ); + + if ($context eq 'domain'){ + + push(@{ $menu[1]->{items} }, + { linktext => 'Custom Roles', + icon => 'emblem-photos.png', + #help => 'Course_Editing_Custom_Roles', + url => '/adm/createuser?action=custom', + permission => $permission->{'custom'}, + linktitle => 'Configure a custom role.', + }); + + }elsif ($context eq 'course'){ + my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); + + push(@{ $menu[0]->{items} }, + { linktext => 'Single Student', + #help => 'Course_Add_Student', + icon => 'list-add.png', + url => '/adm/createuser?action=singlestudent', + permission => $permission->{'cusr'}, + linktitle => 'Add a user with the role student to this course.', + }); + + push(@{ $menu[1]->{items} }, + { linktext => 'Drop Students', + icon => 'edit-undo.png', + #help => 'Course_Drop_Student', + url => '/adm/createuser?action=drop', + permission => $permission->{'cusr'}, + linktitle =>'Remove a student from this course.', + }, + { linktext => 'Custom Roles', + icon => 'emblem-photos.png', + #help => 'Course_Editing_Custom_Roles', + url => '/adm/createuser?action=custom', + permission => $permission->{'custom'}, + linktitle => 'Configure a custom role.', + }); if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) { - push(@courselinks, - { text => 'Enrollment Requests', - help => 'Course_Approve_Selfenroll', - action => 'selfenrollqueue', + push(@{ $menu[1]->{items} }, + { linktext => 'Enrollment Requests', + icon => 'selfenrl-queue.png', + #help => 'Course_Approve_Selfenroll', + url => '/adm/createuser?action=selfenrollqueue', permission => $permission->{'cusr'}, - }); + linktitle =>'Approve or reject enrollment requests.', + }); } - push(@courselinks, - { text => 'Manage Course Groups', - help => 'Course_Manage_Group', - permission => $permission->{'grp_manage'}, - url => '/adm/coursegroups?refpage=cusr', - }, - { text => 'View Change Logs', - help => 'Course_User_Logs', - action => 'changelogs', - permission => $permission->{'cusr'}, - },); + + if (!exists($permission->{'cusr_section'})){ + + push(@{ $menu[2]->{items} }, + { linktext => 'Automated Enrollment', + icon => 'roles.png', + #help => 'Course_Automated_Enrollment', + permission => (&Apache::lonnet::auto_run($cnum,$cdom) + && $permission->{'cusr'}), + url => '/adm/populate', + linktitle => 'Automated enrollment manager.', + }, + { linktext => 'User Self-Enrollment', + icon => 'cstr.png', + #help => 'Course_Self_Enrollment', + url => '/adm/createuser?action=selfenroll', + permission => $permission->{'cusr'}, + linktitle => 'Configure user self enrollment.', + }); + + } + + push(@{ $menu[2]->{items} }, + { linktext => 'Course Groups', + icon => 'conf.png', + #help => 'Course_Manage_Group', + url => '/adm/coursegroups?refpage=cusr', + permission => $permission->{'grp_manage'}, + linktitle => 'Manage course groups.', + }, + { linktext => 'Change Logs', + icon => 'document-properties.png', + #help => 'Course_User_Logs', + url => '/adm/createuser?action=changelogs', + permission => $permission->{'cusr'}, + linktitle => 'View change log.', + }); + }; +return Apache::lonhtmlcommon::generate_menu(@menu); # { text => 'View Log-in History', # help => 'Course_User_Logins', # action => 'logins', # permission => $permission->{'cusr'}, # }); - push(@menu,@courselinks); - } - my $menu_html = ''; - foreach my $menu_item (@menu) { - next if (! $menu_item->{'permission'}); - $menu_html.='

'; - if (exists($menu_item->{'help'})) { - $menu_html.= - &Apache::loncommon::help_open_topic($menu_item->{'help'}); - } - $menu_html.=''; - if (exists($menu_item->{'url'})) { - $menu_html.=qq{}; - } else { - $menu_html.= - qq{}; } - $menu_html.= &mt($menu_item->{'text'}).''; - $menu_html.='

'; - } - return $menu_html; } sub restore_prev_selections { @@ -4477,7 +3812,6 @@ sub restore_prev_selections { sub print_selfenroll_menu { my ($r,$context,$permission) = @_; - my $crstype = &Apache::loncommon::course_type(); my $formname = 'enrollstudent'; my $nolink = 1; my ($row,$lt) = &get_selfenroll_titles(); @@ -4659,9 +3993,7 @@ ENDSCRIPT my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; my $output = ''."\n". '

'.$lt->{'selfenroll'}.'

'."\n"; my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum); @@ -4841,12 +4173,8 @@ ENDSCRIPT &mt('No').''; my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1); my (@ccs,%notified); - my $ccrole = 'cc'; - if ($crstype eq 'Community') { - $ccrole = 'co'; - } - if ($advhash{$ccrole}) { - @ccs = split(/,/,$advhash{$ccrole}); + if ($advhash{'cc'}) { + @ccs = split(/,/,$advhash{'cc'}); } if ($currnotified) { foreach my $current (split(/,/,$currnotified)) { @@ -4875,7 +4203,7 @@ ENDSCRIPT ''. &Apache::loncommon::plainname($ccuname,$ccudom). ''; - $count ++; + $count; } my $rem = $count%$numcols; if ($rem) { @@ -4892,7 +4220,7 @@ ENDSCRIPT my $cid = $env{'request.course.id'}; my $currlim = $env{'course.'.$cid.'.internal.selfenroll_limit'}; my $currcap = $env{'course.'.$cid.'.internal.selfenroll_cap'}; - $nolimit = ' checked="checked" '; + my $nolimit = ' checked="checked" '; if ($currlim eq 'allstudents') { $crslimit = ' checked="checked" '; $selflimit = ' '; @@ -4928,14 +4256,287 @@ ENDSCRIPT return; } +sub display_selfenroll_queue { + my ($r,$context,$permission,$cnum,$cdom) = @_; + my $namespace = 'selfenrollrequests'; + my ($output,%queue_by_date); + my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); + if (keys(%requesthash) > 0) { + $r->print('
'. + ''. + ''. + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). + ''.&mt('Action').''. + ''.&mt('Requestor').''. + ''.&mt('Section').''. + ''.&mt('Date requested').''. + &Apache::loncommon::end_data_table_header_row()); + foreach my $item (keys(%requesthash)) { + my ($timestamp,$usec) = split(/:/,$requesthash{$item}); + if (exists($queue_by_date{$timestamp})) { + if (ref($queue_by_date{$timestamp}) eq 'ARRAY') { + push(@{$queue_by_date{$timestamp}},$item.':'.$usec); + } + } else { + @{$queue_by_date{$timestamp}} = ($item.':'.$usec); + } + } + my @sortedtimes = sort {$a <=> $b} (keys(%queue_by_date)); + my $count = 0; + foreach my $item (@sortedtimes) { + if (ref($queue_by_date{$item}) eq 'ARRAY') { + foreach my $request (sort(@{$queue_by_date{$item}})) { + my ($puname,$pudom,$pusec) = split(/:/,$request); + my $showsec = $pusec; + if ($showsec eq '') { + $showsec = &mt('none'); + } + my $namelink = &Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($puname,$pudom), + $puname,$pudom); + $r->print(&Apache::loncommon::start_data_table_row(). + '
'. + '
'. + ''.$namelink.''. + ''.$showsec.''. + ''.&Apache::lonlocal::locallocaltime($item).''. + &Apache::loncommon::end_data_table_row()); + $count ++; + } + } + } + $r->print(&Apache::loncommon::end_data_table(). + '
'); + } else { + $r->print(&mt('There are currently no enrollment requests.')); + } + return; +} + +sub update_selfenroll_queue { + my ($r,$context,$permission,$cid,$cnum,$cdom) = @_; + my @approvals = &Apache::loncommon::get_env_multiple('form.approvereq'); + my @rejections = &Apache::loncommon::get_env_multiple('form.rejectreq'); + my $access_start = $env{'course.'.$cid.'.internal.selfenroll_start_access'}; + my $access_end = $env{'course.'.$cid.'.internal.selfenroll_end_access'}; + my $limit = $env{'course.'.$cid.'.internal.selfenroll_limit'}; + my $cap = $env{'course.'.$cid.'.internal.selfenroll_cap'}; + my $notifylist = $env{'course.'.$cid.'.internal.selfenroll_notifylist'}; + my $namespace = 'selfenrollrequests'; + my ($stucounts,$idx,$classlist) = &get_student_counts($cdom,$cnum); + my %requesthash = &Apache::lonnet::dump($namespace,$cdom,$cnum); + my $coursedesc = $env{'course.'.$cid.'.description'}; + my $chome = &Apache::lonnet::homeserver($cnum,$cdom); + my $hostname = &Apache::lonnet::hostname($chome); + my $protocol = $Apache::lonnet::protocol{$chome}; + $protocol = 'http' if ($protocol ne 'https'); + my (@existing,@missingreq,@invalidusers,@limitexceeded,@enrolled, + @enrollerrors,@warn_approves,@warn_rejects); + my $now = time; + my $sender = $env{'user.name'}.':'.$env{'user.domain'}; + my $approvedmsg = [{ + mt => 'Your request for enrollment has been approved.', + }, + { + mt => 'Visit [_1], to log-in and access the course', + args => [$protocol.'://'.$hostname], + }]; + + my $rejectedmsg = [{ + mt => 'Your request for enrollment has not been approved.', + }]; + foreach my $item (sort {$a <=> $b} @approvals) { + my ($num,$uname,$udom,$usec) = split(/:/,$item); + my $uhome = &Apache::lonnet::homeserver($uname,$udom); + if ($uhome ne 'no_host') { + if (exists($requesthash{$uname.':'.$udom})) { + + if (exists($classlist->{$uname.':'.$udom})) { + if (ref($classlist->{$uname.':'.$udom}) eq 'ARRAY') { + if (($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Active') || + ($classlist->{$uname.':'.$udom}->[$idx->{'status'}] eq 'Future')) { + push(@existing,$uname.':'.$udom); + next; + } + } + } + } else { + push(@missingreq,$uname.':'.$udom); + next; + } + if (!grep(/^\Q$item\E$/,@rejections)) { + if ($limit eq 'allstudents') { + if ($stucounts->{$limit} >= $cap) { + push(@limitexceeded,$uname.':'.$udom); + last; + } + } elsif ($limit eq 'selfenrolled') { + if ($stucounts->{$limit} >= $cap) { + push(@limitexceeded,$uname.':'.$udom); + last; + } + } + my $result = + &Apache::lonnet::modify_student_enrollment($udom,$uname,undef,undef,undef,undef,undef,$usec,$access_end,$access_start,'selfenroll',undef,$cdom.'_'.$cnum,1); + if ($result eq 'ok') { + push(@enrolled,$uname.':'.$udom); + $stucounts->{'allstudents'} ++; + $stucounts->{'selfenrolled'} ++; + &Apache::selfenroll::send_notification($uname.':'.$udom,$approvedmsg,$cid, + $coursedesc,$now,'enroller',$sender); + my %userrequest = ( + $cdom.'_'.$cnum => { + timestamp => $now, + section => $usec, + adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, + status => 'approved', + } + ); + my $userresult = + &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); + if ($userresult ne 'ok') { + push(@warn_approves,$uname.':'.$udom); + } + } else { + push(@enrollerrors,$uname.':'.$udom); + } + } + } else { + push(@invalidusers,$uname.':'.$udom); + } + } + my @changes = (@enrolled,@rejections); + if (@rejections) { + foreach my $user (@rejections) { + &Apache::selfenroll::send_notification($user,$rejectedmsg,$cid, + $coursedesc,$now,'enroller',$sender); + my ($uname,$udom) = split(/:/,$user); + my %userrequest = ( + $cdom.'_'.$cnum => { + timestamp => $now, + adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, + status => 'rejected', + } + ); + my $userresult = + &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname); + if ($userresult ne 'ok') { + push(@warn_rejects,$user); + } + } + } + if (@changes) { + my $delresult = &Apache::lonnet::del($namespace,\@changes,$cdom,$cnum); + if ($delresult eq 'ok') { + my $namelink = + &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')'; + my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink"; + my ($approvedlist,$rejectedlist); + if (@enrolled) { + $approvedlist = join("\n",@enrolled); + $r->print('

'.&mt('The following were enrolled in the course:').'

    '); + foreach my $user (@enrolled) { + my ($uname,$udom) = split(/:/,$user); + my $userlink = + &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom); + $r->print('
  • '.$userlink.'
    • '); + } + $r->print('

'); + } + if (@rejections) { + $rejectedlist = join("\n",@rejections); + $r->print('

'.&mt('The following enrollment requests were rejected:').'

    '); + foreach my $user (@rejections) { + $r->print('
  • '.$user.'
    • '); + } + $r->print('

'); + } + &Apache::selfenroll::send_notification($notifylist,$chgmsg,$cid, + $coursedesc,$now,'managers', + $sender,$approvedlist,$rejectedlist); + } + } + if (@existing) { + $r->print('

'.&mt('The following enrollment requests were deleted because the user is already enrolled in the course:').'

    '); + foreach my $user (@existing) { + $r->print('
  • '.$user.'
    • '); + } + $r->print('

'); + } + if (@missingreq) { + $r->print('

'.&mt('The following enrollment requests were ignored because the request is no longer in the enrollment queue:').'

    '); + foreach my $user (@missingreq) { + $r->print('
  • '.$user.'
    • '); + } + $r->print('

'); + } + if (@invalidusers) { + $r->print('

'.&mt('The following enrollment requests were deleted because the requestor does not have a LON-CAPA account:').'

    '); + foreach my $user (@invalidusers) { + $r->print('
  • '.$user.'
    • '); + } + $r->print('

'); + } + if (@limitexceeded) { + $r->print('

'.&mt('The following enrollment requests were skipped because the enrollment limit has been reached for the course:').'

    '); + foreach my $user (@limitexceeded) { + $r->print('
  • '.$user.'
    • '); + } + $r->print('

'); + } + if (@enrollerrors) { + $r->print('

'.&mt('The following enrollment requests could not be processed because an error occurred:').'

    '); + foreach my $user (@enrollerrors) { + $r->print('
  • '.$user.'
    • '); + } + $r->print('

'); + } + if (@warn_approves) { + $r->print('

'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'

    '); + foreach my $user (@warn_approves) { + $r->print('
  • '.$user.'
    • '); + } + $r->print('

'); + } + if (@warn_rejects) { + $r->print('

'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'

    '); + foreach my $user (@warn_rejects) { + $r->print('
  • '.$user.'
    • '); + } + $r->print('

'); + } + return; +} + +sub get_student_counts { + my ($cdom,$cnum) = @_; + my (%idx,%stucounts); + my $classlist = &Apache::loncoursedata::get_classlist($cdom,$cnum); + $idx{'type'} = &Apache::loncoursedata::CL_TYPE(); + $idx{'status'} = &Apache::loncoursedata::CL_STATUS(); + while (my ($student,$data) = each(%$classlist)) { + if (($data->[$idx{'status'}] eq 'Active') || + ($data->[$idx{'status'}] eq 'Future')) { + if ($data->[$idx{'type'}] eq 'selfenroll') { + $stucounts{'selfenroll'} ++; + } + $stucounts{'allstudents'} ++; + } + } + return (\%stucounts,\%idx,$classlist); +} + sub visible_in_cat { my ($cdom,$cnum) = @_; my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); my ($cathash,%settable,@vismsgs,$cansetvis); my %visactions = &Apache::lonlocal::texthash( - vis => 'Your course/community currently appears in the Course/Community Catalog for this domain.', + vis => 'Your course currently appears in the Course Catalog for this domain.', gen => 'Courses can be both self-cataloging, based on an institutional code (e.g., fs08phy231), or can be assigned categories from a hierarchy defined for the domain.', - miss => 'Your course/community does not currently appear in the Course/Community Catalog for this domain.', + miss => 'Your course does not currently appear in the Course Catalog for this domain.', yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.', coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.', make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:', @@ -5151,7 +4752,6 @@ sub print_userchangelogs_display { my $formname = 'roleslog'; my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $crstype = &Apache::loncommon::course_type(); my %roleslog=&Apache::lonnet::dump('nohist_rolelog',$cdom,$cnum); if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); } @@ -5190,7 +4790,7 @@ sub print_userchangelogs_display { } my (%whodunit,%changed,$version); ($version) = ($r->dir_config('lonVersion') =~ /^([\d\.]+)\-/); - $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version,$crstype)); + $r->print(&role_display_filter($formname,$cdom,$cnum,\%curr,$version)); my $showntablehdr = 0; my $tablehdr = &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). @@ -5266,11 +4866,11 @@ sub print_userchangelogs_display { if ($roleslog{$id}{'logentry'}{'selfenroll'}) { $chgcontext = 'selfenroll'; } - my %lt = &rolechg_contexts($crstype); + my %lt = &rolechg_contexts(); if ($chgcontext ne '' && $lt{$chgcontext} ne '') { $chgcontext = $lt{$chgcontext}; } - $r->print(&Apache::loncommon::start_data_table_row().''.$count.''.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).''.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.''.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.''.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'},$crstype).''.$sec.''.$chgcontext.''.$rolestart.''.$roleend.''.&Apache::loncommon::end_data_table_row()."\n"); + $r->print(&Apache::loncommon::start_data_table_row().''.$count.''.&Apache::lonlocal::locallocaltime($roleslog{$id}{'exe_time'}).''.$whodunit{$roleslog{$id}{'exe_uname'}.':'.$roleslog{$id}{'exe_udom'}}.''.$changed{$roleslog{$id}{'uname'}.':'.$roleslog{$id}{'udom'}}.''.&Apache::lonnet::plaintext($roleslog{$id}{'logentry'}{'role'}).''.$sec.''.$chgcontext.''.$rolestart.''.$roleend.''.&Apache::loncommon::end_data_table_row()."\n"); } if ($showntablehdr) { $r->print(&Apache::loncommon::end_data_table().'
'); @@ -5285,7 +4885,6 @@ sub print_userchangelogs_display { $r->print(''); $r->print(<<"ENDSCRIPT"); ENDSCRIPT } } else { - $r->print('

'. - &mt('There are no records to display'). - '

'); + $r->print(&mt('There are no records to display')); } $r->print(''. ''); @@ -5311,12 +4907,11 @@ ENDSCRIPT } sub role_display_filter { - my ($formname,$cdom,$cnum,$curr,$version,$crstype) = @_; + my ($formname,$cdom,$cnum,$curr,$version) = @_; my $context = 'course'; - my $lctype = lc($crstype); my $nolink = 1; my $output = ''; @@ -5328,7 +4923,7 @@ sub role_display_filter { &Apache::lonhtmlcommon::date_setter($formname,'rolelog_end_date', $curr->{'rolelog_end_date'},undef, undef,undef,undef,undef,undef,undef,$nolink); - my %lt = &rolechg_contexts($crstype); + my %lt = &rolechg_contexts(); $output .= ''. @@ -5338,13 +4933,13 @@ sub role_display_filter { $output .= ' selected="selected"'; } $output .= '>'.&mt('Any').''."\n"; - my @roles = &Apache::lonuserutils::course_roles($context,undef,1,$lctype); + my @roles = &Apache::lonuserutils::course_roles($context,undef,1); foreach my $role (@roles) { my $plrole; if ($role eq 'cr') { $plrole = &mt('Custom Role'); } else { - $plrole=&Apache::lonnet::plaintext($role,$crstype); + $plrole=&Apache::lonnet::plaintext($role); } my $selstr = ''; if ($role eq $curr->{'role'}) { @@ -5354,37 +4949,27 @@ sub role_display_filter { } $output .= '' - .'
'. - ''.&mt('Changes/page:').'
'. + ''.&mt('Changes/page:').'
'. &Apache::lonmeta::selectbox('show',$curr->{'show'},undef, (&mt('all'),5,10,20,50,100,1000,10000)). '		  '.&mt('Window during which changes occurred:').'
'.&mt('After:'). ''.$startform.'
'.&mt('Before:').''. $endform.'
    '. &mt('Context:').'
'; - - # Update Display button - $output .= '

' - .'' - .'

'; - - # Server version info - $output .= '

' - .&mt('Only changes made from servers running LON-CAPA [_1] or later are displayed.' - ,'2.6.99.0'); + $output .= '  '. + ''. + &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.'); if ($version) { - $output .= ' '.&mt('This LON-CAPA server is version [_1]',$version); - } - $output .= '


'; + $output .= ' '.&mt('This server is version [_3].','','',$version); } + $output .= '

'; return $output; } sub rolechg_contexts { - my ($crstype) = @_; my %lt = &Apache::lonlocal::texthash ( any => 'Any', auto => 'Automated enrollment', @@ -5392,14 +4977,8 @@ sub rolechg_contexts { createcourse => 'Course Creation', course => 'User Management in course', domain => 'User Management in domain', - selfenroll => 'Self-enrolled', - requestcourses => 'Course Request', + selfenroll => 'Self-enrolled', ); - if ($crstype eq 'Community') { - $lt{'createcourse'} = &mt('Community Creation'); - $lt{'course'} = &mt('User Management in community'); - $lt{'requestcourses'} = &mt('Community Request'); - } return %lt; } @@ -5483,15 +5062,6 @@ sub user_search_result { &build_search_response($context,$srch,%srch_results); } else { $currstate = 'modify'; - my $uname = $srch->{'srchterm'}; - my $udom = $srch->{'srchdomain'}; - $srch_results{$uname.':'.$udom} = - { &Apache::lonnet::get('environment', - ['firstname', - 'lastname', - 'permanentemail'], - $udom,$uname) - }; } } else { %srch_results = &Apache::lonnet::usersearch($srch); @@ -5783,27 +5353,17 @@ sub build_search_response { $response .= '
'.&mt('You may want to broaden your search to the selected LON-CAPA domain.'); } } - my $createdom = $env{'request.role.domain'}; - if ($context eq 'requestcrs') { - if ($env{'form.coursedom'} ne '') { - $createdom = $env{'form.coursedom'}; - } - } - if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) { + if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $env{'request.role.domain'})) { my $cancreate = - &Apache::lonuserutils::can_create_user($createdom,$context); - my $targetdom = ''.$createdom.''; + &Apache::lonuserutils::can_create_user($env{'request.role.domain'},$context); if ($cancreate) { - my $showdom = &display_domain_info($createdom); + my $showdom = &display_domain_info($env{'request.role.domain'}); $response .= '

' .''.&mt('To add a new user:').'' - .'
'; - if ($context eq 'requestcrs') { - $response .= &mt("(You can only define new users in the new course's domain - [_1])",$targetdom); - } else { - $response .= &mt("(You can only create new users in your current role's domain - [_1])",$targetdom); - } - $response .= '
  • ' + .'
    ' + .&mt("(You can only create new users in your current role's domain - [_1])" + ,''.$env{'request.role.domain'}.'') + .'
    • ' .&mt("Set 'Domain/institution to search' to: [_1]",''.$showdom.'') .'
    • ' .&mt("Set 'Search criteria' to: [_1]username is ..... in selected LON-CAPA domain[_2]",'','') @@ -5814,13 +5374,10 @@ sub build_search_response { .'

    '; } else { my $helplink = ' href="javascript:helpMenu('."'display'".')"'; - $response .= '

    '; - if ($context eq 'requestcrs') { - $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom); - } else { - $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom); - } - $response .= '
    ' + $response .= '

    ' + .&mt("You are not authorized to create new users in your current role's domain - [_1]." + ,''.$env{'request.role.domain'}.'') + .'
    ' .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' ,' ' ,'') @@ -5910,13 +5467,12 @@ sub course_level_table { 'end' => "End" ); - foreach my $protectedcourse (sort(keys(%inccourses))) { + foreach my $protectedcourse (sort( keys(%inccourses))) { my $thiscourse=$protectedcourse; $thiscourse=~s:_:/:g; my %coursedata=&Apache::lonnet::coursedescription($thiscourse); - my $isowner = &is_courseowner($protectedcourse,$coursedata{'internal.courseowner'}); my $area=$coursedata{'description'}; - my $crstype=$coursedata{'type'}; + my $type=$coursedata{'type'}; if (!defined($area)) { $area=&mt('Unavailable course').': '.$protectedcourse; } my ($domain,$cnum)=split(/\//,$thiscourse); my %sections_count; @@ -5926,13 +5482,12 @@ sub course_level_table { &Apache::loncommon::get_sections($domain,$cnum); } } - my @roles = &Apache::lonuserutils::roles_by_context('course','',$crstype); + my @roles = &Apache::lonuserutils::roles_by_context('course'); foreach my $role (@roles) { - my $plrole=&Apache::lonnet::plaintext($role,$crstype); - if ((&Apache::lonnet::allowed('c'.$role,$thiscourse)) || - ((($role eq 'cc') || ($role eq 'co')) && ($isowner))) { + my $plrole=&Apache::lonnet::plaintext($role); + if (&Apache::lonnet::allowed('c'.$role,$thiscourse)) { $table .= &course_level_row($protectedcourse,$role,$area,$domain, - $plrole,\%sections_count,\%lt); + $plrole,\%sections_count,\%lt); } elsif ($env{'request.course.sec'} ne '') { if (&Apache::lonnet::allowed('c'.$role,$thiscourse.'/'. $env{'request.course.sec'})) { @@ -5942,8 +5497,7 @@ sub course_level_table { } } if (&Apache::lonnet::allowed('ccr',$thiscourse)) { - foreach my $cust (sort(keys(%customroles))) { - next if ($crstype eq 'Community' && $customroles{$cust} =~ /bre\&S/); + foreach my $cust (sort keys %customroles) { my $role = 'cr_cr_'.$env{'user.domain'}.'_'.$env{'user.name'}.'_'.$cust; $table .= &course_level_row($protectedcourse,$role,$area,$domain, $cust,\%sections_count,\%lt); @@ -5974,7 +5528,7 @@ sub course_level_row { $protectedcourse.'_'.$role.'" />'."\n". ' '.$plrole.''."\n". ' '.$area.'
    Domain: '.$domain.''."\n"; - if (($role eq 'cc') || ($role eq 'co')) { + if ($role eq 'cc') { $row .= ' '; } elsif ($env{'request.course.sec'} ne '') { $row .= ' '. ''; my $courseform=''.&Apache::loncommon::selectcourse_link - ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course/Community','crstype').''; - my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser'); + ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').''; + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu'); my %lt=&Apache::lonlocal::texthash( 'rol' => "Role", 'grs' => "Section", @@ -6034,14 +5588,14 @@ sub course_level_dc { 'ssd' => "Set Start Date", 'sed' => "Set End Date" ); - my $header = '

    '.&mt('Course/Community Level').'

    '. + my $header = '

    '.&mt('Course Level').'

    '. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). ''.$courseform.''.$lt{'rol'}.''.$lt{'grs'}.''.$lt{'sta'}.''.$lt{'end'}.''. &Apache::loncommon::end_data_table_header_row(); my $otheritems = &Apache::loncommon::start_data_table_row()."\n". - '
    '."\n". - '
    '."\n". + ''. ''. - ''. - ''. + ''. ''; $otheritems .= <
    + $lt{'ssd'} -
    + $lt{'sed'} ENDTIMEENTRY @@ -6132,8 +5685,7 @@ sub update_selfenroll_config { $newnum ++; } } - for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) { - if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) { + for (my $j=0; $j<$env{'form.selfenroll_types_total'}; $j++) { if ((!grep(/^$j$/,@deletedoms)) && (!grep(/^$j$/,@activations))) { my @types = &Apache::loncommon::get_env_multiple('form.selfenroll_types_'.$j); if (@types > 0) { @types = sort(@types); @@ -6333,7 +5885,7 @@ sub update_selfenroll_config { if ($currlimit eq 'allstudents') { $newval = &mt('New self-enrollment no longer allowed when total (all students) reaches [_1].',$newcap); } elsif ($changes{'internal.selfenroll_limit'} eq 'selfenrolled') { - $newval = &mt('New self-enrollment no longer allowed when total number of self-enrolled students reaches [_1].',$newcap); + $newval = &mt('New self-enrollment no longer allowed when total umber of self-enrolled students reaches [_1].',$newcap); } } $r->print('
  • '.&mt('"[_1]" set to "[_2]".',$title,$newval).'
    • '."\n"); @@ -6436,21 +5988,6 @@ sub get_selfenroll_titles { return (\@row,\%lt); } -sub is_courseowner { - my ($thiscourse,$courseowner) = @_; - if ($courseowner eq '') { - if ($env{'request.course.id'} eq $thiscourse) { - $courseowner = $env{'course.'.$env{'request.course.id'}.'.internal.courseowner'}; - } - } - if ($courseowner ne '') { - if ($courseowner eq $env{'user.name'}.':'.$env{'user.domain'}) { - return 1; - } - } - return; -} - #---------------------------------------------- end functions for &phase_two #--------------------------------- functions for &phase_two and &phase_three