--- loncom/interface/loncreateuser.pm 2010/01/20 14:59:27 1.295.2.29 +++ loncom/interface/loncreateuser.pm 2009/09/23 03:49:13 1.295.8.2 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.295.2.29 2010/01/20 14:59:27 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.295.8.2 2009/09/23 03:49:13 gci 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 @@ -219,7 +218,7 @@ END_SCRIPT sub build_tools_display { my ($ccuname,$ccdomain,$context) = @_; my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, - $colspan,$isadv,%domconfig); + $colspan); my %lt = &Apache::lonlocal::texthash ( 'blog' => "Personal User Blog", 'aboutme' => "Personal Information Page", @@ -231,21 +230,16 @@ sub build_tools_display { 'uscu' => "Use custom", 'official' => 'Can request creation of official courses', 'unofficial' => 'Can request creation of unofficial courses', - 'community' => 'Can request creation of communities', ); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, - 'requestcourses.official','requestcourses.unofficial', - 'requestcourses.community'); - @usertools = ('official','unofficial','community'); + 'requestcourses.official','requestcourses.unofficial'); + @usertools = ('unofficial'); @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); } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'tools.aboutme','tools.portfolio','tools.blog'); @@ -292,14 +286,7 @@ sub build_tools_display { &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); - } + $curroption = $userenv{$context.'.'.$item}; if (!$curroption) { $curroption = 'norequest'; } @@ -389,7 +376,7 @@ sub coursereq_externaluser { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'reqcrsotherdom.official','reqcrsotherdom.unofficial', 'reqcrsotherdom.community'); - @usertools = ('official','unofficial','community'); + @usertools = ('unofficial'); @options = ('approval','validate','autolimit'); %validations = &Apache::lonnet::auto_courserequest_checks($cdom); my $optregex = join('|',@options); @@ -479,7 +466,7 @@ sub courserequest_display { # =================================================================== 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'})) { @@ -498,15 +485,10 @@ sub print_username_entry_form { '// ]]>'."\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,113 +510,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') { @@ -674,7 +591,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", @@ -687,11 +603,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'}; @@ -762,7 +674,7 @@ 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,$opener_elements) = @_; my @fields = ('username','domain','lastname','firstname','permanentemail'); my $sortby = $env{'form.sortby'}; @@ -790,10 +702,8 @@ 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", @@ -805,7 +715,7 @@ ENDSCRIPT } else { $r->print(&Apache::loncommon::start_page('User Management',$jscript)); - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb(); &Apache::lonhtmlcommon::add_breadcrumb ({href=>"javascript:backPage(document.usersrchform,'','')", text=>$breadcrumb_text{'search'}, @@ -817,26 +727,14 @@ ENDSCRIPT $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(&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.""); - 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('

'); + $r->print($jscript."$lt{'stusrch'}
"); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context)); + $r->print('

'.$lt{'stusel'}.'

'); } } $r->print('
'. @@ -911,11 +809,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); @@ -956,7 +854,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; @@ -980,7 +878,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; } } @@ -1007,7 +905,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'}, @@ -1039,24 +937,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) { @@ -1070,7 +954,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", @@ -1089,11 +972,7 @@ $loginscript

$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 = @@ -1112,7 +991,7 @@ $lt{'hs'}: $home_server_pick $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?').'

'. + $r->print('

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

'. &Apache::loncommon::start_data_table(). &build_tools_display($ccuname,$ccdomain, 'requestcourses'). @@ -1186,7 +1065,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'}); } @@ -1214,7 +1088,7 @@ 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?').'

'. + $r->print('

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

'. &Apache::loncommon::start_data_table()); if ($env{'request.role.domain'} eq $ccdomain) { $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); @@ -1293,18 +1167,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; @@ -1343,14 +1211,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 { @@ -1414,9 +1277,13 @@ sub validation_javascript { } 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", @@ -1426,240 +1293,181 @@ 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; - } - $rolesdump{$newkey} = $newvalue; - } - } else { - %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); - 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'}; - $class=$coursedata{'type'}; - } 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; } +# - custom role. Needs more info, too + if ($croletitle) { + if (&Apache::lonnet::allowed('ccr',$1.'/'.$2)) { + $allowed=1; + $thisrole.='.'.$role_code; + } + } + # 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 { - if (&Apache::lonnet::allowed('c'.$role_code,'/')) { + $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 'au') { - $class='Construction Space'; - } elsif ($role_code eq 'su') { - $class='System'; + my $row = ''; + $row.= ''; + my $active=1; + $active=0 if (($role_end_time) && ($now>$role_end_time)); + if (($active) && ($allowed)) { + $row.= ''; } else { - $class='Domain'; + if ($active) { + $row.=' '; + } else { + $row.=&mt('expired or revoked'); + } } - } - if (($role_code eq 'ca') || ($role_code eq 'aa')) { - $area=~m{/($match_domain)/($match_username)}; - if (&Apache::lonuserutils::authorpriv($2,$1)) { - $allowed=1; + $row.=''; + if ($allowed && !$active) { + $row.= ''; } else { - $allowed=0; + $row.=' '; } - } - my $row = ''; - $row.= ''; - my $active=1; - $active=0 if (($role_end_time) && ($now>$role_end_time)); - if (($active) && ($allowed)) { - $row.= ''; - } else { - if ($active) { - $row.=' '; + $row.=''; + if ($delallowed) { + $row.= ''; } else { - $row.=&mt('expired or revoked'); + $row.=' '; } - } - $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= + 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?&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.= ''.$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 = 'Existing Co-Author Roles in your Construction Space'; - } else { - $contextrole = 'Existing Roles in this Domain'; - } - $r->print(' + $r->print('

'.$lt{'rer'}.'

'. '
'.&mt($contextrole).'
'. &Apache::loncommon::start_data_table("LC_createuser"). @@ -1668,13 +1476,14 @@ sub display_existing_roles { ''.$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; } @@ -2162,7 +1971,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 @@ -2186,7 +1995,7 @@ sub update_user_data { $jsback."\n". '// ]]>'."\n". ''."\n"; - my %breadcrumb_text = &singleuser_breadcrumb($crstype); + my %breadcrumb_text = &singleuser_breadcrumb(); my $args; if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; @@ -2418,10 +2227,9 @@ sub update_user_data { } } ## - my (@userroles,%userupdate,$cnum,$cdom,$crstype,$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 @@ -2505,7 +2313,7 @@ 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'); @@ -2686,12 +2494,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'}, @@ -2748,7 +2556,6 @@ sub update_user_data { '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:' @@ -2902,7 +2709,6 @@ END 'portfolio' => "Portfolio Availability", 'official' => "Can Request Official Courses", 'unofficial' => "Can Request Unofficial Courses", - 'community' => "Can Request Communities", 'inststatus' => "Affiliation", ); $r->print(<<"END"); @@ -2973,14 +2779,9 @@ END .''); } 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 ($namechanged) { @@ -3449,14 +3250,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; @@ -3489,13 +3284,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); @@ -3620,27 +3409,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=(); @@ -3649,6 +3429,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? @@ -3657,9 +3438,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=''; @@ -3701,54 +3479,16 @@ sub custom_role_editor { my $head_script = "\n"; $head_script .= ''."\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',}, @@ -3765,21 +3505,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(< @@ -3792,7 +3524,7 @@ ENDCCF ''.$lt{'ssl'}.''. &Apache::loncommon::end_data_table_header_row()); foreach my $priv (sort keys %full) { - my $privtext = &Apache::lonnet::plaintext($priv,$crstype); + 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(). ''. @@ -3820,7 +3548,7 @@ ENDCCF } # -------------------------------------------------------- sub make_script_template { - my ($role,$crstype) = @_; + my ($role) = @_; my %full_c=(); my %full_d=(); my %full_s=(); @@ -3834,7 +3562,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; } @@ -3887,8 +3614,8 @@ sub make_script_template { } # ---------------------------------------------------------- sub make_button_code { - my ($role,$crstype) = @_; - my $label = &Apache::lonnet::plaintext($role,$crstype); + my ($role) = @_; + my $label = &Apache::lonnet::plaintext($role); my $button_code = ''; return ($button_code); } @@ -3988,10 +3715,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 { @@ -4010,7 +3736,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 ". @@ -4025,7 +3751,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()); @@ -4041,7 +3767,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); @@ -4066,13 +3792,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) = @@ -4082,7 +3808,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') && @@ -4100,24 +3826,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') { @@ -4152,22 +3878,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 = @@ -4188,25 +3902,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('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'}); @@ -4216,7 +3924,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(). @@ -4282,7 +3990,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; @@ -4326,14 +4034,7 @@ 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', @@ -4350,12 +4051,8 @@ sub print_main_menu { singleuser => 'Add/Modify a Single Course User', listusers => 'Display Class Lists and Manage Multiple Users', }, - community => { - upload => 'Upload a File of Community Users', - singleuser => 'Add/Modify a Community User', - listusers => 'Manage Community Users', - }, ); + my @menu = ( { text => $links{$context}{'upload'}, @@ -4397,21 +4094,18 @@ sub print_main_menu { 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'}, - }); + push(@courselinks, + { text => 'Automated Enrollment Manager', + help => 'Course_Automated_Enrollment', + permission => (&Apache::lonnet::auto_run($cnum,$cdom) + && $permission->{'cusr'}), + url => '/adm/populate', + }, + { text => 'Configure User Self-enrollment', + help => 'Course_Self_Enrollment', + action => 'selfenroll', + permission => $permission->{'cusr'}, + }); } if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) { push(@courselinks, @@ -4472,7 +4166,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(); @@ -4836,12 +4529,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)) { @@ -4928,9 +4617,9 @@ sub visible_in_cat { 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:', @@ -5146,7 +4835,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); } @@ -5185,7 +4873,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(). @@ -5261,11 +4949,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().'
'); @@ -5306,9 +4994,8 @@ 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 = ''. @@ -5333,13 +5020,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'}) { @@ -5349,7 +5036,7 @@ sub role_display_filter { } $output .= ''."\n". ' '."\n". ' '."\n"; - if (($role eq 'cc') || ($role eq 'co')) { + if ($role eq 'cc') { $row .= ''; } elsif ($env{'request.course.sec'} ne '') { $row .= ' '. &Apache::loncommon::end_data_table_header_row(); my $otheritems = &Apache::loncommon::start_data_table_row()."\n". - ''."\n". - ''."\n". + ''. + ''. '
'. ''.&mt('Changes/page:').'
'. @@ -5323,7 +5010,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 .= '		'.&mt('Window during which changes occurred:').'
'.&mt('After:'). ''.$startform.'
'.&mt('Before:').''. $endform.'
    '. &mt('Context:').'
'.$plrole.''.$area.'
Domain: '.$domain.'		 '; my $courseform=''.&Apache::loncommon::selectcourse_link ('cu','dccourse','dcdomain','coursedesc',undef,undef,'Course').''; - my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu','role','Course/Community Browser'); + my $cb_jscript = &Apache::loncommon::coursebrowser_javascript($dcdom,'currsec','cu'); my %lt=&Apache::lonlocal::texthash( 'rol' => "Role", 'grs' => "Section", @@ -6029,14 +5707,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'}.'

 '.$lt{'new'}.'
'. ''. ''. - ''. - '
'; $otheritems .= <
+ $lt{'ssd'} -
+ $lt{'sed'} ENDTIMEENTRY @@ -6127,8 +5804,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); @@ -6431,21 +6107,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