--- loncom/interface/loncreateuser.pm 2024/08/24 15:09:55 1.406.2.20.2.6 +++ loncom/interface/loncreateuser.pm 2022/10/18 23:28:00 1.460 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.406.2.20.2.6 2024/08/24 15:09:55 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.460 2022/10/18 23:28:00 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -70,7 +70,6 @@ use Apache::lonlocal; use Apache::longroup; use Apache::lonuserutils; use Apache::loncoursequeueadmin; -use Apache::lonviewcoauthors; use LONCAPA qw(:DEFAULT :match); use HTML::Entities; @@ -80,9 +79,10 @@ my $authformkrb; my $authformint; my $authformfsys; my $authformloc; +my $authformlti; sub initialize_authen_forms { - my ($dom,$formname,$curr_authtype,$mode,$readonly) = @_; + my ($dom,$formname,$curr_authtype,$mode) = @_; my ($krbdef,$krbdefdom) = &Apache::loncommon::get_kerberos_defaults($dom); my %param = ( formname => $formname, kerb_def_dom => $krbdefdom, @@ -90,7 +90,7 @@ sub initialize_authen_forms { domain => $dom, ); my %abv_auth = &auth_abbrev(); - if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix):(.*)$/) { + if ($curr_authtype =~ /^(krb4|krb5|internal|localauth|unix|lti):(.*)$/) { my $long_auth = $1; my $curr_autharg = $2; my %abv_auth = &auth_abbrev(); @@ -103,15 +103,13 @@ sub initialize_authen_forms { $param{'mode'} = $mode; } } - if ($readonly) { - $param{'readonly'} = 1; - } $loginscript = &Apache::loncommon::authform_header(%param); $authformkrb = &Apache::loncommon::authform_kerberos(%param); $authformnop = &Apache::loncommon::authform_nochange(%param); $authformint = &Apache::loncommon::authform_internal(%param); $authformfsys = &Apache::loncommon::authform_filesystem(%param); $authformloc = &Apache::loncommon::authform_local(%param); + $authformlti = &Apache::loncommon::authform_lti(%param); } sub auth_abbrev { @@ -121,6 +119,7 @@ sub auth_abbrev { internal => 'int', localauth => 'loc', unix => 'fsys', + lti => 'lti', ); return %abv_auth; } @@ -128,82 +127,14 @@ sub auth_abbrev { # ==================================================== sub user_quotas { - my ($ccuname,$ccdomain,$name) = @_; + my ($ccuname,$ccdomain) = @_; my %lt = &Apache::lonlocal::texthash( + 'usrt' => "User Tools", 'cust' => "Custom quota", 'chqu' => "Change quota", ); - my ($output,$longinsttype); - my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain); - my %titles = &Apache::lonlocal::texthash ( - portfolio => "Disk space allocated to user's portfolio files", - author => "Disk space allocated to user's Authoring Space", - ); - my ($currquota,$quotatype,$inststatus,$defquota) = - &Apache::loncommon::get_user_quota($ccuname,$ccdomain,$name); - if ($longinsttype eq '') { - if ($inststatus ne '') { - if ($usertypes->{$inststatus} ne '') { - $longinsttype = $usertypes->{$inststatus}; - } - } - } - my ($showquota,$custom_on,$custom_off,$defaultinfo,$colspan); - $custom_on = ' '; - $custom_off = ' checked="checked" '; - $colspan = ' colspan="2"'; - if ($quotatype eq 'custom') { - $custom_on = $custom_off; - $custom_off = ' '; - $showquota = $currquota; - if ($longinsttype eq '') { - $defaultinfo = &mt('For this user, the default quota would be [_1]' - .' MB.',$defquota); - } else { - $defaultinfo = &mt("For this user, the default quota would be [_1]". - " MB,[_2]as determined by the user's institutional". - " affiliation ([_3]).",$defquota,'
',$longinsttype); - } - } else { - if ($longinsttype eq '') { - $defaultinfo = &mt('For this user, the default quota is [_1]' - .' MB.',$defquota); - } else { - $defaultinfo = &mt("For this user, the default quota of [_1]". - " MB,[_2]is determined by the user's institutional". - " affiliation ([_3]).",$defquota,'
',$longinsttype); - } - } - - if (&Apache::lonnet::allowed('mpq',$ccdomain)) { - $output .= ''."\n". - ' '.$titles{$name}.''."\n". - ' '."\n". - &Apache::loncommon::start_data_table_row()."\n". - ' '. - &mt('Current quota: [_1] MB',$currquota).'  '. - $defaultinfo.''."\n". - &Apache::loncommon::end_data_table_row()."\n". - &Apache::loncommon::start_data_table_row()."\n". - ''.$lt{'chqu'}. - ':  '. - '  '. - ' '.&mt('MB').''."\n". - &Apache::loncommon::end_data_table_row()."\n"; - } - return $output; -} - -sub user_quota_js { - return <<"END_SCRIPT"; + + my $quota_javascript = <<"END_SCRIPT"; END_SCRIPT + my $longinsttype; + my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain); + my $output = $quota_javascript."\n". + '

'.$lt{'usrt'}.'

'."\n". + &Apache::loncommon::start_data_table(); + + if ((&Apache::lonnet::allowed('mut',$ccdomain)) || + (&Apache::lonnet::allowed('udp',$ccdomain))) { + $output .= &build_tools_display($ccuname,$ccdomain,'tools'); + } -} - -sub set_custom_js { - return <<"END_SCRIPT"; - - - -END_SCRIPT + my ($showquota,$custom_on,$custom_off,$defaultinfo); + $custom_on = ' '; + $custom_off = ' checked="checked" '; + if ($quotatype eq 'custom') { + $custom_on = $custom_off; + $custom_off = ' '; + $showquota = $currquota; + if ($longinsttype eq '') { + $defaultinfo = &mt('For this user, the default quota would be [_1]' + .' MB.',$defquota); + } else { + $defaultinfo = &mt("For this user, the default quota would be [_1]". + " MB, as determined by the user's institutional". + " affiliation ([_2]).",$defquota,$longinsttype); + } + } else { + if ($longinsttype eq '') { + $defaultinfo = &mt('For this user, the default quota is [_1]' + .' MB.',$defquota); + } else { + $defaultinfo = &mt("For this user, the default quota of [_1]". + " MB, is determined by the user's institutional". + " affiliation ([_2]).",$defquota,$longinsttype); + } + } + if (&Apache::lonnet::allowed('mpq',$ccdomain)) { + $output .= ''."\n". + ' '.$titles{$name}.''."\n". + ' '."\n". + &Apache::loncommon::start_data_table_row()."\n". + ' '. + &mt('Current quota: [_1] MB',$currquota).'  '. + $defaultinfo.''."\n". + &Apache::loncommon::end_data_table_row()."\n". + &Apache::loncommon::start_data_table_row()."\n". + ' '.$lt{'chqu'}. + ':  '. + '  '. + ' '.&mt('MB').''."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + } + $output .= &Apache::loncommon::end_data_table(); + return $output; } sub build_tools_display { my ($ccuname,$ccdomain,$context) = @_; my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, - $colspan,$isadv,%domconfig,@defaulteditors,@customeditors,@custommanagers, - @possmanagers); + $colspan,$isadv,%domconfig); my %lt = &Apache::lonlocal::texthash ( 'blog' => "Personal User Blog", 'aboutme' => "Personal Information Page", - 'webdav' => "WebDAV access to Authoring Spaces (https)", - 'editors' => "Available Editors", - 'managers' => "Co-authors who can add/revoke roles", - 'archive' => "Managers can download tar.gz file of Authoring Space", + 'webdav' => "WebDAV access to Authoring Spaces (if SSL and author/co-author)", 'portfolio' => "Personal User Portfolio", - 'portaccess' => "Portfolio Shareable", 'timezone' => "Can set Time Zone", 'avai' => "Available", 'cusa' => "availability", @@ -295,82 +257,53 @@ sub build_tools_display { 'unofficial' => 'Can request creation of unofficial courses', 'community' => 'Can request creation of communities', 'textbook' => 'Can request creation of textbook courses', + 'placement' => 'Can request creation of placement tests', + 'lti' => 'Can request creation of LTI courses', 'requestauthor' => 'Can request author space', - 'edit' => 'Standard editor (Edit)', - 'xml' => 'Text editor (EditXML)', - 'daxe' => 'Daxe editor (Daxe)', ); - $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'requestcourses.official','requestcourses.unofficial', - 'requestcourses.community','requestcourses.textbook'); - @usertools = ('official','unofficial','community','textbook'); + 'requestcourses.community','requestcourses.textbook', + 'requestcourses.placement','requestcourses.lti'); + @usertools = ('official','unofficial','community','textbook','placement','lti'); @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($ccdomain,$ccuname); } elsif ($context eq 'requestauthor') { - %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'requestauthor'); + %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, + 'requestauthor'); @usertools = ('requestauthor'); @options =('norequest','approval','automatic'); %reqtitles = &requestauthor_titles(); %reqdisplay = &requestauthor_display(); + $colspan = ' colspan="2"'; %domconfig = &Apache::lonnet::get_dom('configuration',['requestauthor'],$ccdomain); - } elsif ($context eq 'authordefaults') { - %domconfig = - &Apache::lonnet::get_dom('configuration',['quotas','authordefaults'],$ccdomain); - %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'tools.webdav', - 'authoreditors','authormanagers', - 'authorarchive','domcoord.author'); - @usertools = ('webdav','editors','managers','archive'); - $colspan = ' colspan="2"'; } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'tools.aboutme','tools.portfolio','tools.blog', - 'tools.timezone','tools.portaccess'); - @usertools = ('aboutme','blog','portfolio','portaccess','timezone'); - $colspan = ' colspan="2"'; + 'tools.webdav','tools.timezone'); + @usertools = ('aboutme','blog','webdav','portfolio','timezone'); } foreach my $item (@usertools) { my ($custom_access,$curr_access,$cust_on,$cust_off,$tool_on,$tool_off, - $currdisp,$custdisp,$custradio,$onclick,$customsty,$editorsty); + $currdisp,$custdisp,$custradio); $cust_off = 'checked="checked" '; $tool_on = 'checked="checked" '; - unless (($context eq 'authordefaults') || ($item eq 'webdav')) { - $curr_access = - &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef, - $context,\%userenv,'', - {'is_adv' => $isadv}); - } + $curr_access = + &Apache::lonnet::usertools_access($ccuname,$ccdomain,$item,undef, + $context); if ($context eq 'requestauthor') { if ($userenv{$context} ne '') { $cust_on = ' checked="checked" '; $cust_off = ''; - } - } elsif ($context eq 'authordefaults') { - if (($item eq 'editors') || ($item eq 'archive')) { - if ($userenv{'author'.$item} ne '') { - $cust_on = ' checked="checked" '; - $cust_off = ''; - if ($item eq 'archive') { - $curr_access = $userenv{'author'.$item}; - } - } elsif ($item eq 'archive') { - $curr_access = 0; - if (ref($domconfig{'authordefaults'}) eq 'HASH') { - $curr_access = $domconfig{'authordefaults'}{'archive'}; - } - } - } elsif ($item eq 'webdav') { - if ($userenv{'tools.'.$item} ne '') { - $cust_on = ' checked="checked" '; - $cust_off = ''; - } - } + } } elsif ($userenv{$context.'.'.$item} ne '') { $cust_on = ' checked="checked" '; $cust_off = ''; @@ -378,113 +311,37 @@ sub build_tools_display { if ($context eq 'requestcourses') { if ($userenv{$context.'.'.$item} eq '') { $custom_access = &mt('Currently from default setting.'); - $customsty = ' style="display:none;"'; } else { $custom_access = &mt('Currently from custom setting.'); - $customsty = ' style="display:block;"'; } } elsif ($context eq 'requestauthor') { if ($userenv{$context} eq '') { $custom_access = &mt('Currently from default setting.'); - $customsty = ' style="display:none;"'; - } else { - $custom_access = &mt('Currently from custom setting.'); - $customsty = ' style="display:block;"'; - } - } elsif ($item eq 'editors') { - if ($userenv{'author'.$item} eq '') { - if (ref($domconfig{'authordefaults'}{'editors'}) eq 'ARRAY') { - @defaulteditors = @{$domconfig{'authordefaults'}{'editors'}}; - } else { - @defaulteditors = ('edit','xml'); - } - $custom_access = &mt('Can use: [_1]', - join(', ', map { $lt{$_} } @defaulteditors)); - $editorsty = ' style="display:none;"'; } else { $custom_access = &mt('Currently from custom setting.'); - foreach my $editor (split(/,/,$userenv{'author'.$item})) { - if ($editor =~ /^(edit|daxe|xml)$/) { - push(@customeditors,$editor); - } - } - if (@customeditors) { - if (@customeditors > 1) { - $custom_access .= '
'; - } else { - $custom_access .= ' '; - } - $custom_access .= &mt('Can use: [_1]', - join(', ', map { $lt{$_} } @customeditors)). - ''; - } else { - $custom_access .= ' '.&mt('No available editors'); - } - $editorsty = ' style="display:block;"'; - } - } elsif ($item eq 'managers') { - my %ca_roles = &Apache::lonnet::get_my_roles($ccuname,$ccdomain,undef, - ['active','future'],['ca']); - if (keys(%ca_roles)) { - foreach my $entry (sort(keys(%ca_roles))) { - if ($entry =~ /^($match_username\:$match_domain):ca$/) { - my $user = $1; - unless ($user eq "$ccuname:$ccdomain") { - push(@possmanagers,$user); - } - } - } - } - if ($userenv{'author'.$item} eq '') { - $custom_access = &mt('Currently author manages co-author roles'); - } else { - if (keys(%ca_roles)) { - foreach my $user (split(/,/,$userenv{'author'.$item})) { - if ($user =~ /^($match_username):($match_domain)$/) { - if (exists($ca_roles{$user.':ca'})) { - unless ($user eq "$ccuname:$ccdomain") { - push(@custommanagers,$user); - } - } - } - } - } - if (@custommanagers) { - $custom_access = &mt('Co-authors who manage co-author roles: [_1]', - join(', ',@custommanagers)); - } else { - $custom_access = &mt('Currently author manages co-author roles'); - } } } else { - my $current = $userenv{$context.'.'.$item}; - if ($item eq 'webdav') { - $current = $userenv{'tools.webdav'}; - } elsif ($item eq 'archive') { - $current = $userenv{'author'.$item}; - } - if ($current eq '') { + if ($userenv{$context.'.'.$item} eq '') { $custom_access = &mt('Availability determined currently from default setting.'); if (!$curr_access) { $tool_off = 'checked="checked" '; $tool_on = ''; } - $customsty = ' style="display:none;"'; } else { $custom_access = &mt('Availability determined currently from custom setting.'); - if ($current == 0) { + if ($userenv{$context.'.'.$item} == 0) { $tool_off = 'checked="checked" '; $tool_on = ''; } - $customsty = ' style="display:inline;"'; } } $output .= ' '."\n". ' '.$lt{$item}.''."\n". ' '."\n". &Apache::loncommon::start_data_table_row()."\n"; + if (($context eq 'requestcourses') || ($context eq 'requestauthor')) { my ($curroption,$currlimit); my $envkey = $context.'.'.$item; @@ -510,11 +367,6 @@ sub build_tools_display { if (!$curroption) { $curroption = 'norequest'; } - my $name = 'crsreq_'.$item; - if ($context eq 'requestauthor') { - $name = $item; - } - $onclick = ' onclick="javascript:toggleCustom(this.form,'."'customtext_$item','custom$item'".');"'; if ($curroption =~ /^autolimit=(\d*)$/) { $currlimit = $1; if ($currlimit eq '') { @@ -525,7 +377,7 @@ sub build_tools_display { } else { $currdisp = $reqdisplay{$curroption}; } - $custdisp = '
'; + $custdisp = ''; foreach my $option (@options) { my $val = $option; if ($option eq 'norequest') { @@ -548,114 +400,53 @@ sub build_tools_display { $checked = ' checked="checked"'; } } - if ($option eq 'autolimit') { - $custdisp .= '
'; + my $name = 'crsreq_'.$item; + if ($context eq 'requestauthor') { + $name = $item; } - $custdisp .= ''."\n". - &Apache::loncommon::end_data_table_row()."\n"; - unless (&Apache::lonnet::allowed('udp',$ccdomain)) { - $output .= &Apache::loncommon::start_data_table_row()."\n". - ''. - $lt{'chse'}.': '.(' ' x3). - '
'. - '
'; - foreach my $editor ('edit','xml','daxe') { - my $checked; - if ($userenv{'author'.$item} eq '') { - if (grep(/^\Q$editor\E$/,@defaulteditors)) { - $checked = ' checked="checked"'; - } - } elsif (grep(/^\Q$editor\E$/,@customeditors)) { - $checked = ' checked="checked"'; - } - $output .= ' '; - } - $output .= '
'. - &Apache::loncommon::end_data_table_row()."\n"; - } - } elsif ($item eq 'managers') { - $output .= ''.$custom_access.''."\n". - &Apache::loncommon::end_data_table_row()."\n"; - unless ((&Apache::lonnet::allowed('udp',$ccdomain)) || - (($userenv{'domcoord.author'} eq 'blocked') && - (($env{'user.name'} ne $ccuname) || ($env{'user.domain'} ne $ccdomain)))) { - $output .= - &Apache::loncommon::start_data_table_row()."\n". - ''; - if (@possmanagers) { - $output .= &mt('Select manager(s)').': '; - foreach my $user (@possmanagers) { - my $checked; - if (grep(/^\Q$user\E$/,@custommanagers)) { - $checked = ' checked="checked"'; - } - $output .= ' '; - } - } else { - $output .= &mt('No co-author roles assignable as manager'); - } - $output .= ''. - &Apache::loncommon::end_data_table_row()."\n"; + $custdisp .= ''; } + $custdisp .= '
 '; if ($option eq 'autolimit') { $custdisp .= ' '. - $reqtitles{'unlimited'}.''; + 'value="'.$currlimit.'" />
'. + $reqtitles{'unlimited'}; } else { $custdisp .= ''; } - $custdisp .= ' '; - } - $custdisp .= ''; - $custradio = '
'.$custdisp; - } elsif ($item eq 'editors') { - $output .= ''.$custom_access.'
'; + $custradio = ''.&mt('Custom setting').'
'.$custdisp; } else { $currdisp = ($curr_access?&mt('Yes'):&mt('No')); my $name = $context.'_'.$item; - $onclick = 'onclick="javascript:toggleCustom(this.form,'."'customtext_$item','custom$item'".');" '; + if ($context eq 'requestauthor') { + $name = $context; + } $custdisp = '  '; - $custradio = ''. - '--'.$lt{'cusa'}.': '.$custdisp.''; - } - unless (($item eq 'editors') || ($item eq 'managers')) { - $output .= ' '.$custom_access.(' 'x4). - $lt{'avai'}.': '.$currdisp.''."\n". - &Apache::loncommon::end_data_table_row()."\n"; - unless (&Apache::lonnet::allowed('udp',$ccdomain)) { - $output .= + $tool_off.'/>'.&mt('Off').''; + $custradio = (' 'x2).'--'.$lt{'cusa'}.': '.$custdisp. + ''; + } + $output .= ' '.$custom_access.(' 'x4). + $lt{'avai'}.': '.$currdisp.''."\n". + &Apache::loncommon::end_data_table_row()."\n"; + unless (&Apache::lonnet::allowed('udp',$ccdomain)) { + $output .= &Apache::loncommon::start_data_table_row()."\n". - ''. + ' '. $lt{'chse'}.': '.(' ' x3). + $cust_off.'/>'.$lt{'usde'}.''.(' ' x3). ''; - if ($colspan) { - $output .= ''; - } - $output .= $custradio.''. - &Apache::loncommon::end_data_table_row()."\n"; - } + $cust_on.'/>'.$lt{'uscu'}.''.$custradio.''. + &Apache::loncommon::end_data_table_row()."\n"; } } return $output; @@ -669,12 +460,14 @@ sub coursereq_externaluser { 'unofficial' => 'Can request creation of unofficial courses', 'community' => 'Can request creation of communities', 'textbook' => 'Can request creation of textbook courses', + 'placement' => 'Can request creation of placement tests', ); %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'reqcrsotherdom.official','reqcrsotherdom.unofficial', - 'reqcrsotherdom.community','reqcrsotherdom.textbook'); - @usertools = ('official','unofficial','community','textbook'); + 'reqcrsotherdom.community','reqcrsotherdom.textbook', + 'reqcrsotherdom.placement'); + @usertools = ('official','unofficial','community','textbook','placement'); @options = ('approval','validate','autolimit'); %validations = &Apache::lonnet::auto_courserequest_checks($cdom); my $optregex = join('|',@options); @@ -741,7 +534,7 @@ sub coursereq_externaluser { sub domainrole_req { my ($ccuname,$ccdomain) = @_; return '

'. - &mt('Can Request Assignment of Domain Roles?'). + &mt('User Can Request Assignment of Domain Roles?'). '

'."\n". &Apache::loncommon::start_data_table(). &build_tools_display($ccuname,$ccdomain, @@ -749,24 +542,14 @@ sub domainrole_req { &Apache::loncommon::end_data_table(); } -sub authoring_defaults { - my ($ccuname,$ccdomain) = @_; - return '

'. - &mt('Authoring Space defaults (if role assigned)'). - '

'."\n". - &Apache::loncommon::start_data_table(). - &build_tools_display($ccuname,$ccdomain, - 'authordefaults'). - &user_quotas($ccuname,$ccdomain,'author'). - &Apache::loncommon::end_data_table(); -} - sub courserequest_titles { my %titles = &Apache::lonlocal::texthash ( official => 'Official', unofficial => 'Unofficial', community => 'Communities', textbook => 'Textbook', + placement => 'Placement Tests', + lti => 'LTI Provider', norequest => 'Not allowed', approval => 'Approval by Dom. Coord.', validate => 'With validation', @@ -1110,7 +893,15 @@ ENDBLOCK (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) { my $defdom=$env{'request.role.domain'}; - my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); + my ($trusted,$untrusted); + if ($context eq 'course') { + ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$defdom); + } elsif ($context eq 'author') { + ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('othcoau',$defdom); + } elsif ($context eq 'domain') { + ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('domroles',$defdom); + } + my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain',undef,undef,undef,$trusted,$untrusted); my %lt=&Apache::lonlocal::texthash( 'enro' => 'Enroll one student', 'enrm' => 'Enroll one member', @@ -1471,9 +1262,8 @@ sub print_user_modification_page { my $groupslist = &Apache::lonuserutils::get_groupslist(); - my $js = &validation_javascript($context,$ccdomain,$pjump_def, - $crstype,$groupslist,$newuser, - $formname,\%loaditem,$permission); + my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype, + $groupslist,$newuser,$formname,\%loaditem); my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain); my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'singlestudent') { @@ -1482,7 +1272,6 @@ sub print_user_modification_page { $helpitem = 'Author_Change_Privileges'; } elsif ($context eq 'domain') { $helpitem = 'Domain_Change_Privileges'; - $js .= &set_custom_js(); } push (@{$brcrum}, {href => "javascript:backPage($form)", @@ -1508,32 +1297,6 @@ sub print_user_modification_page { if ($env{'form.popup'}) { $args->{'no_nav_bar'} = 1; } - if (($context eq 'domain') && ($env{'request.role.domain'} eq $ccdomain)) { - my @toggles; - if (&Apache::lonnet::allowed('cau',$ccdomain)) { - my ($isadv,$isauthor) = - &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); - unless ($isauthor) { - push(@toggles,'requestauthor'); - } - push(@toggles,('webdav','editors','archive')); - } - if (&Apache::lonnet::allowed('mut',$ccdomain)) { - push(@toggles,('aboutme','blog','portfolio','portaccess','timezone')); - } - if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { - push(@toggles,('official','unofficial','community','textbook')); - } - if (@toggles) { - my $onload; - foreach my $item (@toggles) { - $onload .= "toggleCustom(document.cu,'customtext_$item','custom$item');"; - } - $args->{'add_entries'} = { - 'onload' => $onload, - }; - } - } my $start_page = &Apache::loncommon::start_page('User Management',$js,$args); @@ -1570,36 +1333,18 @@ ENDFORMINFO } } my $title = ''; - my $need_quota_js; if ($newuser) { my ($portfolioform,$domroleform); if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) || (&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) { # Current user has quota or user tools modification privileges - $portfolioform = '

'. - &mt('User Tools'). - '

'."\n". - &Apache::loncommon::start_data_table(); - if (&Apache::lonnet::allowed('mut',$ccdomain)) { - $portfolioform .= &build_tools_display($ccuname,$ccdomain,'tools'); - } - if (&Apache::lonnet::allowed('mpq',$ccdomain)) { - $portfolioform .= &user_quotas($ccuname,$ccdomain,'portfolio'); - $need_quota_js = 1; - } - $portfolioform .= &Apache::loncommon::end_data_table(); + $portfolioform = '
'.&user_quotas($ccuname,$ccdomain); } if ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) && ($ccdomain eq $env{'request.role.domain'})) { - $domroleform = &domainrole_req($ccuname,$ccdomain). - &authoring_defaults($ccuname,$ccdomain); - $need_quota_js = 1; - } - my $readonly; - unless ($permission->{'cusr'}) { - $readonly = 1; + $domroleform = '
'.&domainrole_req($ccuname,$ccdomain); } - &initialize_authen_forms($ccdomain,$formname,'','',$readonly); + &initialize_authen_forms($ccdomain,$formname); my %lt=&Apache::lonlocal::texthash( 'lg' => 'Login Data', 'hs' => "Home Server", @@ -1630,7 +1375,7 @@ ENDTITLE $r->print('

'.$title.'

'."\n"); $r->print('
'); $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context, - $inst_results{$ccuname.':'.$ccdomain},$readonly)); + $inst_results{$ccuname.':'.$ccdomain})); # Option to disable student/employee ID conflict checking not offerred for new users. my ($home_server_pick,$numlib) = &Apache::loncommon::home_server_form_item($ccdomain,'hserver', @@ -1645,7 +1390,7 @@ $lt{'hs'}: $home_server_pick } if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { $r->print('

'. - &mt('Can Request Creation of Courses/Communities in this Domain?').'

'. + &mt('User Can Request Creation of Courses/Communities in this Domain?').''. &Apache::loncommon::start_data_table(). &build_tools_display($ccuname,$ccdomain, 'requestcourses'). @@ -1741,55 +1486,45 @@ ENDAUTH $inst_results{$ccuname.':'.$ccdomain})); if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) { - $r->print('

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

'."\n". - &Apache::loncommon::start_data_table()); - if ($env{'request.role.domain'} eq $ccdomain) { - $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); + $r->print('

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

'."\n"); + if (($env{'request.role.domain'} eq $ccdomain) || + (&Apache::lonnet::will_trust('reqcrs',$ccdomain,$env{'request.role.domain'}))) { + $r->print(&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()); } else { - $r->print(&coursereq_externaluser($ccuname,$ccdomain, - $env{'request.role.domain'})); + $r->print(&mt('Domain configuration for this domain prohibits course creation by users from domain: "[_1]"', + &Apache::lonnet::domain($ccdomain,'description'))); } - $r->print(&Apache::loncommon::end_data_table()); } $r->print('
'); - my @order = ('auth','quota','tools','requestauthor','authordefaults'); + my @order = ('auth','quota','tools','requestauthor'); my %user_text; my ($isadv,$isauthor) = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); - if (((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) || + if ((!$isauthor) && + ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) || (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) && - ($env{'request.role.domain'} eq $ccdomain)) { - if (!$isauthor) { - $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); - } - $user_text{'authordefaults'} = &authoring_defaults($ccuname,$ccdomain); - if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) { - $need_quota_js = 1; - } + ($env{'request.role.domain'} eq $ccdomain)) { + $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); } $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission); if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || (&Apache::lonnet::allowed('mut',$ccdomain)) || (&Apache::lonnet::allowed('udp',$ccdomain))) { - $user_text{'quota'} = '

'.&mt('User Tools').'

'."\n". - &Apache::loncommon::start_data_table(); - if ((&Apache::lonnet::allowed('mut',$ccdomain)) || - (&Apache::lonnet::allowed('udp',$ccdomain))) { - $user_text{'quota'} .= &build_tools_display($ccuname,$ccdomain,'tools'); - } # Current user has quota modification privileges - if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || - (&Apache::lonnet::allowed('udp',$ccdomain))) { - $user_text{'quota'} .= &user_quotas($ccuname,$ccdomain,'portfolio'); - $need_quota_js = 1; - } - $user_text{'quota'} .= &Apache::loncommon::end_data_table(); + $user_text{'quota'} = &user_quotas($ccuname,$ccdomain); } if (!&Apache::lonnet::allowed('mpq',$ccdomain)) { if (&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) { my %lt=&Apache::lonlocal::texthash( - 'dska' => "Disk quotas for user's portfolio", - 'youd' => "You do not have privileges to modify the portfolio quota for this user.", + 'dska' => "Disk quotas for user's portfolio and Authoring Space", + 'youd' => "You do not have privileges to modify the portfolio and/or Authoring Space quotas for this user.", 'ichr' => "If a change is required, contact a domain coordinator for the domain", ); $user_text{'quota'} = < "User Tools Availability", - 'yodo' => "You do not have privileges to modify Portfolio, Blog, Personal Information Page, or Time Zone settings for this user.", + 'yodo' => "You do not have privileges to modify Portfolio, Blog, WebDAV, or Personal Information Page settings for this user.", 'ifch' => "If a change is required, contact a domain coordinator for the domain", ); $user_text{'tools'} = <print(' onclick="auth_check()" \>'."\n"); } else { - $r->print(' onclick="this.form.submit()" \>'."\n"); + $r->print('onclick="this.form.submit()" \>'."\n"); } } else { $r->print('
'. @@ -1900,9 +1635,6 @@ ENDNOTOOLSPRIV $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain'])); $r->print(''); $r->print('

'); - if ($need_quota_js) { - $r->print(&user_quota_js()); - } return; } @@ -1961,16 +1693,14 @@ sub date_sections_select { sub validation_javascript { my ($context,$ccdomain,$pjump_def,$crstype,$groupslist,$newuser,$formname, - $loaditem,$permission) = @_; + $loaditem) = @_; my $dc_setcourse_code = ''; my $nondc_setsection_code = ''; if ($context eq 'domain') { - if ((ref($permission) eq 'HASH') && ($permission->{'cusr'})) { - my $dcdom = $env{'request.role.domain'}; - $loaditem->{'onload'} = "document.cu.coursedesc.value='';"; - $dc_setcourse_code = - &Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context); - } + my $dcdom = $env{'request.role.domain'}; + $loaditem->{'onload'} = "document.cu.coursedesc.value='';"; + $dc_setcourse_code = + &Apache::lonuserutils::dc_setcourse_js('cu','singleuser',$context); } else { my $checkauth; if (($newuser) || (&Apache::lonnet::allowed('mau',$ccdomain))) { @@ -2042,12 +1772,7 @@ sub display_existing_roles { next unless (($rnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) && ($rdom eq $env{'course.'.$env{'request.course.id'}.'.domain'})); } elsif ($context eq 'author') { - if ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) { - my ($audom,$auname) = ($1,$2); - next unless (($rnum eq $auname) && ($rdom eq $audom)); - } else { - next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'})); - } + next unless (($rnum eq $env{'user.name'}) && ($rdom eq $env{'request.role.domain'})); } my ($newkey,$newvalue,$newrole); $newkey = '/'.$rdom.'/'.$rnum; @@ -2207,8 +1932,6 @@ sub display_existing_roles { $area=~m{/($match_domain)/($match_username)}; if (&Apache::lonuserutils::authorpriv($2,$1)) { $allowed=1; - } elsif (&Apache::lonuserutils::coauthorpriv($2,$1)) { - $allowed=1; } else { $allowed=0; } @@ -2311,9 +2034,6 @@ sub display_existing_roles { } } elsif ($env{'request.role'} =~ /^au\./) { $contextrole = &mt('Existing Co-Author Roles in your Authoring Space'); - } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)/$}) { - $contextrole = &mt('Existing Co-Author Roles in [_1] Authoring Space', - ''.$1.'_'.$2.''); } else { if ($showall) { $contextrole = &mt('Existing Roles in this Domain'); @@ -2355,25 +2075,13 @@ sub new_coauthor_roles { # # Co-Author # - my ($cuname,$cudom); - if (($env{'request.role'} eq "au./$env{'user.domain'}/") || - ($env{'request.role'} eq "dc./$env{'user.domain'}/")) { - $cuname=$env{'user.name'}; - $cudom=$env{'request.role.domain'}; + if (&Apache::lonuserutils::authorpriv($env{'user.name'}, + $env{'request.role.domain'}) && + ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) { # No sense in assigning co-author role to yourself - if ((&Apache::lonuserutils::authorpriv($cuname,$cudom)) && - ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain)) { - $addrolesdisplay = 1; - } - } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) { - ($cudom,$cuname) = ($1,$2); - if ((&Apache::lonuserutils::coauthorpriv($cuname,$cudom)) && - ($env{'user.name'} ne $ccuname || $env{'user.domain'} ne $ccdomain) && - ($cudom ne $ccdomain || $cuname ne $ccuname)) { - $addrolesdisplay = 1; - } - } - if ($addrolesdisplay) { + $addrolesdisplay = 1; + my $cuname=$env{'user.name'}; + my $cudom=$env{'request.role.domain'}; my %lt=&Apache::lonlocal::texthash( 'cs' => "Authoring Space", 'act' => "Activate", @@ -2428,17 +2136,6 @@ sub new_coauthor_roles { ($env{'user.domain'} eq $ccdomain)) { $r->print(&mt('Assigning yourself a co-author or assistant co-author role in your own author area in Authoring Space is not permitted')); } - } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) { - if (!(&Apache::lonuserutils::coauthorpriv($2,$1))) { - $r->print(''. - &mt('You do not have privileges to assign co-author roles.'). - ''); - } elsif (($env{'user.name'} eq $ccuname) && - ($env{'user.domain'} eq $ccdomain)) { - $r->print(&mt('Assigning yourself a co-author or assistant co-author role in an author area in Authoring Space in which you already have a co-author role is not permitted')); - } elsif (($cudom eq $ccdomain) && ($cuname eq $ccuname)) { - $r->print(&mt("Assigning a co-author or assistant co-author role to an Authoring Space's author is not permitted")); - } } return $addrolesdisplay;; } @@ -2459,11 +2156,20 @@ sub new_domain_roles { ''.&mt('Start').''.&mt('End').''. &Apache::loncommon::end_data_table_header_row(); my @allroles = &Apache::lonuserutils::roles_by_context('domain'); + my $uprimary = &Apache::lonnet::domain($env{'request.role.domain'},'primary'); + my $uintdom = &Apache::lonnet::internet_dom($uprimary); foreach my $thisdomain (sort(&Apache::lonnet::all_domains())) { foreach my $role (@allroles) { next if ($role eq 'ad'); next if (($role eq 'au') && ($ccdomain ne $thisdomain)); if (&Apache::lonnet::allowed('c'.$role,$thisdomain)) { + if ($role eq 'dc') { + unless ($thisdomain eq $env{'request.role.domain'}) { + my $domprim = &Apache::lonnet::domain($thisdomain,'primary'); + my $intdom = &Apache::lonnet::internet_dom($domprim); + next unless ($uintdom eq $intdom); + } + } my $plrole=&Apache::lonnet::plaintext($role); my %lt=&Apache::lonlocal::texthash( 'ssd' => "Set Start Date", @@ -2505,7 +2211,7 @@ sub user_authentication { 'ld' => "Login Data" ); # Check for a bad authentication type - if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { + if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth|lti):/) { # bad authentication scheme if (&Apache::lonnet::allowed('mau',$ccdomain)) { &initialize_authen_forms($ccdomain,$formname); @@ -2532,6 +2238,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}. ENDBADAUTH } } else { # Authentication type is valid + &initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser'); my ($authformcurrent,$can_modify,@authform_others) = &modify_login_block($ccdomain,$currentauth); @@ -2620,6 +2327,8 @@ ENDJS $result = &mt('Currently using local (institutional) authentication.'); } elsif ($currentauth =~ /^unix:/) { $result = &mt('Currently Filesystem Authenticated.'); + } elsif ($currentauth =~ /^lti:/) { + $result = &mt('Currently LTI authenticated.'); } $outcome = '

'.$lt{'ld'}.'

'. &Apache::loncommon::start_data_table(). @@ -2658,6 +2367,9 @@ sub modify_login_block { if ($can_assign{'loc'}) { push(@authform_others,$authformloc); } + if ($can_assign{'lti'}) { + push(@authform_others,$authformlti); + } if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { $show_override_msg = 1; } @@ -2669,6 +2381,9 @@ sub modify_login_block { if ($can_assign{'loc'}) { push(@authform_others,$authformloc); } + if ($can_assign{'lti'}) { + push(@authform_others,$authformlti); + } if ($can_assign{'int'}) { $show_override_msg = 1; } @@ -2683,6 +2398,9 @@ sub modify_login_block { if ($can_assign{'loc'}) { push(@authform_others,$authformloc); } + if ($can_assign{'lti'}) { + push(@authform_others,$authformlti); + } if ($can_assign{'fsys'}) { $show_override_msg = 1; } @@ -2694,9 +2412,23 @@ sub modify_login_block { if ($can_assign{'int'}) { push(@authform_others,$authformint); } + if ($can_assign{'lti'}) { + push(@authform_others,$authformlti); + } if ($can_assign{'loc'}) { $show_override_msg = 1; } + } elsif ($currentauth=~/^lti:/) { + $authformcurrent=$authformlti; + if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { + push(@authform_others,$authformkrb); + } + if ($can_assign{'int'}) { + push(@authform_others,$authformint); + } + if ($can_assign{'loc'}) { + push(@authform_others,$authformloc); + } } if ($show_override_msg) { $authformcurrent = '\n"); + $r->print("\n\n"); + $r->print("'.&Apache::loncommon::end_data_table_row() .&Apache::loncommon::end_data_table(); @@ -7530,7 +6649,6 @@ sub visible_in_stdcat { } sub cat_visibility { - my ($cdom) = @_; my %visactions = &Apache::lonlocal::texthash( vis => 'This course/community currently appears in the Course/Community 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.', @@ -7543,24 +6661,13 @@ sub cat_visibility { dc_chgconf => 'Ask a domain coordinator to change the Catalog type for this domain.', dc_setcode => 'Ask a domain coordinator to assign a six character code to the course', dc_unhide => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.', - dc_addinst => 'Ask a domain coordinator to enable catalog display of "Official courses (with institutional codes)".', + dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".', dc_instcode => 'Ask a domain coordinator to assign an institutional code (if this is an official course).', dc_catalog => 'Ask a domain coordinator to enable or create at least one course category in the domain.', dc_categories => 'Ask a domain coordinator to create a hierarchy of categories and sub categories for courses in the domain.', dc_chgcat => 'Ask a domain coordinator to change the category assigned to the course, as the one currently assigned is no longer used in the domain', dc_addcat => 'Ask a domain coordinator to assign a category to the course.', ); - if ($env{'request.role'} eq "dc./$cdom/") { - $visactions{'dc_chgconf'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the Catalog type for this domain.','»'); - $visactions{'dc_setcode'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to assign a six character code to the course.','»'); - $visactions{'dc_unhide'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to change the "Exclude from course catalog" setting.','»'); - $visactions{'dc_addinst'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable catalog display of "Official courses (with institutional codes)".','»'); - $visactions{'dc_instcode'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify course owner, institutional code ... " to assign an institutional code (if this is an official course).','»'); - $visactions{'dc_catalog'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to enable or create at least one course category in the domain.','»'); - $visactions{'dc_categories'} = &mt('Use: "Main menu" [_1] "Set domain configuration" [_1] "Cataloging of courses/communities" to create a hierarchy of categories and sub categories for courses in the domain.','»'); - $visactions{'dc_chgcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','»'); - $visactions{'dc_addcat'} = &mt('Use: "Main menu" [_1] "View or modify a course or community" [_1] "View/Modify catalog settings for course" to assign a category to the course.','»'); - } $visactions{'unhide'} = &mt('Use [_1]Categorize course[_2] to change the "Exclude from course catalog" setting.','','"'); $visactions{'chgcat'} = &mt('Use [_1]Categorize course[_2] to change the category assigned to the course, as the one currently assigned is no longer used in the domain.','"','"'); $visactions{'addcat'} = &mt('Use [_1]Categorize course[_2] to assign a category to the course.','"','"'); @@ -7686,11 +6793,9 @@ sub print_userchangelogs_display { &Apache::loncommon::restore_course_settings('roles_log', \%saveable_parameters); } elsif ($context eq 'author') { - $domain = $env{'user.domain'}; + $domain = $env{'user.domain'}; if ($env{'request.role'} =~ m{^au\./\Q$domain\E/$}) { $username = $env{'user.name'}; - } elsif ($env{'request.role'} =~ m{^ca\./($match_domain)/($match_username)$}) { - ($domain,$username) = ($1,$2); } else { undef($domain); } @@ -8367,7 +7472,7 @@ sub role_display_filter { } elsif ($context eq 'domain') { @posscontexts = ('any','domain','requestauthor','domconfig','server'); } else { - @posscontexts = ('any','author','coauthor','domain'); + @posscontexts = ('any','author','domain'); } foreach my $chgtype (@posscontexts) { my $selstr = ''; @@ -8438,7 +7543,6 @@ sub rolechg_contexts { any => 'Any', domain => 'User Management in domain', author => 'User Management by author', - coauthor => 'User Management by coauthor', ); } return %lt; @@ -9478,7 +8582,7 @@ sub user_search_result { my $domd_chk = &domdirectorysrch_check($srch); $response .= ''.$instd_chk.'
'; if ($domd_chk eq 'ok') { - $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'); + $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'); } $response .= '
'; } @@ -9489,7 +8593,7 @@ sub user_search_result { my $instd_chk = &instdirectorysrch_check($srch); $response .= ''.$domd_chk.'
'; if ($instd_chk eq 'ok') { - $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.'); + $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.'); } $response .= '
'; } @@ -9590,7 +8694,7 @@ sub user_search_result { $response = ''. &mt('Institutional directory search is not available in domain: [_1]',$showdom). '
'. - &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). + &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'). '
'; } } @@ -9663,7 +8767,7 @@ sub user_search_result { $response = ''. &mt('Institutional directory search is not available in domain: [_1]',$showdom). '
'. - &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). + &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.'). '
'; } } @@ -10183,7 +9287,7 @@ sub course_level_dc { ENDTIMEENTRY $otheritems .= &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table()."\n"; - return $cb_jscript.$hiddenitems.$header.$otheritems; + return $cb_jscript.$header.$hiddenitems.$otheritems; } sub update_selfenroll_config { @@ -10519,7 +9623,7 @@ sub update_selfenroll_config { } else { $r->print(&mt('No changes were made to the existing self-enrollment settings in this course.')); } - my $visactions = &cat_visibility($cdom); + my $visactions = &cat_visibility(); my ($cathash,%cattype); my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); if (ref($domconfig{'coursecategories'}) eq 'HASH') {
'.$authformcurrent. @@ -2711,9 +2443,9 @@ sub modify_login_block { } sub personal_data_display { - my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$readonly,$rolesarray,$now, + my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now, $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_; - my ($output,%userenv,%canmodify,%canmodify_status,$disabled); + my ($output,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); my $rowcount = 0; @@ -2782,8 +2514,6 @@ sub personal_data_display { %canmodify = &selfcreate_canmodify($context,$ccdomain,\@userinfo, $inst_results,$rolesarray); } - } elsif ($readonly) { - $disabled = ' disabled="disabled"'; } my $genhelp=&Apache::loncommon::help_open_topic('Generation'); @@ -2797,7 +2527,7 @@ sub personal_data_display { } else { undef($condition); } - } + } if ($excluded) { unless ($excluded =~ /^\@[^\@]+$/) { undef($condition); @@ -2837,7 +2567,7 @@ sub personal_data_display { $upasstwo. &Apache::lonhtmlcommon::row_closure()."\n"; if ($usernameset eq 'free') { - my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; + my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n". ''.&mt('Use e-mail address: '). '$lt{$item}\n"); - unless ($item eq 'managers') { - $r->print($oldsetting->{$item}); - } + $r->print("$lt{$item}".$oldsetting->{$item}); if ($oldsettingtext->{$item}) { if ($oldsetting->{$item}) { - unless ($item eq 'managers') { - $r->print(' -- '); - } + $r->print(' -- '); } $r->print($oldsettingtext->{$item}); } - $r->print(""); - unless ($item eq 'managers') { - $r->print($newsetting->{$item}); - } + $r->print("".$newsetting->{$item}); if ($newsettingtext->{$item}) { if ($newsetting->{$item}) { - unless ($item eq 'managers') { - $r->print(' -- '); - } + $r->print(' -- '); } $r->print($newsettingtext->{$item}); } @@ -4261,11 +3814,6 @@ sub tool_changes { } return; } - my %tooldesc = &Apache::lonlocal::texthash( - 'edit' => 'Standard editor (Edit)', - 'xml' => 'Text editor (EditXML)', - 'daxe' => 'Daxe editor (Daxe)', - ); foreach my $tool (@{$usertools}) { my ($newval,$limit,$envkey); $envkey = $context.'.'.$tool; @@ -4279,54 +3827,6 @@ sub tool_changes { } elsif ($context eq 'requestauthor') { $newval = $env{'form.'.$context}; $envkey = $context; - } elsif ($context eq 'authordefaults') { - if ($tool eq 'editors') { - $envkey = 'authoreditors'; - if ($env{'form.customeditors'} == 1) { - my @editors; - my @posseditors = &Apache::loncommon::get_env_multiple('form.custom_editor'); - if (@posseditors) { - foreach my $editor (@posseditors) { - if (grep(/^\Q$editor\E$/,@posseditors)) { - unless (grep(/^\Q$editor\E$/,@editors)) { - push(@editors,$editor); - } - } - } - } - if (@editors) { - $newval = join(',',(sort(@editors))); - } - } - } elsif ($tool eq 'managers') { - $envkey = 'authormanagers'; - my @possibles = &Apache::loncommon::get_env_multiple('form.custommanagers'); - if (@possibles) { - my %ca_roles = &Apache::lonnet::get_my_roles($env{'form.ccuname'},$env{'form.ccdomain'}, - undef,['active','future'],['ca']); - if (keys(%ca_roles)) { - my @custommanagers; - foreach my $user (@possibles) { - if ($user =~ /^($match_username):($match_domain)$/) { - if (exists($ca_roles{$user.':ca'})) { - unless ($user eq $env{'form.ccuname'}.':'.$env{'form.ccdomain'}) { - push(@custommanagers,$user); - } - } - } - } - if (@custommanagers) { - $newval = join(',',sort(@custommanagers)); - } - } - } - } elsif ($tool eq 'webdav') { - $envkey = 'tools.webdav'; - $newval = $env{'form.'.$context.'_'.$tool}; - } elsif ($tool eq 'archive') { - $envkey = 'authorarchive'; - $newval = $env{'form.'.$context.'_'.$tool}; - } } else { $newval = $env{'form.'.$context.'_'.$tool}; } @@ -4345,25 +3845,6 @@ sub tool_changes { } else { $oldaccesstext->{$tool} = &mt("availability set to 'off'"); } - } elsif ($context eq 'authordefaults') { - if ($tool eq 'managers') { - if ($userenv->{$envkey} eq '') { - $oldaccesstext->{$tool} = &mt('Only author may manage co-author roles'); - } else { - my $managers = $userenv->{$envkey}; - $managers =~ s/,/, /g; - $oldaccesstext->{$tool} = $managers; - } - } elsif ($tool eq 'editors') { - $oldaccesstext->{$tool} = &mt('can use: [_1]', - join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey}))); - } elsif (($tool eq 'webdav') || ($tool eq 'archive')) { - if ($userenv->{$envkey}) { - $oldaccesstext->{$tool} = &mt("availability set to 'on'"); - } else { - $oldaccesstext->{$tool} = &mt("availability set to 'off'"); - } - } } else { if ($userenv->{$envkey}) { $oldaccesstext->{$tool} = &mt("availability set to 'on'"); @@ -4372,8 +3853,7 @@ sub tool_changes { } } $changeHash->{$envkey} = $userenv->{$envkey}; - if (($env{'form.custom'.$tool} == 1) || - (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) { + if ($env{'form.custom'.$tool} == 1) { if ($newval ne $userenv->{$envkey}) { $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, $context); @@ -4391,25 +3871,6 @@ sub tool_changes { } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); } - } elsif ($context eq 'authordefaults') { - if ($tool eq 'editors') { - $newaccesstext->{$tool} = &mt('can use: [_1]', - join(', ', map { $tooldesc{$_} } split(/,/,$changeHash->{$envkey}))); - } elsif ($tool eq 'managers') { - if ($changeHash->{$envkey} eq '') { - $newaccesstext->{$tool} = &mt('Only author may manage co-author roles'); - } else { - my $managers = $changeHash->{$envkey}; - $managers =~ s/,/, /g; - $newaccesstext->{$tool} = $managers; - } - } elsif (($tool eq 'webdav') || ($tool eq 'archive')) { - if ($newval) { - $newaccesstext->{$tool} = &mt("availability set to 'on'"); - } else { - $newaccesstext->{$tool} = &mt("availability set to 'off'"); - } - } } else { if ($newval) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); @@ -4420,36 +3881,17 @@ sub tool_changes { } else { $newaccess->{$tool} = $oldaccess->{$tool}; if (($context eq 'requestcourses') || ($context eq 'requestauthor')) { - if ($userenv->{$envkey} =~ /^autolimit/) { + if ($newval =~ /^autolimit/) { if ($limit) { $newaccesstext->{$tool} = &mt('available with automatic approval, up to limit of [quant,_1,request] per user',$limit); } else { $newaccesstext->{$tool} = &mt('available with automatic approval (unlimited)'); } - } elsif ($userenv->{$envkey}) { - $newaccesstext->{$tool} = $reqdisplay{$userenv->{$envkey}}; + } elsif ($newval) { + $newaccesstext->{$tool} = $reqdisplay{$newval}; } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); } - } elsif ($context eq 'authordefaults') { - if ($tool eq 'editors') { - $newaccesstext->{$tool} = &mt('can use: [_1]', - join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey}))); - } elsif ($tool eq 'managers') { - if ($userenv->{$envkey} eq '') { - $newaccesstext->{$tool} = &mt('Only author may manage co-author roles'); - } else { - my $managers = $userenv->{$envkey}; - $managers =~ s/,/, /g; - $newaccesstext->{$tool} = $managers; - } - } elsif (($tool eq 'webdav') || ($tool eq 'archive')) { - if ($userenv->{$envkey}) { - $newaccesstext->{$tool} = &mt("availability set to 'on'"); - } else { - $newaccesstext->{$tool} = &mt("availability set to 'off'"); - } - } } else { if ($userenv->{$context.'.'.$tool}) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); @@ -4480,25 +3922,6 @@ sub tool_changes { } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); } - } elsif ($context eq 'authordefaults') { - if ($tool eq 'editors') { - $newaccesstext->{$tool} = &mt('can use: [_1]', - join(', ', map { $tooldesc{$_} } split(/,/,$newval))); - } elsif ($tool eq 'managers') { - if ($newval eq '') { - $newaccesstext->{$tool} = &mt('Only author may manage co-author roles'); - } else { - my $managers = $newval; - $managers =~ s/,/, /g; - $newaccesstext->{$tool} = $managers; - } - } elsif (($tool eq 'webdav') || ($tool eq 'archive')) { - if ($newval) { - $newaccesstext->{$tool} = &mt("availability set to 'on'"); - } else { - $newaccesstext->{$tool} = &mt("availability set to 'off'"); - } - } } else { if ($userenv->{$context.'.'.$tool}) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); @@ -4510,8 +3933,7 @@ sub tool_changes { } } else { $oldaccess->{$tool} = &mt('default'); - if (($env{'form.custom'.$tool} == 1) || - (($context eq 'authordefaults') && ($tool eq 'managers') && ($newval ne ''))) { + if ($env{'form.custom'.$tool} == 1) { $changed->{$tool} = &tool_admin($tool,$newval,$changeHash, $context); if ($changed->{$tool}) { @@ -4528,25 +3950,6 @@ sub tool_changes { } else { $newaccesstext->{$tool} = &mt("availability set to 'off'"); } - } elsif ($context eq 'authordefaults') { - if ($tool eq 'managers') { - if ($newval eq '') { - $newaccesstext->{$tool} = &mt('Only author may manage co-author roles'); - } else { - my $managers = $newval; - $managers =~ s/,/, /g; - $newaccesstext->{$tool} = $managers; - } - } elsif ($tool eq 'editors') { - $newaccesstext->{$tool} = &mt('can use: [_1]', - join(', ', map { $tooldesc{$_} } split(/,/,$newval))); - } elsif (($tool eq 'webdav') || ($tool eq 'archive')) { - if ($newval) { - $newaccesstext->{$tool} = &mt("availability set to 'on'"); - } else { - $newaccesstext->{$tool} = &mt("availability set to 'off'"); - } - } } else { if ($newval) { $newaccesstext->{$tool} = &mt("availability set to 'on'"); @@ -5041,10 +4444,6 @@ sub tool_admin { if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) { $canchange = 1; } - } elsif ($context eq 'authordefaults') { - if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) { - $canchange = 1; - } } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { # Current user has quota modification privileges $canchange = 1; @@ -5055,10 +4454,6 @@ sub tool_admin { $toolchanged = 1; if ($tool eq 'requestauthor') { $changeHash->{$context} = $settool; - } elsif (($tool eq 'managers') || ($tool eq 'editors') || ($tool eq 'archive')) { - $changeHash->{'author'.$tool} = $settool; - } elsif ($tool eq 'webdav') { - $changeHash->{'tools.'.$tool} = $settool; } else { $changeHash->{$context.'.'.$tool} = $settool; } @@ -5301,164 +4696,6 @@ sub set_custom_role { ); } -sub display_coauthor_managers { - my ($permission) = @_; - my $output; - if ((ref($permission) eq 'HASH') && ($permission->{'author'})) { - $output = '
'. - ''."\n". - '

'; - my (@possmanagers,@custommanagers); - my %userenv = - &Apache::lonnet::userenvironment($env{'user.domain'}, - $env{'user.name'}, - 'authormanagers'); - my %ca_roles = &Apache::lonnet::get_my_roles(undef,undef,undef, - ['active','future'],['ca']); - if (keys(%ca_roles)) { - foreach my $entry (sort(keys(%ca_roles))) { - if ($entry =~ /^($match_username\:$match_domain):ca$/) { - my $user = $1; - unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) { - push(@possmanagers,$user); - } - } - } - } - if ($userenv{'authormanagers'} eq '') { - $output .= &mt('Currently author manages co-author roles'); - } else { - if (keys(%ca_roles)) { - foreach my $user (split(/,/,$userenv{'authormanagers'})) { - if ($user =~ /^($match_username)\:($match_domain)$/) { - if (exists($ca_roles{$user.':ca'})) { - unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) { - push(@custommanagers,$user); - } - } - } - } - } - if (@custommanagers) { - $output .= &mt('Co-authors with active or future roles who currently manage co-author roles: [_1]', - '
'.join(', ',map { &Apache::loncommon::plainname(split(':',$_))." ($_)"; } @custommanagers)); - } else { - $output .= &mt('Currently author manages co-author roles'); - } - } - $output .= "

\n"; - if (@possmanagers) { - $output .= '

'.&mt('If checked, can manage').': '; - foreach my $user (@possmanagers) { - my $checked; - if (grep(/^\Q$user\E$/,@custommanagers)) { - $checked = ' checked="checked"'; - } - $output .= ' '."\n"; - } - $output .= '

'."\n". - '

'."\n"; - } else { - $output .= '

'.&mt('No co-author roles assignable as manager').'

'; - } - $output .= '
'; - } else { - $output = ''. - &mt('You do not have permission to perform this action'). - ''; - } - return $output; -} - -sub update_coauthor_managers { - my ($permission) = @_; - my $output; - if ((ref($permission) eq 'HASH') && ($permission->{'author'})) { - my ($current,$newval,@possibles,@managers); - my %userenv = - &Apache::lonnet::userenvironment($env{'user.domain'}, - $env{'user.name'}, - 'authormanagers'); - $current = $userenv{'authormanagers'}; - @possibles = &Apache::loncommon::get_env_multiple('form.custommanagers'); - if (@possibles) { - my %ca_roles = &Apache::lonnet::get_my_roles(undef,undef,undef, - ['active','future'],['ca']); - if (keys(%ca_roles)) { - foreach my $user (@possibles) { - if ($user =~ /^($match_username):($match_domain)$/) { - if (exists($ca_roles{$user.':ca'})) { - unless ($user eq $env{'user.name'}.':'.$env{'user.domain'}) { - push(@managers,$user); - } - } - } - } - if (@managers) { - $newval = join(',',sort(@managers)); - } - } - } - if ($current eq $newval) { - $output = &mt('No changes made to management of co-author roles'); - } else { - my $chgresult = - &Apache::lonnet::put('environment',{'authormanagers' => $newval}, - $env{'user.domain'},$env{'user.name'}); - if ($chgresult eq 'ok') { - &Apache::lonnet::appenv({'environment.authormanagers' => $newval}); - my (@adds,@dels); - if ($newval eq '') { - @dels = split(/,/,$current); - } elsif ($current eq '') { - @adds = @managers; - } else { - my @old = split(/,/,$current); - my @diffs = &Apache::loncommon::compare_arrays(\@old,\@managers); - if (@diffs) { - foreach my $user (@diffs) { - if (grep(/^\Q$user\E$/,@old)) { - push(@dels,$user); - } elsif (grep(/^\Q$user\E$/,@managers)) { - push(@adds,$user); - } - } - } - } - my $key = "internal.manager./$env{'user.domain'}/$env{'user.name'}"; - if (@dels) { - foreach my $user (@dels) { - if ($user =~ /^($match_username):($match_domain)$/) { - &Apache::lonnet::del('environment',[$key],$2,$1); - } - } - } - if (@adds) { - foreach my $user (@adds) { - if ($user =~ /^($match_username):($match_domain)$/) { - &Apache::lonnet::put('environment',{$key => 1},$2,$1); - } - } - } - if ($newval eq '') { - $output = &mt('Management of co-authors set to be author-only'); - } else { - $output .= &mt('Co-authors who can manage co-author roles set to: [_1]', - '
'.join(', ',map { &Apache::loncommon::plainname(split(':',$_))." ($_)"; } @managers)); - } - } - } - } else { - $output = ''. - &mt('You do not have permission to perform this action'). - ''; - } - return $output; -} - # ================================================================ Main Handler sub handler { my $r = shift; @@ -5474,17 +4711,12 @@ sub handler { $crstype = &Apache::loncommon::course_type(); } elsif ($env{'request.role'} =~ /^au\./) { $context = 'author'; - } elsif ($env{'request.role'} =~ m{^(ca|aa)\./$match_domain/$match_username$}) { - $context = 'coauthor'; } else { $context = 'domain'; } my ($permission,$allowed) = &Apache::lonuserutils::get_permission($context,$crstype); - if (($context eq 'coauthor') && ($allowed)) { - $context = 'author'; - } if ($allowed) { my @allhelp; @@ -5509,7 +4741,7 @@ sub handler { if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) { push(@allhelp,'Course_Automated_Enrollment'); } - if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) { + if ($permission->{'selfenrolladmin'}) { push(@allhelp,'Course_Approve_Selfenroll'); } } @@ -5522,13 +4754,6 @@ sub handler { } elsif ($context eq 'author') { push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List', 'Author_View_Coauthor_List','Author_User_Logs')); - } elsif ($context eq 'coauthor') { - if ($permission->{'cusr'}) { - push(@allhelp,('Author_Change_Privileges','Author_Create_Coauthor_List', - 'Author_View_Coauthor_List','Author_User_Logs')); - } elsif ($permission->{'view'}) { - push(@allhelp,'Author_View_Coauthor_List'); - } } else { if ($permission->{'cusr'}) { push(@allhelp,'Domain_Change_Privileges'); @@ -5555,8 +4780,7 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['action','state','callingform','roletype','showrole','bulkaction','popup','phase', - 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue', - 'forceedit']); + 'username','domain','srchterm','srchdomain','srchin','srchby','srchtype','queue']); &Apache::lonhtmlcommon::clear_breadcrumbs(); my $args; my $brcrum = []; @@ -5571,9 +4795,6 @@ sub handler { if ($context eq 'course') { $r->internal_redirect('/adm/viewclasslist'); return OK; - } elsif ($context eq 'coauthor') { - $r->internal_redirect('/adm/viewcoauthors'); - return OK; } $env{'user.error.msg'}= "/adm/createuser:cst:0:0:Cannot create/modify user data ". @@ -5622,7 +4843,7 @@ sub handler { if (! exists($env{'form.state'})) { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } elsif ($env{'form.state'} eq 'got_file') { - my $result = + my $result = &Apache::lonuserutils::print_upload_manager_form($r,$context, $permission, $crstype,$showcredits); @@ -5936,7 +5157,7 @@ sub handler { &Apache::lonhtmlcommon::row_closure(1)); } } - if ($pickstart) { + if ($pickstart) { $r->print(&Apache::lonhtmlcommon::end_pick_box().''); } else { $r->print('
'.&mt('No information to display for this account request.').'
'); @@ -6060,9 +5281,8 @@ sub handler { ''.&mt('You do not have permission to modify dates or sections for users').''); } } elsif ($env{'form.action'} eq 'selfenroll') { - my %currsettings; - if ($permission->{selfenrolladmin} || $permission->{selfenrollview}) { - %currsettings = ( + if ($permission->{selfenrolladmin}) { + my %currsettings = ( selfenroll_types => $env{'course.'.$cid.'.internal.selfenroll_types'}, selfenroll_registered => $env{'course.'.$cid.'.internal.selfenroll_registered'}, selfenroll_section => $env{'course.'.$cid.'.internal.selfenroll_section'}, @@ -6078,8 +5298,6 @@ sub handler { default_enrollment_end_date => $env{'course.'.$cid.'.default_enrollment_end_date'}, uniquecode => $env{'course.'.$cid.'.internal.uniquecode'}, ); - } - if ($permission->{selfenrolladmin}) { push(@{$brcrum}, {href => '/adm/createuser?action=selfenroll', text => "Configure Self-enrollment", @@ -6100,16 +5318,6 @@ sub handler { $r->print('

'.&mt('Self-enrollment with a student role').'

'."\n"); &update_selfenroll_config($r,$cid,$cdom,$cnum,$context,$crstype,\%currsettings); } - } elsif ($permission->{selfenrollview}) { - push(@{$brcrum}, - {href => '/adm/createuser?action=selfenroll', - text => "View Self-enrollment configuration", - help => 'Course_Self_Enrollment'}); - $args = { bread_crumbs => $brcrum, - bread_crumbs_component => 'Self-enrollment Settings'}; - $r->print(&header(undef,$args)); - $r->print('

'.&mt('Self-enrollment with a student role').'

'."\n"); - &print_selfenroll_menu($r,'course',$cid,$cdom,$cnum,\%currsettings,'',1); } else { $r->print(&header(undef,{'no_nav_bar' => 1}). ''.&mt('You do not have permission to configure self-enrollment').''); @@ -6153,8 +5361,7 @@ sub handler { ''.&mt('You do not have permission to view change logs').''); } } elsif ($env{'form.action'} eq 'helpdesk') { - if (($permission->{'owner'} || $permission->{'co-owner'}) && - ($permission->{'cusr'} || $permission->{'view'})) { + if (($permission->{'owner'}) || ($permission->{'co-owner'})) { if ($env{'form.state'} eq 'process') { if ($permission->{'owner'}) { &update_helpdeskaccess($r,$permission,$brcrum); @@ -6168,64 +5375,6 @@ sub handler { $r->print(&header(undef,{'no_nav_bar' => 1}). ''.&mt('You do not have permission to view helpdesk access').''); } - } elsif ($env{'form.action'} eq 'camanagers') { - if (($permission->{cusr}) && ($context eq 'author')) { - push(@{$brcrum}, - {href => '/adm/createuser?action=camanagers', - text => 'Co-author Managers', - help => 'Author_Manage_Coauthors'}); - if ($env{'form.state'} eq 'process') { - push(@{$brcrum}, - {href => '/adm/createuser?action=camanagers', - text => 'Result', - help => 'Author_Manage_Coauthors'}); - } - $args = { bread_crumbs => $brcrum }; - $r->print(&header(undef,$args)); - my $coursedesc = $env{'course.'.$cid.'.description'}; - if (!exists($env{'form.state'})) { - $r->print('

'.&mt('Co-author Management').'

'."\n". - &display_coauthor_managers($permission)); - } elsif ($env{'form.state'} eq 'process') { - $r->print('

'.&mt('Co-author Management Update Result').'

'."\n". - &update_coauthor_managers($permission)); - } - } - } elsif (($env{'form.action'} eq 'calist') && ($context eq 'author')) { - if ($permission->{'cusr'}) { - my ($role,$audom,$auname,$canview,$canedit) = - &Apache::lonviewcoauthors::get_allowable(); - if (($canedit) && ($env{'form.forceedit'})) { - &Apache::lonviewcoauthors::get_editor_crumbs($brcrum,'/adm/createuser'); - my $args = { 'bread_crumbs' => $brcrum }; - $r->print(&Apache::loncommon::start_page('Configure co-author listing',undef, - $args). - &Apache::lonviewcoauthors::edit_settings($audom,$auname,$role, - '/adm/createuser')); - } else { - push(@{$brcrum}, - {href => '/adm/createuser?action=calist', - text => 'Coauthor-viewable list', - help => 'Author_List_Coauthors'}); - my $args = { 'bread_crumbs' => $brcrum }; - $r->print(&Apache::loncommon::start_page('Coauthor-viewable list',undef, - $args)); - my %viewsettings = - &Apache::lonviewcoauthors::retrieve_view_settings($auname,$audom,$role); - if ($viewsettings{'show'} eq 'none') { - $r->print('

'.&mt('Coauthor-viewable listing').'

'. - '

'. - &mt('Listing of co-authors not enabled for this Authoring Space'). - '

'); - } else { - &Apache::lonviewcoauthors::print_coauthors($r,$auname,$audom,$role, - '/adm/createuser',\%viewsettings); - } - } - } else { - $r->internal_redirect('/adm/viewcoauthors'); - return OK; - } } else { $bread_crumbs_component = 'User Management'; $args = { bread_crumbs => $brcrum, @@ -6332,15 +5481,6 @@ function updateCols(caller) { document.getElementById('showcolstart').checked = false; document.getElementById('showcolend').checked = false; } - if (context == 'author') { - if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value == 'Expired') { - document.getElementById('showcolmanager').checked = false; - document.getElementById('showcolmanager').disabled = 'disabled'; - } else if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value != 'aa') { - document.getElementById('showcolmanager').checked = true; - document.getElementById('showcolmanager').disabled = ''; - } - } } } if (caller == 'output') { @@ -6426,15 +5566,6 @@ function updateCols(caller) { } } } - if (context == 'author') { - if (document.studentform.showrole.options[document.studentform.showrole.selectedIndex].value == 'aa') { - document.getElementById('showcolmanager').checked = false; - document.getElementById('showcolmanager').disabled = 'disabled'; - } else if (document.studentform.Status.options[document.studentform.Status.selectedIndex].value != 'Expired') { - document.getElementById('showcolmanager').checked = true; - document.getElementById('showcolmanager').disabled = ''; - } - } } return; } @@ -6616,6 +5747,7 @@ sub print_main_menu { groups => 'Community Groups', }, ); + $linktext{'Placement'} = $linktext{'Course'}; my %linktitle = ( 'Course' => { @@ -6630,6 +5762,8 @@ sub print_main_menu { }, ); + $linktitle{'Placement'} = $linktitle{'Course'}; + push(@{ $menu[0]->{items} }, #Category: Single Users { linktext => $linktext{$crstype}{'single'}, @@ -6657,8 +5791,7 @@ sub print_main_menu { icon => 'helpdesk-access.png', #help => 'Course_Helpdesk_Access', url => '/adm/createuser?action=helpdesk', - permission => (($permission->{'owner'} || $permission->{'co-owner'}) && - ($permission->{'view'} || $permission->{'cusr'})), + permission => ($permission->{'owner'} || $permission->{'co-owner'}), linktitle => 'Helpdesk access options', }, { @@ -6693,7 +5826,7 @@ sub print_main_menu { icon => 'selfenrl-queue.png', #help => 'Course_Approve_Selfenroll', url => '/adm/createuser?action=selfenrollqueue', - permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'}, + permission => $permission->{'selfenrolladmin'}, linktitle =>'Approve or reject enrollment requests.', }, ); @@ -6720,7 +5853,7 @@ sub print_main_menu { icon => 'self_enroll.png', #help => 'Course_Self_Enrollment', url => '/adm/createuser?action=selfenroll', - permission => $permission->{'selfenrolladmin'} || $permission->{'selfenrollview'}, + permission => $permission->{'selfenrolladmin'}, linktitle => 'Configure user self-enrollment.', }, ); @@ -6735,22 +5868,6 @@ sub print_main_menu { permission => $permission->{'cusr'}, linktitle => 'View change log.', }, - { - linktext => 'Co-author Managers', - icon => 'camanager.png', - #help => 'Coauthor_Management', - url => '/adm/createuser?action=camanagers', - permission => $permission->{'author'}, - linktitle => 'Assign/Revoke right to manage co-author roles', - }, - { - linktext => 'Configure Co-author Listing', - icon => 'coauthors.png', - #help => 'Coauthor_Settings', - url => '/adm/createuser?action=calist&forceedit=1', - permission => ($permission->{'cusr'}), - linktitle => 'Set availability of coauthor-viewable user listing', - }, ); } return Apache::lonhtmlcommon::generate_menu(@menu); @@ -6985,7 +6102,8 @@ ENDSCRIPT '// ]]>'."\n". ''."\n". '

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

'."\n"; - my $visactions = &cat_visibility($cdom); + + my $visactions = &cat_visibility(); my ($cathash,%cattype); my %domconfig = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); if (ref($domconfig{'coursecategories'}) eq 'HASH') { @@ -7148,10 +6266,11 @@ ENDSCRIPT } elsif ($curr_types eq '') { $add_domtitle = &mt('Users in other domain:'); } + my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('enroll',$cdom); $output .= &Apache::loncommon::start_data_table_row() .'		'.$add_domtitle.'
' .&Apache::loncommon::select_dom_form('','selfenroll_newdom', - $includeempty,$showdomdesc,'','','',$readonly) + $includeempty,$showdomdesc,'',$trusted,$untrusted,$readonly) .'' .'