--- loncom/interface/loncreateuser.pm 2024/08/24 15:09:55 1.406.2.20.2.6 +++ loncom/interface/loncreateuser.pm 2016/11/12 00:16:24 1.421 @@ -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.421 2016/11/12 00:16:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -70,9 +70,7 @@ use Apache::lonlocal; use Apache::longroup; use Apache::lonuserutils; use Apache::loncoursequeueadmin; -use Apache::lonviewcoauthors; use LONCAPA qw(:DEFAULT :match); -use HTML::Entities; my $loginscript; # piece of javascript used in two separate instances my $authformnop; @@ -82,7 +80,7 @@ my $authformfsys; my $authformloc; 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, @@ -103,9 +101,6 @@ 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); @@ -128,82 +123,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", 'chse' => "Change setting", @@ -295,82 +252,52 @@ 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', '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'); + @usertools = ('official','unofficial','community','textbook','placement'); @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'); + @usertools = ('aboutme','blog','webdav','portfolio'); } 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 +305,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 +361,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 +371,7 @@ sub build_tools_display { } else { $currdisp = $reqdisplay{$curroption}; } - $custdisp = '
'; + $custdisp = ''; foreach my $option (@options) { my $val = $option; if ($option eq 'norequest') { @@ -548,114 +394,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 +454,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 +528,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,16 +536,82 @@ sub domainrole_req { &Apache::loncommon::end_data_table(); } -sub authoring_defaults { +sub domadhocroles { 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(); + my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'}); + my %existing=&Apache::lonnet::dump('roles',$env{'request.role.domain'}, + $confname,'rolesdef_'); + my ($output,$canmodify); + if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) { + $canmodify = 1; + } + if (keys(%existing) > 0) { + my @current; + my $curradhoc = 'adhocroles.'.$env{'request.role.domain'}; + my %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,$curradhoc); + if ($userenv{$curradhoc}) { + @current = split(/,/,$userenv{$curradhoc}); + } + if (!$canmodify && !@current) { + return; + } + my %customroles; + foreach my $key (keys(%existing)) { + if ($key=~/^rolesdef\_(\w+)$/) { + my $rolename = $1; + my %privs; + ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key}); + $customroles{$rolename} = \%privs; + } + } + $output = '

'. + &mt('Ad Hoc Course Roles Selectable via Helpdesk Role'). + '

'."\n". + &Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(); + if ($canmodify) { + $output .= ''.&mt('Action').''; + } + $output .= ''.&mt('Role').''. + ''.&mt('Privileges in Course').''. + &Apache::loncommon::end_data_table_header_row(); + foreach my $key (sort(keys(%customroles))) { + next if ((!$canmodify) && (!grep(/^\Q$key\E$/,@current))); + $output .= &Apache::loncommon::start_data_table_row(); + if ($canmodify) { + if (grep(/^\Q$key\E$/,@current)) { + $output .= ''. + ''; + } else { + $output .= ''. + ''; + } + } + $output .= ''.$key.''; + foreach my $level ('course','domain','system') { + if ($customroles{$key}{$level}) { + my $suffix; + if (($level eq 'domain') || ($level eq 'system')) { + $suffix = ' ('.&mt($level).')'; + } + my @privs = split(/:/,$customroles{$key}{$level}); + foreach my $item (@privs) { + next if ($item eq ''); + my ($priv,$cond) = split(/\&/,$item); + $output .= &Apache::lonnet::plaintext($priv,'Course').$suffix.'
'; + } + } + } + $output .= ''. + &Apache::loncommon::end_data_table_row(); + } + $output .= &Apache::loncommon::end_data_table(); + } + return $output; } sub courserequest_titles { @@ -767,6 +620,7 @@ sub courserequest_titles { unofficial => 'Unofficial', community => 'Communities', textbook => 'Textbook', + placement => 'Placement Tests', norequest => 'Not allowed', approval => 'Approval by Dom. Coord.', validate => 'With validation', @@ -871,8 +725,7 @@ sub curr_requestauthor { # =================================================================== Phase one sub print_username_entry_form { - my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum, - $permission) = @_; + my ($r,$context,$response,$srch,$forcenewuser,$crstype,$brcrum) = @_; my $defdom=$env{'request.role.domain'}; my $formtoset = 'crtuser'; if (exists($env{'form.startrolename'})) { @@ -898,27 +751,13 @@ sub print_username_entry_form { } my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'custom') { - if ($context eq 'course') { - $helpitem = 'Course_Editing_Custom_Roles'; - } elsif ($context eq 'domain') { - $helpitem = 'Domain_Editing_Custom_Roles'; - } + $helpitem = 'Course_Editing_Custom_Roles'; } elsif ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; } elsif ($env{'form.action'} eq 'accesslogs') { $helpitem = 'Domain_User_Access_Logs'; - } elsif ($context eq 'author') { - $helpitem = 'Author_Change_Privileges'; - } elsif ($context eq 'domain') { - if ($permission->{'cusr'}) { - $helpitem = 'Domain_Change_Privileges'; - } elsif ($permission->{'view'}) { - $helpitem = 'Domain_View_Privileges'; - } else { - undef($helpitem); - } } - my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$defdom); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); if ($env{'form.action'} eq 'custom') { push(@{$brcrum}, {href=>"javascript:backPage(document.crtuser)", @@ -946,7 +785,6 @@ sub print_username_entry_form { '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', - 'srvu' => 'Search for a user and view user information and roles', 'srva' => 'Search for a user and view access log information', 'usr' => "Username", 'dom' => "Domain", @@ -994,7 +832,6 @@ sub print_username_entry_form { } } else { my $actiontext = $lt{'srad'}; - my $fixeddom; if ($env{'form.action'} eq 'singlestudent') { if ($crstype eq 'Community') { $actiontext = $lt{'srme'}; @@ -1003,11 +840,6 @@ sub print_username_entry_form { } } elsif ($env{'form.action'} eq 'accesslogs') { $actiontext = $lt{'srva'}; - $fixeddom = 1; - } elsif (($env{'form.action'} eq 'singleuser') && - ($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$defdom))) { - $actiontext = $lt{'srvu'}; - $fixeddom = 1; } $r->print("

$actiontext

"); if ($env{'form.origform'} ne 'crtusername') { @@ -1016,7 +848,7 @@ sub print_username_entry_form { '
'); } } - $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom)); + $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,1)); } } @@ -1075,16 +907,11 @@ sub entry_form { $inexact = 1; } } - my ($cancreate,$noinstd); - if ($env{'form.action'} eq 'accesslogs') { - $noinstd = 1; - } else { - $cancreate = - &Apache::lonuserutils::can_create_user($dom,$context,$usertype); - } + my $cancreate = + &Apache::lonuserutils::can_create_user($dom,$context,$usertype); my ($userpicker,$cansearch) = &Apache::loncommon::user_picker($dom,$srch,$forcenewuser, - 'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd); + 'document.crtuser',$cancreate,$usertype,$context,$fixeddom); my $srchbutton = &mt('Search'); if ($env{'form.action'} eq 'singlestudent') { $srchbutton = &mt('Search and Enroll'); @@ -1106,9 +933,7 @@ ENDBLOCK } else { $output = '

'.$userpicker.'

'; } - if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs') && - (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && - (!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) { + if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs')) { my $defdom=$env{'request.role.domain'}; my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); my %lt=&Apache::lonlocal::texthash( @@ -1225,9 +1050,7 @@ ENDSCRIPT 'stusrch' => "User Search to enroll student", 'memsrch' => "User Search to enroll member", 'srcva' => "Search for a user and view access log information", - 'usrvu' => "User Search to view user roles", 'usel' => "Select a user to add/modify roles", - 'suvr' => "Select a user to view roles", 'stusel' => "Select a user to enroll as a student", 'memsel' => "Select a user to enroll as a member", 'vacsel' => "Select a user to view access log", @@ -1240,16 +1063,12 @@ ENDSCRIPT if ($context eq 'requestcrs') { $r->print('
'); } else { - my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$srch->{'srchdomain'}); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); my $helpitem; if ($env{'form.action'} eq 'singleuser') { $helpitem = 'Course_Change_Privileges'; } elsif ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; - } elsif ($context eq 'author') { - $helpitem = 'Author_Change_Privileges'; - } elsif ($context eq 'domain') { - $helpitem = 'Domain_Change_Privileges'; } push (@{$brcrum}, {href => "javascript:backPage(document.usersrchform,'','')", @@ -1264,19 +1083,9 @@ ENDSCRIPT ); $r->print(&Apache::loncommon::start_page('User Management',$jscript,{bread_crumbs => $brcrum})); if ($env{'form.action'} eq 'singleuser') { - my $readonly; - if (($context eq 'domain') && (!&Apache::lonnet::allowed('mau',$srch->{'srchdomain'}))) { - $readonly = 1; - $r->print("$lt{'usrvu'}
"); - } else { - $r->print("$lt{'usrch'}
"); - } + $r->print("$lt{'usrch'}
"); $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,$crstype)); - if ($readonly) { - $r->print('

'.$lt{'suvr'}.'

'); - } else { - $r->print('

'.$lt{'usel'}.'

'); - } + $r->print('

'.$lt{'usel'}.'

'); } elsif ($env{'form.action'} eq 'singlestudent') { $r->print($jscript.""); if ($crstype eq 'Community') { @@ -1295,7 +1104,7 @@ ENDSCRIPT $r->print(''); } elsif ($env{'form.action'} eq 'accesslogs') { $r->print("$lt{'srcva'}
"); - $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,$context,undef,undef,1)); + $r->print(&entry_form($srch->{'srchdomain'},$srch,undef,'accesslogs',undef,undef,1)); $r->print('

'.$lt{'vacsel'}.'

'); } } @@ -1376,8 +1185,7 @@ sub print_user_modification_page { 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,$brcrum, - $permission); + &print_username_entry_form($r,$context,$usermsg,'','',$crstype,$brcrum); return; } my ($form,$formname); @@ -1426,8 +1234,7 @@ sub print_user_modification_page { } $response .= '


'; $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum, - $permission); + &print_username_entry_form($r,$context,$response,undef,undef,$crstype,$brcrum); return; } $newuser = 1; @@ -1451,8 +1258,7 @@ sub print_user_modification_page { 'username'); } $env{'form.phase'} = ''; - &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum, - $permission); + &print_username_entry_form($r,$context,$userchkmsg,undef,undef,$crstype,$brcrum); return; } } @@ -1471,18 +1277,12 @@ 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 %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain); + my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype, + $groupslist,$newuser,$formname,\%loaditem); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; - } elsif ($context eq 'author') { - $helpitem = 'Author_Change_Privileges'; - } elsif ($context eq 'domain') { - $helpitem = 'Domain_Change_Privileges'; - $js .= &set_custom_js(); } push (@{$brcrum}, {href => "javascript:backPage($form)", @@ -1508,32 +1308,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 +1344,24 @@ ENDFORMINFO } } my $title = ''; - my $need_quota_js; if ($newuser) { - my ($portfolioform,$domroleform); + my ($portfolioform,$domroleform,$adhocroleform); 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); + if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) { + $adhocroleform = &domadhocroles($ccuname,$ccdomain); + if ($adhocroleform) { + $adhocroleform = '
'.$adhocroleform; + } + } + &initialize_authen_forms($ccdomain,$formname); my %lt=&Apache::lonlocal::texthash( 'lg' => 'Login Data', 'hs' => "Home Server", @@ -1630,7 +1392,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 +1407,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'). @@ -1709,7 +1471,7 @@ ENDAUTH } else { $r->print(&Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc)); } - $r->print($portfolioform.$domroleform); + $r->print($portfolioform.$domroleform.$adhocroleform); if ($env{'form.action'} eq 'singlestudent') { $r->print(&date_sections_select($context,$newuser,$formname, $permission,$crstype,$ccuname, @@ -1739,9 +1501,9 @@ ENDAUTH $r->print('
'); $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context, $inst_results{$ccuname.':'.$ccdomain})); - if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || + 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". + $r->print('

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

'. &Apache::loncommon::start_data_table()); if ($env{'request.role.domain'} eq $ccdomain) { $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); @@ -1752,44 +1514,32 @@ ENDAUTH $r->print(&Apache::loncommon::end_data_table()); } $r->print('
'); - my @order = ('auth','quota','tools','requestauthor','authordefaults'); + my @order = ('auth','quota','tools','requestauthor','adhocroles'); 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; - } + $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); + } + if ((&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) || + (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) { + $user_text{'adhocroles'} = &domadhocroles($ccuname,$ccdomain); } - $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission); + $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname); 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,14 +1650,11 @@ 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; } sub singleuser_breadcrumb { - my ($crstype,$context,$domain) = @_; + my ($crstype) = @_; my %breadcrumb_text; if ($env{'form.action'} eq 'singlestudent') { if ($crstype eq 'Community') { @@ -1915,21 +1662,16 @@ sub singleuser_breadcrumb { } else { $breadcrumb_text{'search'} = 'Enroll a student'; } - $breadcrumb_text{'userpicked'} = 'Select a user'; - $breadcrumb_text{'modify'} = 'Set section/dates'; + $breadcrumb_text{'userpicked'} = 'Select a user', + $breadcrumb_text{'modify'} = 'Set section/dates', } elsif ($env{'form.action'} eq 'accesslogs') { $breadcrumb_text{'search'} = 'View access logs for a user'; - $breadcrumb_text{'userpicked'} = 'Select a user'; - $breadcrumb_text{'activity'} = 'Activity'; - } elsif (($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && - (!&Apache::lonnet::allowed('mau',$domain))) { - $breadcrumb_text{'search'} = "View user's roles"; - $breadcrumb_text{'userpicked'} = 'Select a user'; - $breadcrumb_text{'modify'} = 'User roles'; + $breadcrumb_text{'userpicked'} = 'Select a user', + $breadcrumb_text{'activity'} = 'Activity', } else { $breadcrumb_text{'search'} = 'Create/modify a user'; - $breadcrumb_text{'userpicked'} = 'Select a user'; - $breadcrumb_text{'modify'} = 'Set user role'; + $breadcrumb_text{'userpicked'} = 'Select a user', + $breadcrumb_text{'modify'} = 'Set user role', } return %breadcrumb_text; } @@ -1961,16 +1703,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 +1782,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; @@ -2090,7 +1825,7 @@ sub display_existing_roles { if ($active) { next unless($showall || $showactive); } else { - next unless($showall || $showexpired); + next unless($showall || $showexpired); } # Is this a custom role? Get role owner and title. my ($croleudom,$croleuname,$croletitle)= @@ -2207,8 +1942,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; } @@ -2237,7 +1970,7 @@ sub display_existing_roles { } else { $row.=' '; } - $row.= ''; + $row.= ''; } my $plaintext=''; if (!$croletitle) { @@ -2311,9 +2044,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 +2085,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 +2146,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;; } @@ -2494,7 +2201,7 @@ sub new_domain_roles { } sub user_authentication { - my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_; + my ($ccuname,$ccdomain,$formname) = @_; my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain); my $outcome; my %lt=&Apache::lonlocal::texthash( @@ -2532,6 +2239,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); @@ -2566,43 +2274,6 @@ ENDBADAUTH } $outcome .= &Apache::loncommon::end_data_table(); } else { - if (($currentauth =~ /^internal:/) && - (&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) { - $outcome = <<"ENDJS"; - -ENDJS - - $outcome .= '

'.$lt{'ld'}.'

'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_row(). - ''.&mt('Internally authenticated').'
'.&mt("Change user's password?"). - ''.(' 'x2). - ''. - ''. - &Apache::loncommon::end_data_table_row(). - &Apache::loncommon::end_data_table(); - } if (&Apache::lonnet::allowed('udp',$ccdomain)) { # Current user has rights to view domain preferences for user's domain my $result; @@ -2612,7 +2283,7 @@ ENDJS $result = &mt('Currently Kerberos authenticated, Version [_1].',$krbver); } else { $result = &mt('Currently Kerberos authenticated with domain [_1] Version [_2].', - $krbrealm,$krbver); + $krbver,$krbrealm); } } elsif ($currentauth =~ /^internal:/) { $result = &mt('Currently internally authenticated.'); @@ -2711,9 +2382,9 @@ sub modify_login_block { } sub personal_data_display { - my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$readonly,$rolesarray,$now, - $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_; - my ($output,%userenv,%canmodify,%canmodify_status,$disabled); + my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray, + $now,$captchaform,$emailusername,$usertype) = @_; + my ($output,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); my $rowcount = 0; @@ -2739,7 +2410,6 @@ sub personal_data_display { 'inststatus' => "Affiliation", 'email' => 'E-mail address', 'valid' => 'Validation', - 'username' => 'Username', ); %canmodify_status = @@ -2758,7 +2428,7 @@ sub personal_data_display { if (ref($emailusername) eq 'HASH') { if (ref($emailusername->{$usertype}) eq 'HASH') { my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info(); - @userinfo = (); + @userinfo = (); if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { foreach my $field (@{$infofields}) { if ($emailusername->{$usertype}->{$field}) { @@ -2782,50 +2452,19 @@ 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'); $output = '

'.$lt{'pd'}.'

'. &Apache::lonhtmlcommon::start_pick_box(); if (($context eq 'selfcreate') && ($newuser eq 'email')) { - my $size = 25; - if ($condition) { - if ($condition =~ /^\@[^\@]+$/) { - $size = 10; - } else { - undef($condition); - } - } - if ($excluded) { - unless ($excluded =~ /^\@[^\@]+$/) { - undef($condition); - } - } $output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'*',undef, 'LC_oddrow_value')."\n". - ''; - if ($condition) { - $output .= $condition; - } elsif ($excluded) { - $output .= '
'.&mt('You must use an e-mail address that does not end with [_1]', - $excluded).''; - } - if ($usernameset eq 'first') { - $output .= '
'; - if ($condition) { - $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]', - $condition); - } else { - $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @'); - } - $output .= ''; - } + ''; $rowcount ++; $output .= &Apache::lonhtmlcommon::row_closure(1); - my $upassone = ''; - my $upasstwo = ''; + my $upassone = ''; + my $upasstwo = ''; $output .= &Apache::lonhtmlcommon::row_title(&mt('Password').'*', 'LC_pick_box_title', 'LC_oddrow_value')."\n". @@ -2836,20 +2475,6 @@ sub personal_data_display { 'LC_oddrow_value')."\n". $upasstwo. &Apache::lonhtmlcommon::row_closure()."\n"; - if ($usernameset eq 'free') { - my $onclick = "toggleUsernameDisp(this,'selfcreateusername');"; - $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n". - ''.&mt('Use e-mail address: '). - ''.(' 'x2). - ''."\n". - ''."\n".&Apache::lonhtmlcommon::row_closure(1); - $rowcount ++; - } } foreach my $item (@userinfo) { my $rowtitle = $lt{$item}; @@ -2871,7 +2496,7 @@ sub personal_data_display { $hiderow = 1; } } else { - $row .= ''; + $row .= ''; } } } else { @@ -2887,7 +2512,7 @@ sub personal_data_display { $hiderow = 1; } } else { - $row .= ''; + $row .= ''; } } } else { @@ -2951,17 +2576,12 @@ sub personal_data_display { &Apache::lonhtmlcommon::row_closure(1); $rowcount ++; } - if ($showsubmit) { - my $submit_text = &mt('Create account'); - $output .= &Apache::lonhtmlcommon::row_title()."\n". - '
'; - if ($usertype ne '') { - $output .= ''; - } - $output .= &Apache::lonhtmlcommon::row_closure(1); - } + my $submit_text = &mt('Create account'); + $output .= &Apache::lonhtmlcommon::row_title()."\n". + '
'. + ''. + &Apache::lonhtmlcommon::row_closure(1); } $output .= &Apache::lonhtmlcommon::end_pick_box(); if (wantarray) { @@ -3045,7 +2665,7 @@ sub get_inststatuses { # ================================================================= Phase Three sub update_user_data { - my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_; + my ($r,$context,$crstype,$brcrum,$showcredits) = @_; my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'}, $env{'form.ccdomain'}); # Error messages @@ -3069,7 +2689,7 @@ sub update_user_data { $jsback."\n". '// ]]>'."\n". ''."\n"; - my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$env{'form.ccdomain'}); + my %breadcrumb_text = &singleuser_breadcrumb($crstype); push (@{$brcrum}, {href => "javascript:backPage(document.userupdate)", text => $breadcrumb_text{'search'}, @@ -3086,10 +2706,6 @@ sub update_user_data { my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'singlestudent') { $helpitem = 'Course_Add_Student'; - } elsif ($context eq 'author') { - $helpitem = 'Author_Change_Privileges'; - } elsif ($context eq 'domain') { - $helpitem = 'Domain_Change_Privileges'; } push(@{$brcrum}, {href => "javascript:backPage(document.userupdate,'$env{'form.prevphase'}','modify')", @@ -3181,10 +2797,9 @@ sub update_user_data { my (%alerts,%rulematch,%inst_results,%curr_rules); my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id'); - my @usertools = ('aboutme','blog','portfolio','portaccess','timezone'); - my @requestcourses = ('official','unofficial','community','textbook'); + my @usertools = ('aboutme','blog','webdav','portfolio'); + my @requestcourses = ('official','unofficial','community','textbook','placement'); my @requestauthor = ('requestauthor'); - my @authordefaults = ('webdav','editors','archive'); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); my %canmodify_status = @@ -3293,34 +2908,11 @@ sub update_user_data { $newcustom{'requestauthor'}, \%changeHash,'requestauthor'); } - 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 (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) { + my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd'); + if (&adhocrole_changes(\%changeHash)) { + $changed{'adhocroles.'.$env{'request.role.domain'}} = $changeHash{'adhocroles.'.$env{'request.role.domain'}}; } - if (@editors) { - @editors = sort(@editors); - $changed{'editors'} = &tool_admin('editors',join(',',@editors), - \%changeHash,'authordefaults'); - } - } - if ($env{'form.customwebdav'} == 1) { - $newcustom{'webdav'} = $env{'form.authordefaults_webdav'}; - $changed{'webdav'} = &tool_admin('webdav',$newcustom{'webdav'}, - \%changeHash,'authordefaults'); - } - if ($env{'form.customarchive'} == 1) { - $newcustom{'archive'} = $env{'form.authordefaults_archive'}; - $changed{'archive'} = &tool_admin('archive',$newcustom{'archive'}, - \%changeHash,'authordefaults'); - } } if ($canmodify_status{'inststatus'}) { @@ -3341,7 +2933,7 @@ sub update_user_data { $env{'form.ccdomain'},$env{'form.ccuname'}); } } - $r->print('
'.&mt('Home Server').': '.$uhome.' '. + $r->print('
'.&mt('Home server').': '.$uhome.' '. &Apache::lonnet::hostname($uhome)); } elsif (($env{'form.login'} ne 'nochange') && ($env{'form.login'} ne '' )) { @@ -3356,19 +2948,12 @@ sub update_user_data { &Apache::lonnet::modifyuserauth( $env{'form.ccdomain'},$env{'form.ccuname'}, $amode,$genpwd)); - $r->print('
'.&mt('Home Server').': '.&Apache::lonnet::homeserver + $r->print('
'.&mt('Home server').': '.&Apache::lonnet::homeserver ($env{'form.ccuname'},$env{'form.ccdomain'})); } else { # Okay, this is a non-fatal error. - $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end); + $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end); } - } elsif (($env{'form.intarg'} ne '') && - (&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) && - (&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) { - $r->print('Modifying authentication: '. - &Apache::lonnet::modifyuserauth( - $env{'form.ccdomain'},$env{'form.ccuname'}, - 'internal',$env{'form.intarg'})); } $r->rflush(); # Finish display of header before time consuming actions start &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state); @@ -3387,24 +2972,18 @@ sub update_user_data { my %userenv = &Apache::lonnet::get ('environment',['firstname','middlename','lastname','generation', 'id','permanentemail','portfolioquota','authorquota','inststatus', - 'tools.aboutme','tools.blog','tools.webdav', - 'tools.portfolio','tools.timezone','tools.portaccess', - 'authormanagers','authoreditors','authorarchive','requestauthor', + 'tools.aboutme','tools.blog','tools.webdav','tools.portfolio', 'requestcourses.official','requestcourses.unofficial', 'requestcourses.community','requestcourses.textbook', 'reqcrsotherdom.official','reqcrsotherdom.unofficial', 'reqcrsotherdom.community','reqcrsotherdom.textbook', - 'domcoord.author'], + 'reqcrsotherdom.placement','requestauthor', + 'adhocroles.'.$env{'request.role.domain'}], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { %userenv = (); } - unless (($userenv{'domcoord.author'} eq 'blocked') && - (($env{'user.name'} ne $env{'form.ccuname'}) || - ($env{'user.domain'} ne $env{'form.ccdomain'}))) { - push(@authordefaults,'managers'); - } my $no_forceid_alert; # Check to see if user information can be changed my %domconfig = @@ -3527,7 +3106,7 @@ sub update_user_data { %oldsettingstatus,%newsettingstatus); @disporder = ('inststatus'); if ($env{'request.role.domain'} eq $env{'form.ccdomain'}) { - push(@disporder,('requestcourses','requestauthor','authordefaults')); + push(@disporder,'requestcourses','requestauthor'); } else { push(@disporder,'reqcrsotherdom'); } @@ -3538,6 +3117,7 @@ sub update_user_data { &Apache::loncommon::default_quota($env{'form.ccdomain'},$oldinststatus,$name); ($newdefquota{$name},$newsettingstatus{$name}) = ($olddefquota{$name},$oldsettingstatus{$name}); } + push(@disporder,'adhocroles'); my %canshow; if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { $canshow{'quota'} = 1; @@ -3555,7 +3135,9 @@ sub update_user_data { } if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) { $canshow{'requestauthor'} = 1; - $canshow{'authordefaults'} = 1; + } + if (&Apache::lonnet::allowed('cdh',$env{'request.role.domain'})) { + $canshow{'adhocroles'} = 1; } my (%changeHash,%changed); if ($oldinststatus eq '') { @@ -3664,18 +3246,20 @@ sub update_user_data { if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) { &tool_changes('requestcourses',\@requestcourses,\%oldsettings,\%oldsettingstext, \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); - my ($isadv,$isauthor) = - &Apache::lonnet::is_advanced_user($env{'form.ccdomain'},$env{'form.ccuname'}); - unless ($isauthor) { - &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext, - \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); - } - &tool_changes('authordefaults',\@authordefaults,\%oldsettings,\%oldsettingstext, - \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); + &tool_changes('requestauthor',\@requestauthor,\%oldsettings,\%oldsettingstext, + \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); } else { &tool_changes('reqcrsotherdom',\@requestcourses,\%oldsettings,\%oldsettingstext, \%userenv,\%changeHash,\%changed,\%newsettings,\%newsettingstext); } + if ($userenv{'adhocroles.'.$env{'request.role.domain'}}) { + $changeHash{'adhocroles.'.$env{'request.role.domain'}} = $userenv{'adhocroles.'.$env{'request.role.domain'}}; + } + if (&adhocrole_changes(\%changeHash,\%userenv)) { + $changed{'adhocroles'} = 1; + $oldsettings{'adhocroles'} = $userenv{'adhocroles.'.$env{'request.role.domain'}}; + $newsettings{'adhocroles'} = $changeHash{'adhocroles.'.$env{'request.role.domain'}}; + } } foreach my $item (@userinfo) { if ($env{'form.c'.$item} ne $userenv{$item}) { @@ -3689,135 +3273,38 @@ sub update_user_data { if ((keys(%namechanged) > 0) || (keys(%changed) > 0)) { my ($chgresult,$namechgresult); if (keys(%changed) > 0) { - $chgresult = + $chgresult = &Apache::lonnet::put('environment',\%changeHash, $env{'form.ccdomain'},$env{'form.ccuname'}); if ($chgresult eq 'ok') { - my ($ca_mgr_del,%ca_mgr_add); - if ($changed{'managers'}) { - my (@adds,@dels); - if ($changeHash{'authormanagers'} eq '') { - @dels = split(/,/,$userenv{'authormanagers'}); - } elsif ($userenv{'authormanagers'} eq '') { - @adds = split(/,/,$changeHash{'authormanagers'}); - } else { - my @old = split(/,/,$userenv{'authormanagers'}); - my @new = split(/,/,$changeHash{'authormanagers'}); - my @diffs = &Apache::loncommon::compare_arrays(\@old,\@new); - if (@diffs) { - foreach my $user (@diffs) { - if (grep(/^\Q$user\E$/,@old)) { - push(@dels,$user); - } elsif (grep(/^\Q$user\E$/,@new)) { - push(@adds,$user); - } - } - } - } - my $key = "internal.manager./$env{'form.ccdomain'}/$env{'form.ccuname'}"; - if (@dels) { - foreach my $user (@dels) { - if ($user =~ /^($match_username):($match_domain)$/) { - &Apache::lonnet::del('environment',[$key],$2,$1); - } - } - my $curruser = $env{'user.name'}.':'.$env{'user.domain'}; - if (grep(/^\Q$curruser\E$/,@dels)) { - $ca_mgr_del = $key; - } - } - if (@adds) { - foreach my $user (@adds) { - if ($user =~ /^($match_username):($match_domain)$/) { - &Apache::lonnet::put('environment',{$key => 1},$2,$1); - } - } - my $curruser = $env{'user.name'}.':'.$env{'user.domain'}; - if (grep(/^\Q$curruser\E$/,@adds)) { - $ca_mgr_add{$key} = 1; - } - } - } if (($env{'user.name'} eq $env{'form.ccuname'}) && ($env{'user.domain'} eq $env{'form.ccdomain'})) { - my (%newenvhash,$got_domdefs,%domdefaults,$got_userenv, - %userenv); - my @fromenv = keys(%changed); - push(@fromenv,'inststatus'); + my %newenvhash; foreach my $key (keys(%changed)) { - if (($key eq 'official') || ($key eq 'unofficial') - || ($key eq 'community') || ($key eq 'textbook')) { + if (($key eq 'official') || ($key eq 'unofficial') || + ($key eq 'community') || ($key eq 'textbook') || + ($key eq 'placement')) { $newenvhash{'environment.requestcourses.'.$key} = $changeHash{'requestcourses.'.$key}; if ($changeHash{'requestcourses.'.$key}) { $newenvhash{'environment.canrequest.'.$key} = 1; } else { - unless ($got_domdefs) { - %domdefaults = - &Apache::lonnet::get_domain_defaults($env{'user.domain'}); - $got_domdefs = 1; - } - unless ($got_userenv) { - %userenv = - &Apache::lonnet::userenvironment($env{'user.domain'}, - $env{'user.name'},@fromenv); - $got_userenv = 1; - } $newenvhash{'environment.canrequest.'.$key} = &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, - $key,'reload','requestcourses',\%userenv,\%domdefaults); + $key,'reload','requestcourses'); } } elsif ($key eq 'requestauthor') { $newenvhash{'environment.'.$key} = $changeHash{$key}; if ($changeHash{$key}) { $newenvhash{'environment.canrequest.author'} = 1; } else { - unless ($got_domdefs) { - %domdefaults = - &Apache::lonnet::get_domain_defaults($env{'user.domain'}); - $got_domdefs = 1; - } - unless ($got_userenv) { - %userenv = - &Apache::lonnet::userenvironment($env{'user.domain'}, - $env{'user.name'},@fromenv); - $got_userenv = 1; - } $newenvhash{'environment.canrequest.author'} = &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, - $key,'reload','requestauthor',\%userenv,\%domdefaults); - } - } elsif ($key eq 'editors') { - $newenvhash{'environment.author'.$key} = $changeHash{'author'.$key}; - if ($env{'form.customeditors'}) { - $newenvhash{'environment.editors'} = $changeHash{'author'.$key}; - } else { - unless ($got_domdefs) { - %domdefaults = - &Apache::lonnet::get_domain_defaults($env{'user.domain'}); - $got_domdefs = 1; - } - if ($domdefaults{'editors'} ne '') { - $newenvhash{'environment.editors'} = $domdefaults{'editors'}; - } else { - $newenvhash{'environment.editors'} = 'edit,xml'; - } - } - } elsif ($key eq 'archive') { - $newenvhash{'environment.author.'.$key} = - $changeHash{'author.'.$key}; - if ($changeHash{'author.'.$key} ne '') { - $newenvhash{'environment.canarchive'} = - $changeHash{'author.'.$key}; - } else { - unless ($got_domdefs) { - %domdefaults = - &Apache::lonnet::get_domain_defaults($env{'user.domain'}); - $got_domdefs = 1; - } - $newenvhash{'environment.canarchive'} = - $domdefaults{'archive'}; + $key,'reload','requestauthor'); } + } elsif ($key eq 'adhocroles') { + $newenvhash{'adhocroles.'.$env{'request.role.domain'}} = + $changeHash{'adhocroles.'.$env{'request.role.domain'}}; } elsif ($key ne 'quota') { $newenvhash{'environment.tools.'.$key} = $changeHash{'tools.'.$key}; @@ -3825,37 +3312,15 @@ sub update_user_data { $newenvhash{'environment.availabletools.'.$key} = $changeHash{'tools.'.$key}; } else { - unless ($got_domdefs) { - %domdefaults = - &Apache::lonnet::get_domain_defaults($env{'user.domain'}); - $got_domdefs = 1; - } - unless ($got_userenv) { - %userenv = - &Apache::lonnet::userenvironment($env{'user.domain'}, - $env{'user.name'},@fromenv); - $got_userenv = 1; - } $newenvhash{'environment.availabletools.'.$key} = &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, - $key,'reload','tools',\%userenv,\%domdefaults); + $key,'reload','tools'); } } } if (keys(%newenvhash)) { &Apache::lonnet::appenv(\%newenvhash); } - } else { - if ($ca_mgr_del) { - &Apache::lonnet::delenv($ca_mgr_del); - } - if (keys(%ca_mgr_add)) { - &Apache::lonnet::appenv(\%ca_mgr_add); - } - } - if ($changed{'aboutme'}) { - &Apache::loncommon::devalidate_aboutme_cache($env{'form.ccuname'}, - $env{'form.ccdomain'}); } } } @@ -3887,7 +3352,7 @@ sub update_user_data { \%newsettingstext); if ($env{'form.cid'} ne $userenv{'id'}) { &Apache::lonnet::idput($env{'form.ccdomain'}, - {$env{'form.ccuname'} => $env{'form.cid'}}); + {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids'); if (($recurseid) && (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) { my $idresult = @@ -4026,22 +3491,16 @@ sub display_userinfo { 'webdav' => 'WebDAV Availability', 'aboutme' => 'Personal Information Page Availability', 'portfolio' => 'Portfolio Availability', - 'portaccess' => 'Portfolio Shareable', - 'timezone' => 'Can set own Time Zone', 'official' => 'Can Request Official Courses', 'unofficial' => 'Can Request Unofficial Courses', 'community' => 'Can Request Communities', 'textbook' => 'Can Request Textbook Courses', + 'placement' => 'Can Request Placement Tests', 'requestauthor' => 'Can Request Author Role', + 'adhocroles' => 'Ad Hoc Roles Selectable via Helpdesk Role', 'inststatus' => "Affiliation", 'prvs' => 'Previous Value:', - 'chto' => 'Changed To:', - 'editors' => "Available Editors in Authoring Space", - 'managers' => "Co-authors who can add/revoke roles", - 'archive' => "Managers can download tar.gz file of Authoring Space", - 'edit' => 'Standard editor (Edit)', - 'xml' => 'Text editor (EditXML)', - 'daxe' => 'Daxe editor (Daxe)', + 'chto' => 'Changed To:' ); if ($changed) { $r->print('

'.$lt{'uic'}.'

'. @@ -4066,13 +3525,10 @@ sub display_userinfo { } foreach my $entry (@{$order}) { if ($canshow->{$entry}) { - if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') || - ($entry eq 'requestauthor') || ($entry eq 'authordefaults')) { + if (($entry eq 'requestcourses') || ($entry eq 'reqcrsotherdom') || ($entry eq 'requestauthor')) { my @items; if ($entry eq 'requestauthor') { @items = ($entry); - } elsif ($entry eq 'authordefaults') { - @items = ('webdav','managers','editors','archive'); } else { @items = @{$requestcourses}; } @@ -4080,27 +3536,19 @@ sub display_userinfo { if (($newsetting->{$item} ne $oldsetting->{$item}) || ($newsettingtext->{$item} ne $oldsettingtext->{$item})) { $r->print(&Apache::loncommon::start_data_table_row()."\n"); - $r->print("$lt{$item}\n"); - unless ($item eq 'managers') { - $r->print($oldsetting->{$item}); - } + $r->print("$lt{$item}\n"); + $r->print("".$oldsetting->{$item}); if ($oldsettingtext->{$item}) { if ($oldsetting->{$item}) { - unless ($item eq 'managers') { - $r->print(' -- '); - } + $r->print(' -- '); } $r->print($oldsettingtext->{$item}); } - $r->print("\n"); - unless ($item eq 'managers') { - $r->print($newsetting->{$item}); - } + $r->print("\n"); + $r->print("".$newsetting->{$item}); if ($newsettingtext->{$item}) { if ($newsetting->{$item}) { - unless ($item eq 'managers') { - $r->print(' -- '); - } + $r->print(' -- '); } $r->print($newsettingtext->{$item}); } @@ -4261,11 +3709,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 +3722,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 +3740,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 +3748,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 +3766,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 +3776,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 +3817,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 +3828,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 +3845,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'"); @@ -4565,6 +3863,70 @@ sub tool_changes { return; } +sub adhocrole_changes { + my ($changehashref,$userenv) = @_; + my @adds = &Apache::loncommon::get_env_multiple('form.adhocroleadd'); + my @dels = &Apache::loncommon::get_env_multiple('form.adhocroledel'); + my (@saved,@added,@alladhoc,$changed); + my $adhoc_key = 'adhocroles.'.$env{'request.role.domain'}; + if (!$env{'form.makeuser'}) { + if (ref($userenv) eq 'HASH') { + my @current; + if ($userenv->{$adhoc_key}) { + @current = split(/,/,$userenv->{$adhoc_key}); + if (@dels) { + foreach my $curr (@current) { + next if ($curr eq ''); + unless (grep(/\Q$curr\E$/,@dels)) { + push(@saved,$curr); + } + } + $changed = 1; + } else { + @saved = @current; + } + } + } + } + if (@adds) { + my $confname = &Apache::lonnet::get_domainconfiguser($env{'request.role.domain'}); + my %existing=&Apache::lonnet::dump('roles',$env{'request.role.domain'}, + $confname,'rolesdef_'); + foreach my $poss (@adds) { + if (exists($existing{'rolesdef_'.$poss})) { + push(@added,$poss); + $changed = 1; + } + } + } + if (@added) { + if (@saved) { + foreach my $add (@added) { + unless (grep(/^\Q$add\E$/,@saved)) { + push(@alladhoc,$add); + } + } + } else { + push(@alladhoc,@added); + } + } + if (@saved) { + push(@alladhoc,@saved); + } + if (@alladhoc) { + my $adhocstr = join(',',sort(@alladhoc)); + $changehashref->{$adhoc_key} = $adhocstr; + } elsif (@dels) { + &Apache::lonnet::del('environment',[$adhoc_key],$env{'form.ccdomain'},$env{'form.ccuname'}); + delete($changehashref->{$adhoc_key}); + if (($env{'form.ccdomain'} eq $env{'user.domain'}) && + ($env{'form.ccuname'} eq $env{'user.name'})) { + &Apache::lonnet::delenv($adhoc_key); + } + } + return $changed; +} + sub update_roles { my ($r,$context,$showcredits) = @_; my $now=time; @@ -5041,10 +4403,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 +4413,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; } @@ -5103,9 +4457,9 @@ sub build_roles { # ========================================================== Custom Role Editor sub custom_role_editor { - my ($r,$context,$brcrum,$prefix,$permission) = @_; + my ($r,$brcrum,$prefix) = @_; my $action = $env{'form.customroleaction'}; - my ($rolename,$helpitem); + my $rolename; if ($action eq 'new') { $rolename=$env{'form.newrolename'}; } else { @@ -5116,17 +4470,14 @@ sub custom_role_editor { if ($env{'request.course.id'}) { $crstype = &Apache::loncommon::course_type(); $context = 'course'; - $helpitem = 'Course_Editing_Custom_Roles'; } else { $context = 'domain'; $crstype = 'course'; - $helpitem = 'Domain_Editing_Custom_Roles'; } $rolename=~s/[^A-Za-z0-9]//gs; if (!$rolename || $env{'form.phase'} eq 'pickrole') { - &print_username_entry_form($r,$context,undef,undef,undef,$crstype,$brcrum, - $permission); + &print_username_entry_form($r,undef,undef,undef,undef,$crstype,$brcrum); return; } @@ -5181,10 +4532,11 @@ sub custom_role_editor { text => "Edit custom role", faq => 282, bug => 'Instructor Interface', - help => $helpitem} + help => 'Course_Editing_Custom_Roles'} ); my $args = { bread_crumbs => $brcrum, bread_crumbs_component => 'User Management'}; + $r->print(&Apache::loncommon::start_page('Custom Role Editor', $head_script,$args). $body_top); @@ -5208,11 +4560,11 @@ ENDCCF # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my ($r,$context,$brcrum,$prefix,$permission) = @_; + my ($r,$context,$brcrum,$prefix) = @_; my $rolename=$env{'form.rolename'}; $rolename=~s/[^A-Za-z0-9]//gs; if (!$rolename) { - &custom_role_editor($r,$context,$brcrum,$prefix,$permission); + &custom_role_editor($r,$brcrum,$prefix); return; } my ($jsback,$elements) = &crumb_utilities(); @@ -5221,10 +4573,6 @@ sub set_custom_role { .$jsback."\n" .'// ]]>'."\n" .''."\n"; - my $helpitem = 'Course_Editing_Custom_Roles'; - if ($context eq 'domain') { - $helpitem = 'Domain_Editing_Custom_Roles'; - } push(@{$brcrum}, {href => "javascript:backPage(document.customresult,'pickrole','')", text => "Pick custom role", @@ -5238,7 +4586,7 @@ sub set_custom_role { text => "Result", faq => 282, bug => 'Instructor Interface', - help => $helpitem,} + help => 'Course_Editing_Custom_Roles'}, ); my $args = { bread_crumbs => $brcrum, bread_crumbs_component => 'User Management'}; @@ -5301,164 +4649,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; @@ -5467,96 +4657,19 @@ sub handler { $r->send_http_header; return OK; } - my ($context,$crstype,$cid,$cnum,$cdom,$allhelpitems); - + my ($context,$crstype); if ($env{'request.course.id'}) { $context = 'course'; $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; - if ($context eq 'course') { - $cid = $env{'request.course.id'}; - $cdom = $env{'course.'.$cid.'.domain'}; - $cnum = $env{'course.'.$cid.'.num'}; - - if ($permission->{'cusr'}) { - push(@allhelp,'Course_Create_Class_List'); - } - if ($permission->{'view'} || $permission->{'cusr'}) { - push(@allhelp,('Course_Change_Privileges','Course_View_Class_List')); - } - if ($permission->{'custom'}) { - push(@allhelp,'Course_Editing_Custom_Roles'); - } - if ($permission->{'cusr'}) { - push(@allhelp,('Course_Add_Student','Course_Drop_Student')); - } - unless ($permission->{'cusr_section'}) { - if (&Apache::lonnet::auto_run($cnum,$cdom) && (($permission->{'cusr'}) || ($permission->{'view'}))) { - push(@allhelp,'Course_Automated_Enrollment'); - } - if (($permission->{'selfenrolladmin'}) || ($permission->{'selfenrollview'})) { - push(@allhelp,'Course_Approve_Selfenroll'); - } - } - if ($permission->{'grp_manage'}) { - push(@allhelp,'Course_Manage_Group'); - } - if ($permission->{'view'} || $permission->{'cusr'}) { - push(@allhelp,'Course_User_Logs'); - } - } 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'); - if ($permission->{'activity'}) { - push(@allhelp,'Domain_User_Access_Logs'); - } - push(@allhelp,('Domain_Create_Users','Domain_View_Users_List')); - if ($permission->{'custom'}) { - push(@allhelp,'Domain_Editing_Custom_Roles'); - } - push(@allhelp,('Domain_Role_Approvals','Domain_Username_Approvals','Domain_Change_Logs')); - } elsif ($permission->{'view'}) { - push(@allhelp,'Domain_View_Privileges'); - if ($permission->{'activity'}) { - push(@allhelp,'Domain_User_Access_Logs'); - } - push(@allhelp,('Domain_View_Users_List','Domain_Change_Logs')); - } - } - if (@allhelp) { - $allhelpitems = join(',',@allhelp); - } - } - &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 = []; @@ -5564,16 +4677,17 @@ sub handler { if (($env{'form.action'} ne 'dateselect') && ($env{'form.action'} ne 'displayuserreq')) { $brcrum = [{href=>"/adm/createuser", text=>"User Management", - help=>$allhelpitems} + help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'} ]; } + #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); if (!$allowed) { 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 ". @@ -5601,16 +4715,10 @@ sub handler { $r->print(&header(undef,$args)); $r->print(&print_main_menu($permission,$context,$crstype)); } elsif ($env{'form.action'} eq 'upload' && $permission->{'cusr'}) { - my $helpitem = 'Course_Create_Class_List'; - if ($context eq 'author') { - $helpitem = 'Author_Create_Coauthor_List'; - } elsif ($context eq 'domain') { - $helpitem = 'Domain_Create_Users'; - } push(@{$brcrum}, { href => '/adm/createuser?action=upload&state=', text => 'Upload Users List', - help => $helpitem, + help => 'Course_Create_Class_List', }); $bread_crumbs_component = 'Upload Users List'; $args = {bread_crumbs => $brcrum, @@ -5622,41 +4730,16 @@ 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 = - &Apache::lonuserutils::print_upload_manager_form($r,$context, - $permission, - $crstype,$showcredits); - if ($result eq 'missingdata') { - delete($env{'form.state'}); - &Apache::lonuserutils::print_first_users_upload_form($r,$context); - } + &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission, + $crstype,$showcredits); } elsif ($env{'form.state'} eq 'enrolling') { if ($env{'form.datatoken'}) { - my $result = &Apache::lonuserutils::upfile_drop_add($r,$context, - $permission, - $showcredits); - if ($result eq 'missingdata') { - delete($env{'form.state'}); - &Apache::lonuserutils::print_first_users_upload_form($r,$context); - } elsif ($result eq 'invalidhome') { - $env{'form.state'} = 'got_file'; - delete($env{'form.lcserver'}); - my $result = - &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission, - $crstype,$showcredits); - if ($result eq 'missingdata') { - delete($env{'form.state'}); - &Apache::lonuserutils::print_first_users_upload_form($r,$context); - } - } - } else { - delete($env{'form.state'}); - &Apache::lonuserutils::print_first_users_upload_form($r,$context); + &Apache::lonuserutils::upfile_drop_add($r,$context,$permission, + $showcredits); } } else { &Apache::lonuserutils::print_first_users_upload_form($r,$context); } - $r->print(''); } elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'} eq 'singlestudent')) && ($permission->{'cusr'})) || (($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) || @@ -5680,7 +4763,7 @@ sub handler { .''; $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response,$srch,undef, - $crstype,$brcrum,$permission); + $crstype,$brcrum,$showcredits); } else { my $ccuname =&LONCAPA::clean_username($srch->{'srchterm'}); my $ccdomain=&LONCAPA::clean_domain($srch->{'srchdomain'}); @@ -5725,8 +4808,7 @@ sub handler { # } #} &print_username_entry_form($r,$context,$response,$srch, - $forcenewuser,$crstype,$brcrum, - $permission); + $forcenewuser,$crstype,$brcrum); } else { &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); } @@ -5743,8 +4825,7 @@ sub handler { } else { $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response,$srch, - $forcenewuser,$crstype,$brcrum, - $permission); + $forcenewuser,$crstype,$brcrum); } } elsif ($env{'form.phase'} eq 'userpicked') { my $ccuname = &LONCAPA::clean_username($env{'form.seluname'}); @@ -5762,17 +4843,17 @@ sub handler { &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); } } elsif ($env{'form.phase'} eq 'update_user_data') { - &update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission); + &update_user_data($r,$context,$crstype,$brcrum,$showcredits); } else { &print_username_entry_form($r,$context,undef,$srch,undef,$crstype, - $brcrum,$permission); + $brcrum); } } elsif ($env{'form.action'} eq 'custom' && $permission->{'custom'}) { my $prefix; if ($env{'form.phase'} eq 'set_custom_roles') { - &set_custom_role($r,$context,$brcrum,$prefix,$permission); + &set_custom_role($r,$context,$brcrum,$prefix); } else { - &custom_role_editor($r,$context,$brcrum,$prefix,$permission); + &custom_role_editor($r,$brcrum,$prefix); } } elsif (($env{'form.action'} eq 'processauthorreq') && ($permission->{'cusr'}) && @@ -5878,92 +4959,56 @@ sub handler { unless ($usertype) { $usertype = 'default'; } - my ($showstatus,$showemail,$pickstart); - my $numextras = 0; - my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); - if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) { - if (ref($usertypes) eq 'HASH') { - if ($usertypes->{$usertype}) { - $showstatus = $usertypes->{$usertype}; - } else { - $showstatus = $othertitle; - } - if ($showstatus) { - $numextras ++; - } - } - } - if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) { - $showemail = $info{$uname}{'email'}; - $numextras ++; - } if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') { if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) { - $pickstart = 1; $r->print('
'.&Apache::lonhtmlcommon::start_pick_box()); - my ($num,$count); + my ($num,$count,$showstatus); $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}})); - $count += $numextras; + unless ($usertype eq 'default') { + my ($othertitle,$usertypes,$types) = + &Apache::loncommon::sorted_inst_types($dom); + if (ref($usertypes) eq 'HASH') { + if ($usertypes->{$usertype}) { + $showstatus = $usertypes->{$usertype}; + $count ++; + } + } + } foreach my $field (@{$infofields}) { next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field}); next unless ($infotitles->{$field}); $r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}). $info{$uname}{$field}); $num ++; - unless ($count == $num) { + if ($count == $num) { + $r->print(&Apache::lonhtmlcommon::row_closure(1)); + } else { $r->print(&Apache::lonhtmlcommon::row_closure()); } } - } - } - if ($numextras) { - unless ($pickstart) { - $r->print('
'.&Apache::lonhtmlcommon::start_pick_box()); - $pickstart = 1; - } - if ($showemail) { - my $closure = ''; - unless ($showstatus) { - $closure = 1; + if ($showstatus) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')). + $showstatus. + &Apache::lonhtmlcommon::row_closure(1)); } - $r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')). - $showemail. - &Apache::lonhtmlcommon::row_closure($closure)); - } - if ($showstatus) { - $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','
')). - $showstatus. - &Apache::lonhtmlcommon::row_closure(1)); + $r->print(&Apache::lonhtmlcommon::end_pick_box().'
'); } } - if ($pickstart) { - $r->print(&Apache::lonhtmlcommon::end_pick_box().'
'); - } else { - $r->print('
'.&mt('No information to display for this account request.').'
'); - } - } else { - $r->print('
'.&mt('No information available for this account request.').'
'); } } } } + $r->print(&close_popup_form()); } - $r->print(&close_popup_form()); } elsif (($env{'form.action'} eq 'listusers') && ($permission->{'view'} || $permission->{'cusr'})) { - my $helpitem = 'Course_View_Class_List'; - if ($context eq 'author') { - $helpitem = 'Author_View_Coauthor_List'; - } elsif ($context eq 'domain') { - $helpitem = 'Domain_View_Users_List'; - } if ($env{'form.phase'} eq 'bulkchange') { push(@{$brcrum}, {href => '/adm/createuser?action=listusers', text => "List Users"}, {href => "/adm/createuser", text => "Result", - help => $helpitem}); + help => 'Course_View_Class_List'}); $bread_crumbs_component = 'Update Users'; $args = {bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; @@ -5980,7 +5025,7 @@ sub handler { push(@{$brcrum}, {href => '/adm/createuser?action=listusers', text => "List Users", - help => $helpitem}); + help => 'Course_View_Class_List'}); $bread_crumbs_component = 'List Users'; $args = {bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; @@ -6060,9 +5105,11 @@ 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 $cid = $env{'request.course.id'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $cnum = $env{'course.'.$cid.'.num'}; + 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 +5125,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 +5145,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').''); @@ -6119,18 +5154,21 @@ sub handler { push(@{$brcrum}, {href => '/adm/createuser?action=selfenrollqueue', text => 'Enrollment requests', - help => 'Course_Approve_Selfenroll'}); + help => 'Course_Self_Enrollment'}); $bread_crumbs_component = 'Enrollment requests'; if ($env{'form.state'} eq 'done') { push(@{$brcrum}, {href => '/adm/createuser?action=selfenrollqueue', text => 'Result', - help => 'Course_Approve_Selfenroll'}); + help => 'Course_Self_Enrollment'}); $bread_crumbs_component = 'Enrollment result'; } $args = { bread_crumbs => $brcrum, bread_crumbs_component => $bread_crumbs_component}; $r->print(&header(undef,$args)); + my $cid = $env{'request.course.id'}; + my $cdom = $env{'course.'.$cid.'.domain'}; + my $cnum = $env{'course.'.$cid.'.num'}; my $coursedesc = $env{'course.'.$cid.'.description'}; if (!exists($env{'form.state'})) { $r->print('

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

'."\n"); @@ -6139,7 +5177,7 @@ sub handler { } elsif ($env{'form.state'} eq 'done') { $r->print('

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

'."\n"); $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, - $cdom,$cnum,$coursedesc)); + $cdom,$cnum,$coursedesc)); } } else { $r->print(&header(undef,{'no_nav_bar' => 1}). @@ -6152,80 +5190,6 @@ sub handler { $r->print(&header(undef,{'no_nav_bar' => 1}). ''.&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 ($env{'form.state'} eq 'process') { - if ($permission->{'owner'}) { - &update_helpdeskaccess($r,$permission,$brcrum); - } else { - &print_helpdeskaccess_display($r,$permission,$brcrum); - } - } else { - &print_helpdeskaccess_display($r,$permission,$brcrum); - } - } else { - $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 +5296,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 +5381,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; } @@ -6497,8 +5443,9 @@ sub print_main_menu { ); if ($linkcontext eq 'domain') { unless ($permission->{'cusr'}) { - $links{'domain'}{'singleuser'} = 'View a User'; + $links{'domain'}{'singleuser'} = 'View a User'; $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain'; + } } elsif ($linkcontext eq 'course') { unless ($permission->{'cusr'}) { @@ -6559,7 +5506,7 @@ sub print_main_menu { { linktext => 'User Access Log', icon => 'document-properties.png', - #help => 'Domain_User_Access_Logs', + #help => 'User_Access_Logs', url => '/adm/createuser?action=accesslogs', permission => $permission->{'activity'}, linktitle => 'View user access log.', @@ -6616,6 +5563,7 @@ sub print_main_menu { groups => 'Community Groups', }, ); + $linktext{'Placement'} = $linktext{'Course'}; my %linktitle = ( 'Course' => { @@ -6630,6 +5578,8 @@ sub print_main_menu { }, ); + $linktitle{'Placement'} = $linktitle{'Course'}; + push(@{ $menu[0]->{items} }, #Category: Single Users { linktext => $linktext{$crstype}{'single'}, @@ -6652,16 +5602,7 @@ sub print_main_menu { }, ); push(@{ $menu[2]->{items} }, #Category: Administration - { - linktext => 'Helpdesk Access', - icon => 'helpdesk-access.png', - #help => 'Course_Helpdesk_Access', - url => '/adm/createuser?action=helpdesk', - permission => (($permission->{'owner'} || $permission->{'co-owner'}) && - ($permission->{'view'} || $permission->{'cusr'})), - linktitle => 'Helpdesk access options', - }, - { + { linktext => 'Custom Roles', icon => 'emblem-photos.png', #help => 'Course_Editing_Custom_Roles', @@ -6693,7 +5634,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 +5661,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 +5676,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); @@ -6922,13 +5847,12 @@ function validate_types(form) { } function check_types(num,countfail,needaction) { - var boxname = 'selfenroll_types_'+num; - var typeidx = getIndexByName(boxname); + var typeidx = getIndexByName('selfenroll_types_'+num); var count = 0; if (typeidx != -1) { - if (document.$formname.elements[boxname].length) { - for (var k=0; k'."\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') { @@ -7266,7 +6191,7 @@ ENDSCRIPT } elsif ($item eq 'approval') { my ($currnotified,$currapproval,%appchecked); my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs(); - if (ref($currsettings) eq 'HASH') { + if (ref($currsettings) eq 'HASH') { $currnotified = $currsettings->{'selfenroll_notifylist'}; $currapproval = $currsettings->{'selfenroll_approval'}; } @@ -7530,7 +6455,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 +6467,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 +6599,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); } @@ -7704,10 +6615,6 @@ sub print_userchangelogs_display { my $helpitem; if ($context eq 'course') { $helpitem = 'Course_User_Logs'; - } elsif ($context eq 'domain') { - $helpitem = 'Domain_Role_Logs'; - } elsif ($context eq 'author') { - $helpitem = 'Author_User_Logs'; } push (@{$brcrum}, {href => '/adm/createuser?action=changelogs', @@ -7818,7 +6725,7 @@ ENDSCRIPT } } if (($context eq 'course') && ($viewablesec ne '')) { - next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec); + next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec); } $count ++; next if ($count < $minshown); @@ -7907,39 +6814,30 @@ sub print_useraccesslogs_display { my $form = 'document.accesslog'; # set breadcrumbs - my %breadcrumb_text = &singleuser_breadcrumb('','domain',$udom); - my $prevphasestr; - if ($env{'form.popup'}) { - $brcrum = []; - } else { - push (@{$brcrum}, - {href => "javascript:backPage($form)", - text => $breadcrumb_text{'search'}}); - my @prevphases; - if ($env{'form.prevphases'}) { - @prevphases = split(/,/,$env{'form.prevphases'}); - $prevphasestr = $env{'form.prevphases'}; - } - if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) { - push(@{$brcrum}, - {href => "javascript:backPage($form,'get_user_info','select')", - text => $breadcrumb_text{'userpicked'}}); - if ($env{'form.phase'} eq 'userpicked') { - $prevphasestr = 'userpicked'; - } + my %breadcrumb_text = &singleuser_breadcrumb(); + push (@{$brcrum}, + {href => "javascript:backPage($form)", + text => $breadcrumb_text{'search'}}); + my (@prevphases,$prevphasestr); + if ($env{'form.prevphases'}) { + @prevphases = split(/,/,$env{'form.prevphases'}); + $prevphasestr = $env{'form.prevphases'}; + } + if (($env{'form.phase'} eq 'userpicked') || (grep(/^userpicked$/,@prevphases))) { + push(@{$brcrum}, + {href => "javascript:backPage($form,'get_user_info','select')", + text => $breadcrumb_text{'userpicked'}}); + if ($env{'form.phase'} eq 'userpicked') { + $prevphasestr = 'userpicked'; } } push(@{$brcrum}, {href => '/adm/createuser?action=accesslogs', text => 'User access logs', - help => 'Domain_User_Access_Logs'}); + help => 'User_Access_Logs'}); my $bread_crumbs_component = 'User Access Logs'; my $args = { bread_crumbs => $brcrum, bread_crumbs_component => 'User Management'}; - if ($env{'form.popup'}) { - $args->{'no_nav_bar'} = 1; - $args->{'bread_crumbs_nomenu'} = 1; - } # set javascript my ($jsback,$elements) = &crumb_utilities(); @@ -7964,12 +6862,8 @@ ENDSCRIPT unless ($permission->{'activity'}) { $r->print('

' .&mt('You do not have rights to display user access logs.') - .'

'); - if ($env{'form.popup'}) { - $r->print('

'.&mt('Close window').'

'); - } else { - $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom)); - } + .'

' + .&earlyout_accesslog_form($formname,$prevphasestr,$udom)); return; } @@ -7989,24 +6883,6 @@ ENDSCRIPT return; } - if (&Apache::lonnet::privileged($uname,$udom, - [$env{'request.role.domain'}],['dc','su'])) { - unless (&Apache::lonnet::privileged($env{'user.name'},$env{'user.domain'}, - [$env{'request.role.domain'}],['dc','su'])) { - $r->print('

' - .&mt('You need to be a privileged user to display user access logs for [_1]', - &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom), - $uname,$udom)) - .'

'); - if ($env{'form.popup'}) { - $r->print('

'.&mt('Close window').'

'); - } else { - $r->print(&earlyout_accesslog_form($formname,$prevphasestr,$udom)); - } - return; - } - } - # set defaults my $now = time(); my $defstart = $now - (7*24*3600); @@ -8053,11 +6929,8 @@ ENDSCRIPT my ($nav_script,$nav_links); # table header - my $heading = '

'. - &mt('User access logs for: [_1]', - &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)).'

'; - my $tableheader = $heading - .&Apache::loncommon::start_data_table_header_row() + my $tableheader = + &Apache::loncommon::start_data_table_header_row() .' ' .''.&mt('When').'' .''.&mt('HostID').'' @@ -8094,7 +6967,7 @@ ENDSCRIPT $showntableheader = 1; } my ($shown,$extra); - my ($event,$data) = split(/\s+/,&unescape($event),2); + my ($event,$data) = split(/\s+/,&unescape($event)); if ($event eq 'Role') { my ($rolecode,$extent) = split(/\./,$data,2); next if ($extent eq ''); @@ -8146,17 +7019,8 @@ ENDSCRIPT $shown = &mt('Role selection: [_1]',$rolename); } else { $shown = &mt($event); - if ($data =~ /^webdav/) { - my ($path,$clientip) = split(/\s+/,$data,2); - $path =~ s/^webdav//; - if ($clientip ne '') { - $extra = &mt('Client IP address: [_1]',$clientip); - } - if ($path ne '') { - $shown .= ' '.&mt('(WebDAV access to [_1])',$path); - } - } elsif ($data ne '') { - $extra = &mt('Client IP address: [_1]',$data); + if ($data ne '') { + $extra = &mt('Client IP address: [_1]',$data); } } $r->print( @@ -8174,15 +7038,11 @@ ENDSCRIPT $r->print(&Apache::loncommon::end_data_table(). &userlogdisplay_navlinks(\%curr,$more_records)); } else { # No content displayed above - $r->print($heading.'

' + $r->print('

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

'); } - if ($env{'form.popup'} == 1) { - $r->print(''."\n"); - } - # Form Footer $r->print( '' @@ -8265,7 +7125,7 @@ sub activity_display_filter { # Update Display button $output .= '

' .'' - .'

'; + .'

'; return $output; } @@ -8363,12 +7223,12 @@ sub role_display_filter { &mt('Context:').'
'. - ''); - } else { - if ($env{'course.'.$env{'request.course.id'}.'.internal.courseowner'}) { - my ($ownername,$ownerdom) = split(/:/,$env{'course.'.$env{'request.course.id'}.'.internal.courseowner'}); - $r->print('
'.&mt('The course owner -- [_1] -- can override the default access and/or privileges for these ad hoc roles.', - &Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($ownername,$ownerdom),$ownername,$ownerdom))); - } - $disabled = ' disabled="disabled"'; - } - $r->print('

'); - - $r->print('
    '); - my $count = 0; - my %visibility; - foreach my $role (@roles_by_num) { - my $id; - if ($count == 0) { - $id=' id="LC_current_minitab"'; - $visibility{$role} = ' style="display:block"'; - } else { - $visibility{$role} = ' style="display:none"'; - } - $count ++; - $r->print(''.$description{$role}.''); - } - $r->print('
'); - - foreach my $role (@roles_by_num) { - my %usecheck = ( - all => ' checked="checked"', - ); - my %displaydiv = ( - status => 'none', - inc => 'none', - exc => 'none', - priv => 'block', - ); - my (%selected,$overridden,$incrscheck,$indomcheck,$indomvis,$incrsvis); - if (ref($settings{$role}) eq 'HASH') { - if ($settings{$role}{'access'} ne '') { - $indomvis = ' style="display:none"'; - $incrsvis = ' style="display:block"'; - $incrscheck = ' checked="checked"'; - if ($settings{$role}{'access'} ne 'all') { - $usecheck{$settings{$role}{'access'}} = $usecheck{'all'}; - delete($usecheck{'all'}); - if ($settings{$role}{'access'} eq 'status') { - my $access = 'status'; - $displaydiv{$access} = 'inline'; - if (ref($settings{$role}{$access}) eq 'ARRAY') { - $selected{$access} = $settings{$role}{$access}; - } - } elsif ($settings{$role}{'access'} =~ /^(inc|exc)$/) { - my $access = $1; - $displaydiv{$access} = 'inline'; - if (ref($settings{$role}{$access}) eq 'ARRAY') { - $selected{$access} = $settings{$role}{$access}; - } - } elsif ($settings{$role}{'access'} eq 'none') { - $displaydiv{'priv'} = 'none'; - } - } - } else { - $indomcheck = ' checked="checked"'; - $indomvis = ' style="display:block"'; - $incrsvis = ' style="display:none"'; - } - } else { - $indomcheck = ' checked="checked"'; - $indomvis = ' style="display:block"'; - $incrsvis = ' style="display:none"'; - } - $r->print('
'. - '
'.$lt{'rou'}.''. - '

'.$lt{'whi'}.' '. - ''. - ''.(' 'x2). - '

'. - '
'. - ''.$domusage{$role}.'
'. - '
'); - foreach my $access (@accesstypes) { - $r->print('

'); - if ($access eq 'status') { - $r->print('

'. - &Apache::lonuserutils::adhoc_status_types($cdom,undef,$role,$selected{$access}, - $othertitle,$usertypes,$types,$disabled). - '
'); - } elsif (($access eq 'inc') && (keys(%domhelpdesk) > 0)) { - $r->print('
'. - &Apache::lonuserutils::adhoc_staff($access,undef,$role,$selected{$access}, - \%domhelpdesk,$disabled). - '
'); - } elsif (($access eq 'exc') && (keys(%domhelpdesk) > 0)) { - $r->print('
'. - &Apache::lonuserutils::adhoc_staff($access,undef,$role,$selected{$access}, - \%domhelpdesk,$disabled). - '
'); - } - $r->print('

'); - } - $r->print('
'); - my %full=(); - my %levels= ( - course => {}, - domain => {}, - system => {}, - ); - my %levelscurrent=( - course => {}, - domain => {}, - system => {}, - ); - &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent); - $r->print('
'. - ''.$lt{'rpr'}.''. - &role_priv_table($role,$permission,$crstype,\%full,\%levels,\%levelscurrent,$overridden{$role}). - '
'); - } - if ($permission->{'owner'}) { - $r->print('

'); - } - } else { - $r->print(&mt('Helpdesk roles have not yet been created in this domain.')); - } - # Form Footer - $r->print('' - .''); - return; -} - -sub domain_adhoc_access { - my ($roles,$domcurrent,$accesstypes,$usertypes,$othertitle) = @_; - my %domusage; - return unless ((ref($roles) eq 'HASH') && (ref($domcurrent) eq 'HASH') && (ref($accesstypes) eq 'ARRAY')); - foreach my $role (keys(%{$roles})) { - if (ref($domcurrent->{$role}) eq 'HASH') { - my $access = $domcurrent->{$role}{'access'}; - if (($access eq '') || (!grep(/^\Q$access\E$/,@{$accesstypes}))) { - $access = 'all'; - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role',&Apache::lonnet::plaintext('dh'), - &Apache::lonnet::plaintext('da')); - } elsif ($access eq 'status') { - if (ref($domcurrent->{$role}{$access}) eq 'ARRAY') { - my @shown; - foreach my $type (@{$domcurrent->{$role}{$access}}) { - unless ($type eq 'default') { - if ($usertypes->{$type}) { - push(@shown,$usertypes->{$type}); - } - } - } - if (grep(/^default$/,@{$domcurrent->{$role}{$access}})) { - push(@shown,$othertitle); - } - if (@shown) { - my $shownstatus = join(' '.&mt('or').' ',@shown); - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role, and institutional status: [_3]', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownstatus); - } else { - $domusage{$role} = &mt('No one in the domain'); - } - } - } elsif ($access eq 'inc') { - my @dominc = (); - if (ref($domcurrent->{$role}{'inc'}) eq 'ARRAY') { - foreach my $user (@{$domcurrent->{$role}{'inc'}}) { - my ($uname,$udom) = split(/:/,$user); - push(@dominc,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)); - } - my $showninc = join(', ',@dominc); - if ($showninc ne '') { - $domusage{$role} = &mt('Include any user in domain with active [_1] or [_2] role, except: [_3]', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$showninc); - } else { - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); - } - } - } elsif ($access eq 'exc') { - my @domexc = (); - if (ref($domcurrent->{$role}{'exc'}) eq 'ARRAY') { - foreach my $user (@{$domcurrent->{$role}{'exc'}}) { - my ($uname,$udom) = split(/:/,$user); - push(@domexc,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom),$uname,$udom)); - } - } - my $shownexc = join(', ',@domexc); - if ($shownexc ne '') { - $domusage{$role} = &mt('Only the following in the domain with active [_1] or [_2] role: [_3]', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da'),$shownexc); - } else { - $domusage{$role} = &mt('No one in the domain'); - } - } elsif ($access eq 'none') { - $domusage{$role} = &mt('No one in the domain'); - } elsif ($access eq 'dh') { - $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('dh')); - } elsif ($access eq 'da') { - $domusage{$role} = &mt('Any user in domain with active [_1] role',&Apache::lonnet::plaintext('da')); - } elsif ($access eq 'all') { - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); - } - } else { - $domusage{$role} = &mt('Any user in domain with active [_1] or [_2] role', - &Apache::lonnet::plaintext('dh'),&Apache::lonnet::plaintext('da')); - } - } - return %domusage; -} - -sub get_domain_customroles { - my ($cdom,$confname) = @_; - my %existing=&Apache::lonnet::dump('roles',$cdom,$confname,'rolesdef_'); - my %customroles; - foreach my $key (keys(%existing)) { - if ($key=~/^rolesdef\_(\w+)$/) { - my $rolename = $1; - my %privs; - ($privs{'system'},$privs{'domain'},$privs{'course'}) = split(/\_/,$existing{$key}); - $customroles{$rolename} = \%privs; - } - } - return %customroles; -} - -sub role_priv_table { - my ($role,$permission,$crstype,$full,$levels,$levelscurrent,$overridden) = @_; - return unless ((ref($full) eq 'HASH') && (ref($levels) eq 'HASH') && - (ref($levelscurrent) eq 'HASH')); - my %lt=&Apache::lonlocal::texthash ( - 'crl' => 'Course Level Privilege', - 'def' => 'Domain Defaults', - 'ove' => 'Override in Course', - 'ine' => 'In effect', - 'dis' => 'Disabled', - 'ena' => 'Enabled', - ); - if ($crstype eq 'Community') { - $lt{'ove'} = 'Override in Community', - } - my @status = ('Disabled','Enabled'); - my (%on,%off); - if (ref($overridden) eq 'HASH') { - if (ref($overridden->{'on'}) eq 'ARRAY') { - map { $on{$_} = 1; } (@{$overridden->{'on'}}); - } - if (ref($overridden->{'off'}) eq 'ARRAY') { - map { $off{$_} = 1; } (@{$overridden->{'off'}}); - } - } - my $output=&Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_header_row(). - ''.$lt{'crl'}.''.$lt{'def'}.''.$lt{'ove'}. - ''.$lt{'ine'}.''. - &Apache::loncommon::end_data_table_header_row(); - foreach my $priv (sort(keys(%{$full}))) { - next unless ($levels->{'course'}{$priv}); - my $privtext = &Apache::lonnet::plaintext($priv,$crstype); - my ($default,$ineffect); - if ($levelscurrent->{'course'}{$priv}) { - $default = ''.$lt{'ena'}.''; - $ineffect = $default; - } - my ($customstatus,$checked); - $output .= &Apache::loncommon::start_data_table_row(). - ''.$privtext.''. - ''.$default.''; - if (($levelscurrent->{'course'}{$priv}) && ($off{$priv})) { - if ($permission->{'owner'}) { - $checked = ' checked="checked"'; - } - $customstatus = ''.$lt{'dis'}.''; - $ineffect = $customstatus; - } elsif ((!$levelscurrent->{'course'}{$priv}) && ($on{$priv})) { - if ($permission->{'owner'}) { - $checked = ' checked="checked"'; - } - $customstatus = ''.$lt{'ena'}.''; - $ineffect = $customstatus; - } - if ($permission->{'owner'}) { - $output .= ''; - } else { - $output .= $customstatus; - } - $output .= ''.$ineffect.''. - &Apache::loncommon::end_data_table_row(); - } - $output .= &Apache::loncommon::end_data_table(); - return $output; -} - -sub get_adhocrole_settings { - my ($cid,$accesstypes,$types,$customroles,$settings,$overridden) = @_; - return unless ((ref($accesstypes) eq 'ARRAY') && (ref($customroles) eq 'HASH') && - (ref($settings) eq 'HASH') && (ref($overridden) eq 'HASH')); - foreach my $role (split(/,/,$env{'course.'.$cid.'.internal.adhocaccess'})) { - my ($curraccess,$rest) = split(/=/,$env{'course.'.$cid.'.internal.adhoc.'.$role}); - if (($curraccess ne '') && (grep(/^\Q$curraccess\E$/,@{$accesstypes}))) { - $settings->{$role}{'access'} = $curraccess; - if (($curraccess eq 'status') && (ref($types) eq 'ARRAY')) { - my @status = split(/,/,$rest); - my @currstatus; - foreach my $type (@status) { - if ($type eq 'default') { - push(@currstatus,$type); - } elsif (grep(/^\Q$type\E$/,@{$types})) { - push(@currstatus,$type); - } - } - if (@currstatus) { - $settings->{$role}{$curraccess} = \@currstatus; - } elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) { - my @personnel = split(/,/,$rest); - $settings->{$role}{$curraccess} = \@personnel; - } - } - } - } - foreach my $role (keys(%{$customroles})) { - if ($env{'course.'.$cid.'.internal.adhocpriv.'.$role}) { - my %currentprivs; - if (ref($customroles->{$role}) eq 'HASH') { - if (exists($customroles->{$role}{'course'})) { - my %full=(); - my %levels= ( - course => {}, - domain => {}, - system => {}, - ); - my %levelscurrent=( - course => {}, - domain => {}, - system => {}, - ); - &Apache::lonuserutils::custom_role_privs($customroles->{$role},\%full,\%levels,\%levelscurrent); - %currentprivs = %{$levelscurrent{'course'}}; - } - } - foreach my $item (split(/,/,$env{'course.'.$cid.'.internal.adhocpriv.'.$role})) { - next if ($item eq ''); - my ($rule,$rest) = split(/=/,$item); - next unless (($rule eq 'off') || ($rule eq 'on')); - foreach my $priv (split(/:/,$rest)) { - if ($priv ne '') { - if ($rule eq 'off') { - push(@{$overridden->{$role}{'off'}},$priv); - if ($currentprivs{$priv}) { - push(@{$settings->{$role}{'off'}},$priv); - } - } else { - push(@{$overridden->{$role}{'on'}},$priv); - unless ($currentprivs{$priv}) { - push(@{$settings->{$role}{'on'}},$priv); - } - } - } - } - } - } - } - return; -} - -sub update_helpdeskaccess { - my ($r,$permission,$brcrum) = @_; - my $helpitem = 'Course_Helpdesk_Access'; - push (@{$brcrum}, - {href => '/adm/createuser?action=helpdesk', - text => 'Helpdesk Access', - help => $helpitem}, - {href => '/adm/createuser?action=helpdesk', - text => 'Result', - help => $helpitem} - ); - my $bread_crumbs_component = 'Helpdesk Staff Access'; - my $args = { bread_crumbs => $brcrum, - bread_crumbs_component => $bread_crumbs_component}; - - # print page header - $r->print(&header('',$args)); - unless ((ref($permission) eq 'HASH') && ($permission->{'owner'})) { - $r->print('

'.&mt('You do not have permission to change helpdesk access.').'

'); - return; - } - my @accesstypes = ('all','dh','da','none','status','inc','exc'); - my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - my $confname = $cdom.'-domainconfig'; - my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($cdom); - my $crstype = &Apache::loncommon::course_type(); - my %customroles = &get_domain_customroles($cdom,$confname); - my (%settings,%overridden); - &get_adhocrole_settings($env{'request.course.id'},\@accesstypes, - $types,\%customroles,\%settings,\%overridden); - my %domhelpdesk = &Apache::lonnet::get_active_domroles($cdom,['dh','da']); - my (%changed,%storehash,@todelete); - - if (keys(%customroles)) { - my (%newsettings,@incrs); - foreach my $role (keys(%customroles)) { - $newsettings{$role} = { - access => '', - status => '', - exc => '', - inc => '', - on => '', - off => '', - }; - my %current; - if (ref($settings{$role}) eq 'HASH') { - %current = %{$settings{$role}}; - } - if (ref($overridden{$role}) eq 'HASH') { - $current{'overridden'} = $overridden{$role}; - } - if ($env{'form.'.$role.'_incrs'}) { - my $access = $env{'form.'.$role.'_access'}; - if (grep(/^\Q$access\E$/,@accesstypes)) { - push(@incrs,$role); - unless ($current{'access'} eq $access) { - $changed{$role}{'access'} = 1; - $storehash{'internal.adhoc.'.$role} = $access; - } - if ($access eq 'status') { - my @statuses = &Apache::loncommon::get_env_multiple('form.'.$role.'_status'); - my @stored; - my @shownstatus; - if (ref($types) eq 'ARRAY') { - foreach my $type (sort(@statuses)) { - if ($type eq 'default') { - push(@stored,$type); - } elsif (grep(/^\Q$type\E$/,@{$types})) { - push(@stored,$type); - push(@shownstatus,$usertypes->{$type}); - } - } - if (grep(/^default$/,@statuses)) { - push(@shownstatus,$othertitle); - } - $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored); - } - $newsettings{$role}{'status'} = join(' '.&mt('or').' ',@shownstatus); - if (ref($current{'status'}) eq 'ARRAY') { - my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{'status'}); - if (@diffs) { - $changed{$role}{'status'} = 1; - } - } elsif (@stored) { - $changed{$role}{'status'} = 1; - } - } elsif (($access eq 'inc') || ($access eq 'exc')) { - my @personnel = &Apache::loncommon::get_env_multiple('form.'.$role.'_staff_'.$access); - my @newspecstaff; - my @stored; - my @currstaff; - foreach my $person (sort(@personnel)) { - if ($domhelpdesk{$person}) { - push(@stored,$person); - } - } - if (ref($current{$access}) eq 'ARRAY') { - my @diffs = &Apache::loncommon::compare_arrays(\@stored,$current{$access}); - if (@diffs) { - $changed{$role}{$access} = 1; - } - } elsif (@stored) { - $changed{$role}{$access} = 1; - } - $storehash{'internal.adhoc.'.$role} .= '='.join(',',@stored); - foreach my $person (@stored) { - my ($uname,$udom) = split(/:/,$person); - push(@newspecstaff,&Apache::loncommon::aboutmewrapper(&Apache::loncommon::plainname($uname,$udom,'lastname'),$uname,$udom)); - } - $newsettings{$role}{$access} = join(', ',sort(@newspecstaff)); - } - $newsettings{$role}{'access'} = $access; - } - } else { - if (($current{'access'} ne '') && (grep(/^\Q$current{'access'}\E$/,@accesstypes))) { - $changed{$role}{'access'} = 1; - $newsettings{$role} = {}; - push(@todelete,'internal.adhoc.'.$role); - } - } - if (($env{'form.'.$role.'_incrs'}) && ($env{'form.'.$role.'_access'} eq 'none')) { - if (ref($current{'overridden'}) eq 'HASH') { - push(@todelete,'internal.adhocpriv.'.$role); - } - } else { - my %full=(); - my %levels= ( - course => {}, - domain => {}, - system => {}, - ); - my %levelscurrent=( - course => {}, - domain => {}, - system => {}, - ); - &Apache::lonuserutils::custom_role_privs($customroles{$role},\%full,\%levels,\%levelscurrent); - my (@updatedon,@updatedoff,@override); - @override = &Apache::loncommon::get_env_multiple('form.'.$role.'_override'); - if (@override) { - foreach my $priv (sort(keys(%full))) { - next unless ($levels{'course'}{$priv}); - if (grep(/^\Q$priv\E$/,@override)) { - if ($levelscurrent{'course'}{$priv}) { - push(@updatedoff,$priv); - } else { - push(@updatedon,$priv); - } - } - } - } - if (@updatedon) { - $newsettings{$role}{'on'} = join('
  • ', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedon)); - } - if (@updatedoff) { - $newsettings{$role}{'off'} = join('
  • ', map { &Apache::lonnet::plaintext($_,$crstype) } (@updatedoff)); - } - if (ref($current{'overridden'}) eq 'HASH') { - if (ref($current{'overridden'}{'on'}) eq 'ARRAY') { - if (@updatedon) { - my @diffs = &Apache::loncommon::compare_arrays(\@updatedon,$current{'overridden'}{'on'}); - if (@diffs) { - $changed{$role}{'on'} = 1; - } - } else { - $changed{$role}{'on'} = 1; - } - } elsif (@updatedon) { - $changed{$role}{'on'} = 1; - } - if (ref($current{'overridden'}{'off'}) eq 'ARRAY') { - if (@updatedoff) { - my @diffs = &Apache::loncommon::compare_arrays(\@updatedoff,$current{'overridden'}{'off'}); - if (@diffs) { - $changed{$role}{'off'} = 1; - } - } else { - $changed{$role}{'off'} = 1; - } - } elsif (@updatedoff) { - $changed{$role}{'off'} = 1; - } - } else { - if (@updatedon) { - $changed{$role}{'on'} = 1; - } - if (@updatedoff) { - $changed{$role}{'off'} = 1; - } - } - if (ref($changed{$role}) eq 'HASH') { - if (($changed{$role}{'on'} || $changed{$role}{'off'})) { - my $newpriv; - if (@updatedon) { - $newpriv = 'on='.join(':',@updatedon); - } - if (@updatedoff) { - $newpriv .= ($newpriv ? ',' : '' ).'off='.join(':',@updatedoff); - } - if ($newpriv eq '') { - push(@todelete,'internal.adhocpriv.'.$role); - } else { - $storehash{'internal.adhocpriv.'.$role} = $newpriv; - } - } - } - } - } - if (@incrs) { - $storehash{'internal.adhocaccess'} = join(',',@incrs); - } elsif (@todelete) { - push(@todelete,'internal.adhocaccess'); - } - if (keys(%changed)) { - my ($putres,$delres); - if (keys(%storehash)) { - $putres = &Apache::lonnet::put('environment',\%storehash,$cdom,$cnum); - my %newenvhash; - foreach my $key (keys(%storehash)) { - $newenvhash{'course.'.$env{'request.course.id'}.'.'.$key} = $storehash{$key}; - } - &Apache::lonnet::appenv(\%newenvhash); - } - if (@todelete) { - $delres = &Apache::lonnet::del('environment',\@todelete,$cdom,$cnum); - foreach my $key (@todelete) { - &Apache::lonnet::delenv('course.'.$env{'request.course.id'}.'.'.$key); - } - } - if (($putres eq 'ok') || ($delres eq 'ok')) { - my %domconfig = &Apache::lonnet::get_dom('configuration',['helpsettings'],$cdom); - my (%domcurrent,%ordered,%description,%domusage); - if (ref($domconfig{'helpsettings'}) eq 'HASH') { - if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') { - %domcurrent = %{$domconfig{'helpsettings'}{'adhoc'}}; - } - } - my $count = 0; - foreach my $role (sort(keys(%customroles))) { - my ($order,$desc); - if (ref($domcurrent{$role}) eq 'HASH') { - $order = $domcurrent{$role}{'order'}; - $desc = $domcurrent{$role}{'desc'}; - } - if ($order eq '') { - $order = $count; - } - $ordered{$order} = $role; - if ($desc ne '') { - $description{$role} = $desc; - } else { - $description{$role}= $role; - } - $count++; - } - my @roles_by_num = (); - foreach my $item (sort {$a <=> $b } (keys(%ordered))) { - push(@roles_by_num,$ordered{$item}); - } - %domusage = &domain_adhoc_access(\%changed,\%domcurrent,\@accesstypes,$usertypes,$othertitle); - $r->print(&mt('Helpdesk access settings have been changed as follows').'
    '); - $r->print('
      '); - foreach my $role (@roles_by_num) { - next unless (ref($changed{$role}) eq 'HASH'); - $r->print('
    • '.&mt('Ad hoc role').': '.$description{$role}.''. - '
        '); - if ($changed{$role}{'access'} || $changed{$role}{'status'} || $changed{$role}{'inc'} || $changed{$role}{'exc'}) { - $r->print('
      • '); - if ($env{'form.'.$role.'_incrs'}) { - if ($newsettings{$role}{'access'} eq 'all') { - $r->print(&mt('All helpdesk staff can access '.lc($crstype).' with this role.')); - } elsif ($newsettings{$role}{'access'} eq 'dh') { - $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', - &Apache::lonnet::plaintext('dh'))); - } elsif ($newsettings{$role}{'access'} eq 'da') { - $r->print(&mt('Helpdesk staff can use this role if they have an active [_1] role', - &Apache::lonnet::plaintext('da'))); - } elsif ($newsettings{$role}{'access'} eq 'none') { - $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); - } elsif ($newsettings{$role}{'access'} eq 'status') { - if ($newsettings{$role}{'status'}) { - my ($access,$rest) = split(/=/,$storehash{'internal.adhoc.'.$role}); - if (split(/,/,$rest) > 1) { - $r->print(&mt('Helpdesk staff can use this role if their institutional type is one of: [_1].', - $newsettings{$role}{'status'})); - } else { - $r->print(&mt('Helpdesk staff can use this role if their institutional type is: [_1].', - $newsettings{$role}{'status'})); - } - } else { - $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); - } - } elsif ($newsettings{$role}{'access'} eq 'exc') { - if ($newsettings{$role}{'exc'}) { - $r->print(&mt('Helpdesk staff who can use this role are as follows:').' '.$newsettings{$role}{'exc'}.'.'); - } else { - $r->print(&mt('No helpdesk staff can access '.lc($crstype).' with this role.')); - } - } elsif ($newsettings{$role}{'access'} eq 'inc') { - if ($newsettings{$role}{'inc'}) { - $r->print(&mt('All helpdesk staff may use this role except the following:').' '.$newsettings{$role}{'inc'}.'.'); - } else { - $r->print(&mt('All helpdesk staff may use this role.')); - } - } - } else { - $r->print(&mt('Default access set in the domain now applies.').'
        '. - ''.$domusage{$role}.''); - } - $r->print('
        • '); - } - unless ($newsettings{$role}{'access'} eq 'none') { - if ($changed{$role}{'off'}) { - if ($newsettings{$role}{'off'}) { - $r->print('
      • '.&mt('Privileges which are available by default for this ad hoc role, but are disabled for this specific '.lc($crstype).':'). - '
        • '.$newsettings{$role}{'off'}.'
        • '); - } else { - $r->print('
      • '.&mt('All privileges available by default for this ad hoc role are enabled.').'
        • '); - } - } - if ($changed{$role}{'on'}) { - if ($newsettings{$role}{'on'}) { - $r->print('
      • '.&mt('Privileges which are not available by default for this ad hoc role, but are enabled for this specific '.lc($crstype).':'). - '
        • '.$newsettings{$role}{'on'}.'
        • '); - } else { - $r->print('
      • '.&mt('None of the privileges unavailable by default for this ad hoc role are enabled.').'
        • '); - } - } - } - $r->print('
      • '); - } - $r->print('
    '); - } - } else { - $r->print(&mt('No changes made to helpdesk access settings.')); - } - } - return; -} - #-------------------------------------------------- functions for &phase_two sub user_search_result { my ($context,$srch) = @_; @@ -9485,7 +7361,7 @@ sub user_search_result { } else { unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) { my $domd_chk = &domdirectorysrch_check($srch); - if (($domd_chk ne 'ok') && ($env{'form.action'} ne 'accesslogs')) { + if ($domd_chk ne 'ok') { my $instd_chk = &instdirectorysrch_check($srch); $response .= ''.$domd_chk.'
    '; if ($instd_chk eq 'ok') { @@ -9836,7 +7712,7 @@ sub build_search_response { if ($srch->{'srchin'} ne 'alc') { $forcenewuser = 1; my $cansrchinst = 0; - if (($srch->{'srchdomain'}) && ($env{'form.action'} ne 'accesslogs')) { + if ($srch->{'srchdomain'}) { my %domconfig = &Apache::lonnet::get_dom('configuration',['directorysrch'],$srch->{'srchdomain'}); if (ref($domconfig{'directorysrch'}) eq 'HASH') { if ($domconfig{'directorysrch'}{'available'}) { @@ -9886,20 +7762,18 @@ sub build_search_response { .&mt("Click 'Search'") .'

    • '; } else { - unless (($context eq 'domain') && ($env{'form.action'} eq 'singleuser')) { - my $helplink = ' href="javascript:helpMenu('."'display'".')"'; - $response .= '

    '; - if ($context eq 'requestcrs') { - $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom); - } else { - $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom); - } - $response .= '
    ' - .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' - ,' ' - ,'') - .'
    '; + my $helplink = ' href="javascript:helpMenu('."'display'".')"'; + $response .= '

    '; + if ($context eq 'requestcrs') { + $response .= &mt("You are not authorized to define new users in the new course's domain - [_1].",$targetdom); + } else { + $response .= &mt("You are not authorized to create new users in your current role's domain - [_1].",$targetdom); } + $response .= '
    ' + .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.' + ,' ' + ,'') + .'
    '; } } } @@ -10183,7 +8057,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 +8393,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') {