--- loncom/interface/loncreateuser.pm 2024/02/29 21:43:33 1.406.2.20.2.5 +++ loncom/interface/loncreateuser.pm 2016/01/31 21:25:38 1.407 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.406.2.20.2.5 2024/02/29 21:43:33 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.407 2016/01/31 21:25:38 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -71,7 +71,6 @@ use Apache::longroup; use Apache::lonuserutils; use Apache::loncoursequeueadmin; use LONCAPA qw(:DEFAULT :match); -use HTML::Entities; my $loginscript; # piece of javascript used in two separate instances my $authformnop; @@ -81,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, @@ -102,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); @@ -127,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(); -} - -sub set_custom_js { - return <<"END_SCRIPT"; + if (&Apache::lonnet::allowed('mut',$ccdomain)) { + $output .= &build_tools_display($ccuname,$ccdomain,'tools'); + } - - -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); + $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", + 'webdav' => "WebDAV access to Authoring Spaces (if SSL and author/co-author)", 'portfolio' => "Personal User Portfolio", - 'timezone' => "Can set Time Zone", 'avai' => "Available", 'cusa' => "availability", 'chse' => "Change setting", @@ -291,11 +252,7 @@ sub build_tools_display { 'community' => 'Can request creation of communities', 'textbook' => 'Can request creation of textbook courses', 'requestauthor' => 'Can request author space', - 'edit' => 'Standard editor (Edit)', - 'xml' => 'Text editor (EditXML)', - 'daxe' => 'Daxe editor (Daxe)', ); - $isadv = &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'requestcourses.official','requestcourses.unofficial', @@ -305,58 +262,39 @@ sub build_tools_display { %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain); %reqtitles = &courserequest_titles(); %reqdisplay = &courserequest_display(); + $colspan = ' colspan="2"'; %domconfig = &Apache::lonnet::get_dom('configuration',['requestcourses'],$ccdomain); + $isadv = &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); } 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'); - @usertools = ('webdav','editors'); - $colspan = ' colspan="2"'; } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'tools.aboutme','tools.portfolio','tools.blog', - 'tools.timezone'); - @usertools = ('aboutme','blog','portfolio','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 ne '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') { - if ($userenv{'author'.$item} ne '') { - $cust_on = ' checked="checked" '; - $cust_off = ''; - } - } 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 = ''; @@ -364,71 +302,30 @@ 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;"'; } } else { - my $current = $userenv{$context.'.'.$item}; - if ($item eq 'webdav') { - $current = $userenv{'tools.webdav'}; - } - 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". @@ -460,11 +357,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 '') { @@ -475,7 +367,7 @@ sub build_tools_display { } else { $currdisp = $reqdisplay{$curroption}; } - $custdisp = '
'; + $custdisp = ''; foreach my $option (@options) { my $val = $option; if ($option eq 'norequest') { @@ -498,88 +390,51 @@ 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"; + $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') { - $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". &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; } @@ -664,7 +519,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, @@ -672,18 +527,6 @@ sub domainrole_req { &Apache::loncommon::end_data_table(); } -sub authoring_defaults { - my ($ccuname,$ccdomain) = @_; - return '

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

'."\n". - &Apache::loncommon::start_data_table(). - &build_tools_display($ccuname,$ccdomain, - 'authordefaults'). - &user_quotas($ccuname,$ccdomain,'author'). - &Apache::loncommon::end_data_table(); -} - sub courserequest_titles { my %titles = &Apache::lonlocal::texthash ( official => 'Official', @@ -794,8 +637,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'})) { @@ -821,27 +663,11 @@ 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)", @@ -869,8 +695,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", 'ecrp' => "Define or Edit Custom Role", @@ -917,29 +741,18 @@ 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'}; } else { $actiontext = $lt{'srst'}; } - } 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') { - if ($response) { - $r->print("\n
$response
". - '
'); - } + $r->print("\n".$response); } - $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype,$fixeddom)); + $r->print(&entry_form($defdom,$srch,$forcenewuser,$context,$response,$crstype)); } } @@ -982,7 +795,7 @@ END } sub entry_form { - my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype,$fixeddom) = @_; + my ($dom,$srch,$forcenewuser,$context,$responsemsg,$crstype) = @_; my ($usertype,$inexact); if (ref($srch) eq 'HASH') { if (($srch->{'srchin'} eq 'dom') && @@ -998,27 +811,18 @@ 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 ($userpicker,$cansearch) = + my $cancreate = + &Apache::lonuserutils::can_create_user($dom,$context,$usertype); + my $userpicker = &Apache::loncommon::user_picker($dom,$srch,$forcenewuser, - 'document.crtuser',$cancreate,$usertype,$context,$fixeddom,$noinstd); + 'document.crtuser',$cancreate,$usertype); my $srchbutton = &mt('Search'); if ($env{'form.action'} eq 'singlestudent') { $srchbutton = &mt('Search and Enroll'); - } elsif ($env{'form.action'} eq 'accesslogs') { - $srchbutton = &mt('Search'); } elsif ($cancreate && $responsemsg ne '' && $inexact) { $srchbutton = &mt('Search or Add New User'); } - my $output; - if ($cansearch) { - $output = <<"ENDBLOCK"; + my $output = <<"ENDBLOCK";
@@ -1026,12 +830,7 @@ $userpicker
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 '') { my $defdom=$env{'request.role.domain'}; my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain'); my %lt=&Apache::lonlocal::texthash( @@ -1147,13 +946,9 @@ ENDSCRIPT 'usrch' => "User Search to add/modify roles", '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", 'username' => "username", 'domain' => "domain", 'lastname' => "last name", @@ -1163,16 +958,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,'','')", @@ -1187,19 +978,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') { @@ -1216,10 +997,6 @@ ENDSCRIPT $r->print($lt{'stusel'}); } $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('

'.$lt{'vacsel'}.'

'); } } $r->print('
'. @@ -1299,8 +1076,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); @@ -1339,18 +1115,12 @@ sub print_user_modification_page { } $response .= '

' .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") - .' '; - if ($context eq 'domain') { - $response .= &mt('Please contact a [_1] for assistance.', - &Apache::lonnet::plaintext('dc')); - } else { - $response .= &mt('Please contact the [_1]helpdesk[_2] for assistance.' - ,'',''); - } - $response .= '


'; + .' ' + .&mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'','') + .'


'; $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; @@ -1374,8 +1144,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; } } @@ -1394,18 +1163,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)", @@ -1431,32 +1194,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')); - } - if (&Apache::lonnet::allowed('mut',$ccdomain)) { - push(@toggles,('aboutme','blog','portfolio','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); @@ -1493,36 +1230,18 @@ ENDFORMINFO } } my $title = ''; - my $need_quota_js; if ($newuser) { my ($portfolioform,$domroleform); if ((&Apache::lonnet::allowed('mpq',$env{'request.role.domain'})) || (&Apache::lonnet::allowed('mut',$env{'request.role.domain'}))) { # Current user has quota or user tools modification privileges - $portfolioform = '

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

'."\n". - &Apache::loncommon::start_data_table(); - if (&Apache::lonnet::allowed('mut',$ccdomain)) { - $portfolioform .= &build_tools_display($ccuname,$ccdomain,'tools'); - } - if (&Apache::lonnet::allowed('mpq',$ccdomain)) { - $portfolioform .= &user_quotas($ccuname,$ccdomain,'portfolio'); - $need_quota_js = 1; - } - $portfolioform .= &Apache::loncommon::end_data_table(); + $portfolioform = '
'.&user_quotas($ccuname,$ccdomain); } if ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) && ($ccdomain eq $env{'request.role.domain'})) { - $domroleform = &domainrole_req($ccuname,$ccdomain). - &authoring_defaults($ccuname,$ccdomain); - $need_quota_js = 1; - } - my $readonly; - unless ($permission->{'cusr'}) { - $readonly = 1; + $domroleform = '
'.&domainrole_req($ccuname,$ccdomain); } - &initialize_authen_forms($ccdomain,$formname,'','',$readonly); + &initialize_authen_forms($ccdomain,$formname); my %lt=&Apache::lonlocal::texthash( 'lg' => 'Login Data', 'hs' => "Home Server", @@ -1553,7 +1272,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', @@ -1568,7 +1287,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'). @@ -1650,21 +1369,15 @@ ENDAUTH '"'.$ccuname.'"','"'.$ccdomain.'"'); } } else { - if ($permission->{'cusr'}) { - $title = &mt('Modify existing user: [_1] in domain [_2]', + $title = &mt('Modify existing user: [_1] in domain [_2]', '"'.$ccuname.'"','"'.$ccdomain.'"'); - } else { - $title = &mt('Existing user: [_1] in domain [_2]', - '"'.$ccuname.'"','"'.$ccdomain.'"'); - } } $r->print('

'.$title.'

'."\n"); $r->print('
'); $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context, $inst_results{$ccuname.':'.$ccdomain})); - if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || - (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) { - $r->print('

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

'."\n". + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $r->print('

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

'. &Apache::loncommon::start_data_table()); if ($env{'request.role.domain'} eq $ccdomain) { $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); @@ -1675,44 +1388,26 @@ ENDAUTH $r->print(&Apache::loncommon::end_data_table()); } $r->print('
'); - my @order = ('auth','quota','tools','requestauthor','authordefaults'); + my @order = ('auth','quota','tools','requestauthor'); my %user_text; my ($isadv,$isauthor) = - &Apache::lonnet::is_advanced_user($ccdomain,$ccuname); - if (((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) || - (&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; - } + &Apache::lonnet::is_advanced_user($ccuname,$ccdomain); + if ((!$isauthor) && + (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) + && ($env{'request.role.domain'} eq $ccdomain)) { + $user_text{'requestauthor'} = &domainrole_req($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'); - } + (&Apache::lonnet::allowed('mut',$ccdomain))) { # 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('
'); } - my $statuses; - if (($context eq 'domain') && (&Apache::lonnet::allowed('udp',$ccdomain)) && - (!&Apache::lonnet::allowed('mau',$ccdomain))) { - $statuses = ['active']; - } elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) || - ($env{'request.course.sec'} && - &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) { - $statuses = ['active']; - } if ($env{'form.action'} ne 'singlestudent') { &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context, - $roledom,$crstype,$showcredits,$statuses); + $roledom,$crstype); } } ## End of new user/old user logic if ($env{'form.action'} eq 'singlestudent') { @@ -1784,7 +1470,7 @@ ENDNOTOOLSPRIV $btntxt = &mt('Enroll Student'); } $r->print('
'."\n"); - } elsif ($permission->{'cusr'}) { + } else { $r->print('
'. '
'.&mt('Add Roles').''); my $addrolesdisplay = 0; @@ -1806,7 +1492,7 @@ ENDNOTOOLSPRIV if ($newuser) { $r->print(' onclick="auth_check()" \>'."\n"); } else { - $r->print(' onclick="this.form.submit()" \>'."\n"); + $r->print('onclick="this.form.submit()" \>'."\n"); } } else { $r->print('
'. @@ -1823,14 +1509,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') { @@ -1838,21 +1521,12 @@ sub singleuser_breadcrumb { } else { $breadcrumb_text{'search'} = 'Enroll a student'; } - $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{'modify'} = 'Set section/dates', } 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; } @@ -1884,16 +1558,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))) { @@ -1924,22 +1596,8 @@ sub validation_javascript { sub display_existing_roles { my ($r,$ccuname,$ccdomain,$inccourses,$context,$roledom,$crstype, - $showcredits,$statuses) = @_; + $showcredits) = @_; my $now=time; - my $showall = 1; - my ($showexpired,$showactive); - if ((ref($statuses) eq 'ARRAY') && (@{$statuses} > 0)) { - $showall = 0; - if (grep(/^expired$/,@{$statuses})) { - $showexpired = 1; - } - if (grep(/^active$/,@{$statuses})) { - $showactive = 1; - } - if ($showexpired && $showactive) { - $showall = 1; - } - } my %lt=&Apache::lonlocal::texthash( 'rer' => "Existing Roles", 'rev' => "Revoke", @@ -2003,13 +1661,6 @@ sub display_existing_roles { $area =~ s/\_\w\w$//; my ($role_code,$role_end_time,$role_start_time) = split(/_/,$role); - my $active=1; - $active=0 if (($role_end_time) && ($now>$role_end_time)); - if ($active) { - next unless($showall || $showactive); - } else { - next unless($showall || $showexpired); - } # Is this a custom role? Get role owner and title. my ($croleudom,$croleuname,$croletitle)= ($role_code=~m{^cr/($match_domain)/($match_username)/(\w+)$}); @@ -2018,13 +1669,11 @@ sub display_existing_roles { my $sortkey=$role_code; my $class='Unknown'; my $credits=''; - my $csec; - if ($area =~ m{^/($match_domain)/($match_courseid)}) { + if ($area =~ m{^/($match_domain)/($match_courseid)} ) { $class='Course'; my ($coursedom,$coursedir) = ($1,$2); my $cid = $1.'_'.$2; # $1.'_'.$2 is the course id (eg. 103_12345abcef103l3). - next if ($envkey =~ m{^/$match_domain/$match_courseid/[A-Za-z0-9]+_gr$}); my %coursedata= &Apache::lonnet::coursedescription($cid); if ($coursedir =~ /^$match_community$/) { @@ -2082,13 +1731,12 @@ sub display_existing_roles { $thisrole.='.'.$role_code; } } - if ($area=~m{^/($match_domain/$match_courseid/(\w+))}) { - $csec = $2; - $carea.='
'.&mt('Section: [_1]',$csec); - $sortkey.="\0$csec"; + if ($area=~m{^/($match_domain)/($match_courseid)/(\w+)}) { + $carea.='
'.&mt('Section: [_1]',$3); + $sortkey.="\0$3"; if (!$allowed) { - if ($env{'request.course.sec'} eq $csec) { - if (&Apache::lonnet::allowed('c'.$role_code,$1)) { + if ($env{'request.course.sec'} eq $3) { + if (&Apache::lonnet::allowed('c'.$role_code,$1.'/'.$2.'/'.$3)) { $allowed = 1; } } @@ -2130,30 +1778,29 @@ sub display_existing_roles { } } my $row = ''; - if ($showall) { - $row.= ''; - if (($active) && ($allowed)) { - $row.= ''; - } else { - if ($active) { - $row.=' '; - } else { - $row.=&mt('expired or revoked'); - } - } - $row.=''; - if ($allowed && !$active) { - $row.= ''; - } else { - $row.=' '; - } - $row.=''; - if ($delallowed) { - $row.= ''; + $row.= ''; + my $active=1; + $active=0 if (($role_end_time) && ($now>$role_end_time)); + if (($active) && ($allowed)) { + $row.= ''; + } else { + if ($active) { + $row.=' '; } else { - $row.=' '; + $row.=&mt('expired or revoked'); } - $row.= ''; + } + $row.=''; + if ($allowed && !$active) { + $row.= ''; + } else { + $row.=' '; + } + $row.=''; + if ($delallowed) { + $row.= ''; + } else { + $row.=' '; } my $plaintext=''; if (!$croletitle) { @@ -2171,31 +1818,17 @@ sub display_existing_roles { '
', $croleuname.':'.$croleudom); } - $row.= ''.$plaintext.''. - ''.$area.''. - ''.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) - : ' ' ).''. - ''.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) - : ' ' ).''; + $row.= ''.$plaintext. + ''.$area. + ''.($role_start_time?&Apache::lonlocal::locallocaltime($role_start_time) + : ' ' ). + ''.($role_end_time ?&Apache::lonlocal::locallocaltime($role_end_time) + : ' ' ) + .""; $sortrole{$sortkey}=$envkey; $roletext{$envkey}=$row; $roleclass{$envkey}=$class; - if ($allowed) { - $rolepriv{$envkey}='edit'; - } else { - if ($context eq 'domain') { - if ((&Apache::lonnet::allowed('vur',$ccdomain)) && - ($envkey=~m{^/$ccdomain/})) { - $rolepriv{$envkey}='view'; - } - } elsif ($context eq 'course') { - if ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) || - ($env{'request.course.sec'} && ($env{'request.course.sec'} eq $csec) && - &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'}))) { - $rolepriv{$envkey}='view'; - } - } - } + $rolepriv{$envkey}=$allowed; } # end of foreach (table building loop) my $rolesdisplay = 0; @@ -2228,28 +1861,15 @@ sub display_existing_roles { } elsif ($env{'request.role'} =~ /^au\./) { $contextrole = &mt('Existing Co-Author Roles in your Authoring Space'); } else { - if ($showall) { - $contextrole = &mt('Existing Roles in this Domain'); - } elsif ($showactive) { - $contextrole = &mt('Unexpired Roles in this Domain'); - } elsif ($showexpired) { - $contextrole = &mt('Expired or Revoked Roles in this Domain'); - } + $contextrole = &mt('Existing Roles in this Domain'); } $r->print('
'. '
'.$contextrole.''. &Apache::loncommon::start_data_table("LC_createuser"). -&Apache::loncommon::start_data_table_header_row()); - if ($showall) { - $r->print( -''.$lt{'rev'}.''.$lt{'ren'}.''.$lt{'del'}.'' - ); - } elsif ($showexpired) { - $r->print(''.$lt{'rev'}.''); - } - $r->print( -''.$lt{'rol'}.''.$lt{'ext'}.''. -''.$lt{'sta'}.''.$lt{'end'}.''. +&Apache::loncommon::start_data_table_header_row(). +''.$lt{'rev'}.''.$lt{'ren'}.''.$lt{'del'}. +''.$lt{'rol'}.''.$lt{'ext'}. +''.$lt{'sta'}.''.$lt{'end'}.''. &Apache::loncommon::end_data_table_header_row()); foreach my $type ('Authoring Space','Course','Community','Domain','System','Unknown') { if ($output{$type}) { @@ -2384,19 +2004,19 @@ 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( - 'err' => "ERROR", - 'uuas' => "This user has an unrecognized authentication scheme", - 'adcs' => "Please alert a domain coordinator of this situation", - 'sldb' => "Please specify login data below", - 'ld' => "Login Data" - ); # Check for a bad authentication type if ($currentauth !~ /^(krb4|krb5|unix|internal|localauth):/) { # bad authentication scheme + my %lt=&Apache::lonlocal::texthash( + 'err' => "ERROR", + 'uuas' => "This user has an unrecognized authentication scheme", + 'adcs' => "Please alert a domain coordinator of this situation", + 'sldb' => "Please specify login data below", + 'ld' => "Login Data" + ); if (&Apache::lonnet::allowed('mau',$ccdomain)) { &initialize_authen_forms($ccdomain,$formname); @@ -2427,6 +2047,11 @@ ENDBADAUTH &modify_login_block($ccdomain,$currentauth); if (&Apache::lonnet::allowed('mau',$ccdomain)) { # Current user has login modification privileges + my %lt=&Apache::lonlocal::texthash ( + 'ld' => "Login Data", + 'ccld' => "Change Current Login Data", + 'enld' => "Enter New Login Data" + ); $outcome = ' -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; - if ($currentauth =~ /^krb(4|5):([^:]*)$/) { - my ($krbver,$krbrealm) = ($1,$2); - if ($krbrealm eq '') { - $result = &mt('Currently Kerberos authenticated, Version [_1].',$krbver); - } else { - $result = &mt('Currently Kerberos authenticated with domain [_1] Version [_2].', - $krbrealm,$krbver); - } - } elsif ($currentauth =~ /^internal:/) { - $result = &mt('Currently internally authenticated.'); - } elsif ($currentauth =~ /^localauth:/) { - $result = &mt('Currently using local (institutional) authentication.'); - } elsif ($currentauth =~ /^unix:/) { - $result = &mt('Currently Filesystem Authenticated.'); - } - $outcome = '

'.$lt{'ld'}.'

'. - &Apache::loncommon::start_data_table(). - &Apache::loncommon::start_data_table_row(). - ''.$result.''. - &Apache::loncommon::end_data_table_row()."\n". - &Apache::loncommon::end_data_table(); - } elsif (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { + if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { my %lt=&Apache::lonlocal::texthash( 'ccld' => "Change Current Login Data", 'yodo' => "You do not have privileges to modify the authentication configuration for this user.", @@ -2601,8 +2163,8 @@ sub modify_login_block { } sub personal_data_display { - my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,$now, - $captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded,$showsubmit) = @_; + 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'); @@ -2629,7 +2191,6 @@ sub personal_data_display { 'inststatus' => "Affiliation", 'email' => 'E-mail address', 'valid' => 'Validation', - 'username' => 'Username', ); %canmodify_status = @@ -2648,7 +2209,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}) { @@ -2678,42 +2239,13 @@ sub personal_data_display { $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". @@ -2724,20 +2256,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}; @@ -2833,23 +2351,18 @@ sub personal_data_display { } if (($context eq 'selfcreate') && ($newuser eq 'email')) { if ($captchaform) { - $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'}.'*', + $output .= &Apache::lonhtmlcommon::row_title($lt{'valid'}, 'LC_pick_box_title')."\n". $captchaform."\n".'

'. &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) { @@ -2933,7 +2446,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 @@ -2957,7 +2470,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'}, @@ -2974,10 +2487,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')", @@ -3069,10 +2578,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','timezone'); + my @usertools = ('aboutme','blog','webdav','portfolio'); my @requestcourses = ('official','unofficial','community','textbook'); my @requestauthor = ('requestauthor'); - my @authordefaults = ('webdav','editors'); my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); my %canmodify_status = @@ -3181,29 +2689,6 @@ 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 (@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 ($canmodify_status{'inststatus'}) { if (exists($env{'form.inststatus'})) { @@ -3223,7 +2708,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 '' )) { @@ -3238,19 +2723,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); @@ -3269,13 +2747,12 @@ 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', - 'authoreditors','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'], + 'reqcrsotherdom.community','reqcrsotherdom.textbook', + 'requestauthor'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -3403,7 +2880,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'); } @@ -3431,7 +2908,6 @@ sub update_user_data { } if (&Apache::lonnet::allowed('cau',$env{'form.ccdomain'})) { $canshow{'requestauthor'} = 1; - $canshow{'authordefaults'} = 1; } my (%changeHash,%changed); if ($oldinststatus eq '') { @@ -3540,14 +3016,8 @@ 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); @@ -3571,10 +3041,7 @@ sub update_user_data { if ($chgresult eq 'ok') { 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')) { @@ -3583,56 +3050,18 @@ sub update_user_data { 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'; - } + $key,'reload','requestauthor'); } } elsif ($key ne 'quota') { $newenvhash{'environment.tools.'.$key} = @@ -3641,20 +3070,9 @@ 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'); } } } @@ -3662,10 +3080,6 @@ sub update_user_data { &Apache::lonnet::appenv(\%newenvhash); } } - if ($changed{'aboutme'}) { - &Apache::loncommon::devalidate_aboutme_cache($env{'form.ccuname'}, - $env{'form.ccdomain'}); - } } } if (keys(%namechanged) > 0) { @@ -3696,7 +3110,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 = @@ -3835,7 +3249,6 @@ sub display_userinfo { 'webdav' => 'WebDAV Availability', 'aboutme' => 'Personal Information Page Availability', 'portfolio' => 'Portfolio Availability', - 'timezone' => 'Can set own Time Zone', 'official' => 'Can Request Official Courses', 'unofficial' => 'Can Request Unofficial Courses', 'community' => 'Can Request Communities', @@ -3843,11 +3256,7 @@ sub display_userinfo { 'requestauthor' => 'Can Request Author Role', 'inststatus' => "Affiliation", 'prvs' => 'Previous Value:', - 'chto' => 'Changed To:', - 'editors' => "Available Editors in Authoring Space", - 'edit' => 'Standard editor (Edit)', - 'xml' => 'Text editor (EditXML)', - 'daxe' => 'Daxe editor (Daxe)', + 'chto' => 'Changed To:' ); if ($changed) { $r->print('

'.$lt{'uic'}.'

'. @@ -3872,13 +3281,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','editors'); } else { @items = @{$requestcourses}; } @@ -4059,11 +3465,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; @@ -4077,29 +3478,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 'webdav') { - $envkey = 'tools.webdav'; - $newval = $env{'form.'.$context.'_'.$tool}; - } } else { $newval = $env{'form.'.$context.'_'.$tool}; } @@ -4118,17 +3496,6 @@ sub tool_changes { } else { $oldaccesstext->{$tool} = &mt("availability set to 'off'"); } - } elsif ($context eq 'authordefaults') { - if ($tool eq 'editors') { - $oldaccesstext->{$tool} = &mt('can use: [_1]', - join(', ', map { $tooldesc{$_} } split(/,/,$userenv->{$envkey}))); - } elsif ($tool eq 'webdav') { - 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'"); @@ -4155,17 +3522,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 'webdav') { - 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'"); @@ -4176,28 +3532,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 'webdav') { - 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'"); @@ -4228,17 +3573,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 'webdav') { - 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'"); @@ -4267,17 +3601,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 'webdav') { - 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'"); @@ -4772,10 +4095,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; @@ -4786,10 +4105,6 @@ sub tool_admin { $toolchanged = 1; if ($tool eq 'requestauthor') { $changeHash->{$context} = $settool; - } elsif ($tool eq 'editors') { - $changeHash->{'author'.$tool} = $settool; - } elsif ($tool eq 'webdav') { - $changeHash->{'tools.'.$tool} = $settool; } else { $changeHash->{$context.'.'.$tool} = $settool; } @@ -4834,9 +4149,9 @@ sub build_roles { # ========================================================== Custom Role Editor sub custom_role_editor { - my ($r,$context,$brcrum,$prefix,$permission) = @_; + my ($r,$brcrum) = @_; my $action = $env{'form.customroleaction'}; - my ($rolename,$helpitem); + my $rolename; if ($action eq 'new') { $rolename=$env{'form.newrolename'}; } else { @@ -4847,103 +4162,281 @@ 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'; + $crstype = $env{'form.templatecrstype'}; } $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; } - my $formname = 'form1'; - my %privs=(); - my $body_top = '

'; -# ------------------------------------------------------- Does this role exist? +# ------------------------------------------------------- What can be assigned? + my %full=(); + my %courselevel=(); + my %courselevelcurrent=(); + my $syspriv=''; + my $dompriv=''; + my $coursepriv=''; + my $body_top; + my $newrole; my ($rdummy,$roledef)= &Apache::lonnet::get('roles',["rolesdef_$rolename"]); +# ------------------------------------------------------- Does this role exist? + $body_top .= '

'; if (($rdummy ne 'con_lost') && ($roledef ne '')) { - $body_top .= &mt('Existing Role').' "'; + $body_top .= &mt('Existing Role').' "'; # ------------------------------------------------- Get current role privileges - ($privs{'system'},$privs{'domain'},$privs{'course'})=split(/\_/,$roledef); - if ($privs{'system'} =~ /bre\&S/) { - if ($context eq 'domain') { - $crstype = 'Course'; - } elsif ($crstype eq 'Community') { - $privs{'system'} =~ s/bre\&S//; - } - } elsif ($context eq 'domain') { - $crstype = 'Course'; + ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); + if ($crstype eq 'Community') { + $syspriv =~ s/bre\&S//; } } else { - $body_top .= &mt('New Role').' "'; - $roledef=''; + $newrole = 1; + $body_top .= &mt('New Role').' "'; + $roledef=''; } $body_top .= $rolename.'"

'; - -# ------------------------------------------------------- What can be assigned? - my %full=(); - my %levels=( - course => {}, - domain => {}, - system => {}, - ); - my %levelscurrent=( - course => {}, - domain => {}, - system => {}, - ); - &Apache::lonuserutils::custom_role_privs(\%privs,\%full,\%levels,\%levelscurrent); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { + my ($priv,$restrict)=split(/\&/,$item); + if (!$restrict) { $restrict='F'; } + $courselevel{$priv}=$restrict; + if ($coursepriv=~/\:$priv/) { + $courselevelcurrent{$priv}=1; + } + $full{$priv}=1; + } + my %domainlevel=(); + my %domainlevelcurrent=(); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { + my ($priv,$restrict)=split(/\&/,$item); + if (!$restrict) { $restrict='F'; } + $domainlevel{$priv}=$restrict; + if ($dompriv=~/\:$priv/) { + $domainlevelcurrent{$priv}=1; + } + $full{$priv}=1; + } + my %systemlevel=(); + my %systemlevelcurrent=(); + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { + my ($priv,$restrict)=split(/\&/,$item); + if (!$restrict) { $restrict='F'; } + $systemlevel{$priv}=$restrict; + if ($syspriv=~/\:$priv/) { + $systemlevelcurrent{$priv}=1; + } + $full{$priv}=1; + } my ($jsback,$elements) = &crumb_utilities(); - my @templateroles = &Apache::lonuserutils::custom_template_roles($context,$crstype); - my $head_script = - &Apache::lonuserutils::custom_roledefs_js($context,$crstype,$formname, - \%full,\@templateroles,$jsback); + my $button_code = "\n"; + my $head_script = "\n"; + $head_script .= ''."\n"; push (@{$brcrum}, - {href => "javascript:backPage(document.$formname,'pickrole','')", + {href => "javascript:backPage(document.form1,'pickrole','')", text => "Pick custom role", faq => 282,bug=>'Instructor Interface',}, - {href => "javascript:backPage(document.$formname,'','')", + {href => "javascript:backPage(document.form1,'','')", 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); - $r->print('
'."\n". - &Apache::lonuserutils::custom_role_header($context,$crstype, - \@templateroles,$prefix)); + my %lt=&Apache::lonlocal::texthash( + 'prv' => "Privilege", + 'crl' => "Course Level", + 'dml' => "Domain Level", + 'ssl' => "System Level"); + + $r->print('
' + .'
' + .''.&mt('Select a Template').'' + .$button_code + .'
'); + if ($context_code) { + $r->print('
' + .'
' + .''.&mt('Context').'' + .$context_code + .'' + .'
' + ); + } + $r->print('
'); $r->print(< ENDCCF - $r->print(&Apache::lonuserutils::custom_role_table($crstype,\%full,\%levels, - \%levelscurrent,$prefix)); + $r->print(&Apache::loncommon::start_data_table(). + &Apache::loncommon::start_data_table_header_row(). +''.$lt{'prv'}.''.$lt{'crl'}.''.$lt{'dml'}. +''.$lt{'ssl'}.''. + &Apache::loncommon::end_data_table_header_row()); + foreach my $priv (sort(keys(%full))) { + my $privtext = &Apache::lonnet::plaintext($priv,$crstype); + $r->print(&Apache::loncommon::start_data_table_row(). + ''.$privtext.''. + ($courselevel{$priv}?'':' '). + ''. + ($domainlevel{$priv}?'':' '). + ''); + if ($priv eq 'bre' && $crstype eq 'Community') { + $r->print(' '); + } else { + $r->print($systemlevel{$priv}?'':' '); + } + $r->print(''. + &Apache::loncommon::end_data_table_row()); + } $r->print(&Apache::loncommon::end_data_table(). ''. ''."\n".''."\n". + '" />'."\n".''."\n". ''."\n". ''); } - +# -------------------------------------------------------- +sub make_script_template { + my ($role,$crstype) = @_; + my %full_c=(); + my %full_d=(); + my %full_s=(); + my $return_script; + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { + my ($priv,$restrict)=split(/\&/,$item); + $full_c{$priv}=1; + } + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { + my ($priv,$restrict)=split(/\&/,$item); + $full_d{$priv}=1; + } + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { + next if (($crstype eq 'Community') && ($item eq 'bre&S')); + my ($priv,$restrict)=split(/\&/,$item); + $full_s{$priv}=1; + } + $return_script .= 'function set_'.$role.'() {'."\n"; + my @temp = split(/:/,$Apache::lonnet::pr{$role.':c'}); + my %role_c; + foreach my $priv (@temp) { + my ($priv_item, $dummy) = split(/\&/,$priv); + $role_c{$priv_item} = 1; + } + my %role_d; + @temp = split(/:/,$Apache::lonnet::pr{$role.':d'}); + foreach my $priv(@temp) { + my ($priv_item, $dummy) = split(/\&/,$priv); + $role_d{$priv_item} = 1; + } + my %role_s; + @temp = split(/:/,$Apache::lonnet::pr{$role.':s'}); + foreach my $priv(@temp) { + my ($priv_item, $dummy) = split(/\&/,$priv); + $role_s{$priv_item} = 1; + } + foreach my $priv_item (keys(%full_c)) { + my ($priv, $dummy) = split(/\&/,$priv_item); + if ((exists($role_c{$priv})) || (exists($role_d{$priv})) || + (exists($role_s{$priv}))) { + $return_script .= "document.form1.$priv"."_c.checked = true;\n"; + } else { + $return_script .= "document.form1.$priv"."_c.checked = false;\n"; + } + } + foreach my $priv_item (keys(%full_d)) { + my ($priv, $dummy) = split(/\&/,$priv_item); + if ((exists($role_d{$priv})) || (exists($role_s{$priv}))) { + $return_script .= "document.form1.$priv"."_d.checked = true;\n"; + } else { + $return_script .= "document.form1.$priv"."_d.checked = false;\n"; + } + } + foreach my $priv_item (keys(%full_s)) { + my ($priv, $dummy) = split(/\&/,$priv_item); + if (exists($role_s{$priv})) { + $return_script .= "document.form1.$priv"."_s.checked = true;\n"; + } else { + $return_script .= "document.form1.$priv"."_s.checked = false;\n"; + } + } + $return_script .= '}'."\n"; + return ($return_script); +} +# ---------------------------------------------------------- +sub make_button_code { + my ($role,$crstype) = @_; + my $label = &Apache::lonnet::plaintext($role,$crstype); + my $button_code = ''; + return ($button_code); +} # ---------------------------------------------------------- Call to definerole sub set_custom_role { - my ($r,$context,$brcrum,$prefix,$permission) = @_; + my ($r,$context,$brcrum) = @_; 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); return; } my ($jsback,$elements) = &crumb_utilities(); @@ -4952,10 +4445,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", @@ -4969,10 +4458,10 @@ 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'}; + bread_crumbs_component => 'User Management'}; $r->print(&Apache::loncommon::start_page('Save Custom Role',$jscript,$args)); my $newrole; @@ -4989,13 +4478,38 @@ sub set_custom_role { $newrole = 1; } $r->print($rolename.'"'); -# ------------------------------------------------- Assign role and show result +# ------------------------------------------------------- What can be assigned? + my $sysrole=''; + my $domrole=''; + my $courole=''; + + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { + my ($priv,$restrict)=split(/\&/,$item); + if (!$restrict) { $restrict=''; } + if ($env{'form.'.$priv.'_c'}) { + $courole.=':'.$item; + } + } + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:d'})) { + my ($priv,$restrict)=split(/\&/,$item); + if (!$restrict) { $restrict=''; } + if ($env{'form.'.$priv.'_d'}) { + $domrole.=':'.$item; + } + } + + foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:s'})) { + my ($priv,$restrict)=split(/\&/,$item); + if (!$restrict) { $restrict=''; } + if ($env{'form.'.$priv.'_s'}) { + $sysrole.=':'.$item; + } + } + # Assign role; Compile and show result my $errmsg; - my %newprivs = &Apache::lonuserutils::custom_role_update($rolename,$prefix); - # Assign role and return result - my $result = &Apache::lonnet::definerole($rolename,$newprivs{'s'},$newprivs{'d'}, - $newprivs{'c'}); + my $result = + &Apache::lonnet::definerole($rolename,$sysrole,$domrole,$courole); if ($result ne 'ok') { $errmsg = ': '.$result; } @@ -5040,8 +4554,7 @@ 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(); @@ -5051,69 +4564,6 @@ sub handler { $context = 'domain'; } - my ($permission,$allowed) = - &Apache::lonuserutils::get_permission($context,$crstype); - - 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')); - } 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']); @@ -5124,9 +4574,13 @@ 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'); @@ -5158,16 +4612,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, @@ -5179,45 +4627,18 @@ 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'})) || - (($env{'form.action'} eq 'accesslogs') && ($permission->{'activity'}))) { + } elsif ((($env{'form.action'} eq 'singleuser') || ($env{'form.action'} + eq 'singlestudent')) && ($permission->{'cusr'})) { my $phase = $env{'form.phase'}; my @search = ('srchterm','srchby','srchin','srchtype','srchdomain'); &Apache::loncreateuser::restore_prev_selections(); @@ -5226,7 +4647,7 @@ sub handler { $srch->{$item} = $env{'form.'.$item}; } if (($phase eq 'get_user_info') || ($phase eq 'userpicked') || - ($phase eq 'createnewuser') || ($phase eq 'activity')) { + ($phase eq 'createnewuser')) { if ($env{'form.phase'} eq 'createnewuser') { my $response; if ($env{'form.srchterm'} !~ /^$match_username$/) { @@ -5237,7 +4658,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'}); @@ -5256,8 +4677,8 @@ sub handler { &print_user_selection_page($r,$response,$srch,$results, \@search,$context,undef,$crstype, $brcrum); - } elsif (($currstate eq 'modify') || ($env{'form.action'} eq 'accesslogs')) { - my ($ccuname,$ccdomain,$uhome); + } elsif ($currstate eq 'modify') { + my ($ccuname,$ccdomain); if (($srch->{'srchby'} eq 'uname') && ($srch->{'srchtype'} eq 'exact')) { $ccuname = $srch->{'srchterm'}; @@ -5268,68 +4689,37 @@ sub handler { } $ccuname =&LONCAPA::clean_username($ccuname); $ccdomain=&LONCAPA::clean_domain($ccdomain); - if ($env{'form.action'} eq 'accesslogs') { - my $uhome; - if (($ccuname ne '') && ($ccdomain ne '')) { - $uhome = &Apache::lonnet::homeserver($ccuname,$ccdomain); - } - if (($uhome eq '') || ($uhome eq 'no_host')) { - $env{'form.phase'} = ''; - undef($forcenewuser); - #if ($response) { - # unless ($response =~ m{\Q

\E$}) { - # $response .= '

'; - # } - #} - &print_username_entry_form($r,$context,$response,$srch, - $forcenewuser,$crstype,$brcrum, - $permission); - } else { - &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); - } - } else { - if ($env{'form.forcenewuser'}) { - $response = ''; - } - &print_user_modification_page($r,$ccuname,$ccdomain, - $srch,$response,$context, - $permission,$crstype,$brcrum); + if ($env{'form.forcenewuser'}) { + $response = ''; } + &print_user_modification_page($r,$ccuname,$ccdomain, + $srch,$response,$context, + $permission,$crstype,$brcrum); } elsif ($currstate eq 'query') { &print_user_query_page($r,'createuser',$brcrum); } 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'}); my $ccdomain = &LONCAPA::clean_domain($env{'form.seludom'}); - if ($env{'form.action'} eq 'accesslogs') { - &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); - } else { - &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', - $context,$permission,$crstype, - $brcrum); - } - } elsif ($env{'form.action'} eq 'accesslogs') { - my $ccuname = &LONCAPA::clean_username($env{'form.accessuname'}); - my $ccdomain = &LONCAPA::clean_domain($env{'form.accessudom'}); - &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum); + &print_user_modification_page($r,$ccuname,$ccdomain,$srch,'', + $context,$permission,$crstype, + $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); } else { - &custom_role_editor($r,$context,$brcrum,$prefix,$permission); + &custom_role_editor($r,$brcrum); } } elsif (($env{'form.action'} eq 'processauthorreq') && ($permission->{'cusr'}) && @@ -5435,92 +4825,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}; @@ -5537,7 +4891,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}; @@ -5617,9 +4971,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'}, @@ -5635,8 +4991,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", @@ -5657,74 +5011,53 @@ 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').''); } } elsif ($env{'form.action'} eq 'selfenrollqueue') { - if ($permission->{selfenrolladmin}) { + push(@{$brcrum}, + {href => '/adm/createuser?action=selfenrollqueue', + text => 'Enrollment requests', + help => 'Course_Self_Enrollment'}); + $bread_crumbs_component = 'Enrollment requests'; + if ($env{'form.state'} eq 'done') { push(@{$brcrum}, {href => '/adm/createuser?action=selfenrollqueue', - text => 'Enrollment requests', - help => 'Course_Approve_Selfenroll'}); - $bread_crumbs_component = 'Enrollment requests'; - if ($env{'form.state'} eq 'done') { - push(@{$brcrum}, - {href => '/adm/createuser?action=selfenrollqueue', - text => 'Result', - help => 'Course_Approve_Selfenroll'}); - $bread_crumbs_component = 'Enrollment result'; - } - $args = { bread_crumbs => $brcrum, - bread_crumbs_component => $bread_crumbs_component}; - $r->print(&header(undef,$args)); - my $coursedesc = $env{'course.'.$cid.'.description'}; - if (!exists($env{'form.state'})) { - $r->print('

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

'."\n"); - $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context, - $cdom,$cnum)); - } elsif ($env{'form.state'} eq 'done') { - $r->print('

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

'."\n"); - $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, - $cdom,$cnum,$coursedesc)); - } - } else { - $r->print(&header(undef,{'no_nav_bar' => 1}). - ''.&mt('You do not have permission to manage self-enrollment').''); + text => 'Result', + help => 'Course_Self_Enrollment'}); + $bread_crumbs_component = 'Enrollment result'; } - } elsif ($env{'form.action'} eq 'changelogs') { - if ($permission->{cusr} || $permission->{view}) { - &print_userchangelogs_display($r,$context,$permission,$brcrum); - } else { - $r->print(&header(undef,{'no_nav_bar' => 1}). - ''.&mt('You do not have permission to view change logs').''); + $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"); + $r->print(&Apache::loncoursequeueadmin::display_queued_requests($context, + $cdom,$cnum)); + } elsif ($env{'form.state'} eq 'done') { + $r->print('

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

'."\n"); + $r->print(&Apache::loncoursequeueadmin::update_request_queue($context, + $cdom,$cnum,$coursedesc)); } - } 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 'changelogs') { + my $helpitem; + if ($context eq 'course') { + $helpitem = 'Course_User_Logs'; } + push (@{$brcrum}, + {href => '/adm/createuser?action=changelogs', + text => 'User Management Logs', + help => $helpitem}); + $bread_crumbs_component = 'User Changes'; + $args = { bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; + $r->print(&header(undef,$args)); + &print_userchangelogs_display($r,$context,$permission); } else { $bread_crumbs_component = 'User Management'; $args = { bread_crumbs => $brcrum, @@ -5976,26 +5309,6 @@ sub print_main_menu { listusers => 'Show and manage users in this community.', }, ); - if ($linkcontext eq 'domain') { - unless ($permission->{'cusr'}) { - $links{'domain'}{'singleuser'} = 'View a User'; - $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain'; - } - } elsif ($linkcontext eq 'course') { - unless ($permission->{'cusr'}) { - $links{'course'}{'singleuser'} = 'View a Course User'; - $linktitles{'course'}{'singleuser'} = 'View information about a user in this course'; - $links{'course'}{'listusers'} = 'List Course Users'; - $linktitles{'course'}{'listusers'} = 'Show information about users in this course'; - } - } elsif ($linkcontext eq 'community') { - unless ($permission->{'cusr'}) { - $links{'community'}{'singleuser'} = 'View a Community User'; - $linktitles{'community'}{'singleuser'} = 'View information about a user in this community'; - $links{'community'}{'listusers'} = 'List Community Users'; - $linktitles{'community'}{'listusers'} = 'Show information about users in this community'; - } - } my @menu = ( {categorytitle => 'Single Users', items => [ @@ -6004,7 +5317,7 @@ sub print_main_menu { icon => 'edit-redo.png', #help => 'Course_Change_Privileges', url => '/adm/createuser?action=singleuser', - permission => ($permission->{'view'} || $permission->{'cusr'}), + permission => $permission->{'cusr'}, linktitle => $linktitles{$linkcontext}{'singleuser'}, }, ]}, @@ -6034,18 +5347,8 @@ sub print_main_menu { {categorytitle => 'Administration', items => [ ]}, ); - + if ($context eq 'domain'){ - push(@{ $menu[0]->{items} }, # Single Users - { - linktext => 'User Access Log', - icon => 'document-properties.png', - #help => 'Domain_User_Access_Logs', - url => '/adm/createuser?action=accesslogs', - permission => $permission->{'activity'}, - linktitle => 'View user access log.', - } - ); push(@{ $menu[2]->{items} }, #Category: Administration { @@ -6077,7 +5380,7 @@ sub print_main_menu { icon => 'document-properties.png', #help => 'Course_User_Logs', url => '/adm/createuser?action=changelogs', - permission => ($permission->{'cusr'} || $permission->{'view'}), + permission => $permission->{'cusr'}, linktitle => 'View change log.', }, ); @@ -6133,16 +5436,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', @@ -6163,7 +5457,7 @@ sub print_main_menu { icon => 'document-properties.png', #help => 'Course_User_Logs', url => '/adm/createuser?action=changelogs', - permission => ($permission->{'view'} || $permission->{'cusr'}), + permission => $permission->{'cusr'}, linktitle => 'View change log.', }, ); @@ -6174,7 +5468,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.', }, ); @@ -6188,8 +5482,7 @@ sub print_main_menu { icon => 'roles.png', #help => 'Course_Automated_Enrollment', permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && (($permission->{'cusr'}) || - ($permission->{'view'}))), + && $permission->{'cusr'}), url => '/adm/populate', linktitle => 'Automated enrollment manager.', } @@ -6201,7 +5494,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.', }, ); @@ -6238,7 +5531,7 @@ sub restore_prev_selections { } sub print_selfenroll_menu { - my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional,$readonly) = @_; + my ($r,$context,$cid,$cdom,$cnum,$currsettings,$additional) = @_; my $crstype = &Apache::loncommon::course_type(); my $formname = 'selfenroll'; my $nolink = 1; @@ -6251,10 +5544,6 @@ sub print_selfenroll_menu { butn => 'but no user types have been checked.', wilf => "Please uncheck 'activate' or check at least one type.", ); - my $disabled; - if ($readonly) { - $disabled = ' disabled="disabled"'; - } &js_escape(\%alerts); my $selfenroll_js = <<"ENDSCRIPT"; function update_types(caller,num) { @@ -6387,13 +5676,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') { @@ -6570,13 +5859,13 @@ ENDSCRIPT $output .= ' checked="checked" '; } $output .= 'onchange="javascript:update_types('. - "'selfenroll_all'".');"'.$disabled.' />'.&mt('Yes').''. + "'selfenroll_all'".');" />'.&mt('Yes').''. '  '.&mt('No').''. + "'selfenroll_all'".');"/>'.&mt('No').''. &Apache::loncommon::end_data_table_row(). &Apache::loncommon::end_data_table(). &mt('Or').'
'. @@ -6598,10 +5887,10 @@ ENDSCRIPT .'
' .''; $output .= '  '.&mt('User types:').'
' - .&selfenroll_inst_types($num,$currdom,\@currinsttypes,$readonly).'' + .&selfenroll_inst_types($num,$currdom,\@currinsttypes).'' .&Apache::loncommon::end_data_table_row(); $num ++; } @@ -6616,7 +5905,7 @@ ENDSCRIPT $output .= &Apache::loncommon::start_data_table_row() .''.$add_domtitle.'
' .&Apache::loncommon::select_dom_form('','selfenroll_newdom', - $includeempty,$showdomdesc,'','','',$readonly) + $includeempty,$showdomdesc) .'' .''.&Apache::loncommon::end_data_table_row() .&Apache::loncommon::end_data_table(); @@ -6637,15 +5926,15 @@ ENDSCRIPT } if ($registered) { $regon = ' checked="checked" '; - $regoff = ''; + $regoff = ' '; } else { - $regon = ''; + $regon = ' '; $regoff = ' checked="checked" '; } $output .= '  '; } elsif ($item eq 'enroll_dates') { my ($starttime,$endtime); @@ -6667,10 +5956,10 @@ ENDSCRIPT } my $startform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_date',$starttime, - $disabled,undef,undef,undef,undef,undef,undef,$nolink); + undef,undef,undef,undef,undef,undef,undef,$nolink); my $endform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_date',$endtime, - $disabled,undef,undef,undef,undef,undef,undef,$nolink); + undef,undef,undef,undef,undef,undef,undef,$nolink); $output .= &selfenroll_date_forms($startform,$endform); } elsif ($item eq 'access_dates') { my ($starttime,$endtime); @@ -6692,10 +5981,10 @@ ENDSCRIPT } my $startform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_start_access',$starttime, - $disabled,undef,undef,undef,undef,undef,undef,$nolink); + undef,undef,undef,undef,undef,undef,undef,$nolink); my $endform = &Apache::lonhtmlcommon::date_setter($formname,'selfenroll_end_access',$endtime, - $disabled,undef,undef,undef,undef,undef,undef,$nolink); + undef,undef,undef,undef,undef,undef,undef,$nolink); $output .= &selfenroll_date_forms($startform,$endform); } elsif ($item eq 'section') { my $currsec; @@ -6719,19 +6008,19 @@ ENDSCRIPT next; } my $sections_select = - &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec,$disabled); + &Apache::lonuserutils::course_sections(\%sections_count,'st',$currsec); $output .= ''."\n". ''."\n". '
'.&mt('Existing sections')."\n". '
'.$sections_select.'		'. &mt('New section').'
'."\n". - ''."\n". + ''."\n". ''."\n". '
'."\n"; } 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'}; } @@ -6747,8 +6036,8 @@ ENDSCRIPT for my $i (0..2) { $output .= ''.(' 'x2); + $appchecked{$i}.' onclick="toggleNotify();" />'.$selfdescs{'approval'}{$i}. + ''.(' 'x2); } my %advhash = &Apache::lonnet::get_course_adv_roles($cid,1); my (@ccs,%notified); @@ -6789,7 +6078,7 @@ ENDSCRIPT &Apache::loncommon::start_data_table_row() } $output .= ''; $count ++; @@ -6839,28 +6128,26 @@ ENDSCRIPT $nolimit = ' checked="checked" '; } $output .= ''. '
 '. (' 'x3).&mt('Maximum number allowed: '). - '
'; + ''; } $output .= &Apache::lonhtmlcommon::row_closure(1); } } - $output .= &Apache::lonhtmlcommon::end_pick_box().'
'; - unless ($readonly) { - $output .= ''; - } - $output .= '' - .''."\n" - .$additional.''; + $output .= &Apache::lonhtmlcommon::end_pick_box(). + '
' + .'' + .''."\n". + $additional.''; $r->print($output); return; } @@ -6995,7 +6282,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.', @@ -7008,24 +6294,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.','"','"'); @@ -7055,16 +6330,12 @@ sub new_selfenroll_dom_row { } sub selfenroll_inst_types { - my ($num,$currdom,$currinsttypes,$readonly) = @_; + my ($num,$currdom,$currinsttypes) = @_; my $output; my $numinrow = 4; my $count = 0; my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($currdom); my $othervalue = 'any'; - my $disabled; - if ($readonly) { - $disabled = ' disabled="disabled"'; - } if ((ref($types) eq 'ARRAY') && (ref($usertypes) eq 'HASH')) { if (keys(%{$usertypes}) > 0) { $othervalue = 'other'; @@ -7089,7 +6360,7 @@ sub selfenroll_inst_types { $output .= 'checked="checked"'; } } - $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$usertypes->{$type}.''; + $output .= ' name="selfenroll_types_'.$num.'" />'.$usertypes->{$type}.''; } $count ++; } @@ -7112,7 +6383,7 @@ sub selfenroll_inst_types { } else { $output .= ' checked="checked"'; } - $output .= ' name="selfenroll_types_'.$num.'"'.$disabled.' />'.$othertitle.''; + $output .= ' name="selfenroll_types_'.$num.'" />'.$othertitle.''; } return $output; } @@ -7133,9 +6404,9 @@ sub selfenroll_date_forms { } sub print_userchangelogs_display { - my ($r,$context,$permission,$brcrum) = @_; + my ($r,$context,$permission) = @_; my $formname = 'rolelog'; - my ($username,$domain,$crstype,$viewablesec,%roleslog); + my ($username,$domain,$crstype,%roleslog); if ($context eq 'domain') { $domain = $env{'request.role.domain'}; %roleslog=&Apache::lonnet::dump_dom('nohist_rolelog',$domain); @@ -7144,7 +6415,6 @@ sub print_userchangelogs_display { $domain = $env{'course.'.$env{'request.course.id'}.'.domain'}; $username = $env{'course.'.$env{'request.course.id'}.'.num'}; $crstype = &Apache::loncommon::course_type(); - $viewablesec = &Apache::lonuserutils::viewable_section($permission); my %saveable_parameters = ('show' => 'scalar',); &Apache::loncommon::store_course_settings('roles_log', \%saveable_parameters); @@ -7164,36 +6434,6 @@ sub print_userchangelogs_display { } if ((keys(%roleslog))[0]=~/^error\:/) { undef(%roleslog); } - 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', - text => 'User Management Logs', - help => $helpitem}); - my $bread_crumbs_component = 'User Changes'; - my $args = { bread_crumbs => $brcrum, - bread_crumbs_component => $bread_crumbs_component}; - - # Create navigation javascript - my $jsnav = &userlogdisplay_js($formname); - - my $jscript = (< -// - -ENDSCRIPT - - # print page header - $r->print(&header($jscript,$args)); - # set defaults my $now = time(); my $defstart = $now - (7*24*3600); #7 days ago @@ -7226,9 +6466,7 @@ ENDSCRIPT my ($minshown,$maxshown); $minshown = 1; my $count = 0; - if ($curr{'show'} =~ /\D/) { - $curr{'page'} = 1; - } else { + if ($curr{'show'} ne &mt('all')) { $maxshown = $curr{'page'} * $curr{'show'}; if ($curr{'page'} > 1) { $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; @@ -7240,6 +6478,8 @@ ENDSCRIPT &role_display_filter($context,$formname,$domain,$username,\%curr, $version,$crstype)); + # Create navigation + my ($nav_script,$nav_links) = &userlogdisplay_nav($formname,\%curr,$more_records); my $showntableheader = 0; # Table Header @@ -7264,7 +6504,7 @@ ENDSCRIPT foreach my $id (sort { $roleslog{$b}{'exe_time'}<=>$roleslog{$a}{'exe_time'} } (keys(%roleslog))) { next if (($roleslog{$id}{'exe_time'} < $curr{'rolelog_start_date'}) || ($roleslog{$id}{'exe_time'} > $curr{'rolelog_end_date'})); - if ($curr{'show'} !~ /\D/) { + if ($curr{'show'} ne &mt('all')) { if ($count >= $curr{'page'} * $curr{'show'}) { $more_records = 1; last; @@ -7280,13 +6520,12 @@ ENDSCRIPT next if ($roleslog{$id}{'logentry'}{'context'} ne $curr{'chgcontext'}); } } - if (($context eq 'course') && ($viewablesec ne '')) { - next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec); - } $count ++; next if ($count < $minshown); unless ($showntableheader) { - $r->print(&Apache::loncommon::start_data_table() + $r->print($nav_script + .$nav_links + .&Apache::loncommon::start_data_table() .$tableheader); $r->rflush(); $showntableheader = 1; @@ -7347,8 +6586,8 @@ ENDSCRIPT } if ($showntableheader) { # Table footer, if content displayed above - $r->print(&Apache::loncommon::end_data_table(). - &userlogdisplay_navlinks(\%curr,$more_records)); + $r->print(&Apache::loncommon::end_data_table() + .$nav_links); } else { # No content displayed above $r->print('

' .&mt('There are no records to display.') @@ -7364,378 +6603,15 @@ ENDSCRIPT return; } -sub print_useraccesslogs_display { - my ($r,$uname,$udom,$permission,$brcrum) = @_; - my $formname = 'accesslog'; - 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'; - } - } - } - push(@{$brcrum}, - {href => '/adm/createuser?action=accesslogs', - text => 'User access logs', - help => 'Domain_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(); - my $jsnav = &userlogdisplay_js($formname); - - my $jscript = (< // - - -ENDSCRIPT - -# print page header - $r->print(&header($jscript,$args)); - -# early out unless log data can be displayed. - 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)); - } - return; - } - - unless ($udom eq $env{'request.role.domain'}) { - $r->print('

' - .&mt("User's domain must match role's domain") - .'

' - .&earlyout_accesslog_form($formname,$prevphasestr,$udom)); - return; - } - - if (($uname eq '') || ($udom eq '')) { - $r->print('

' - .&mt('Invalid username or domain') - .'

' - .&earlyout_accesslog_form($formname,$prevphasestr,$udom)); - 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); - my %defaults = ( - page => '1', - show => '10', - activity => 'any', - accesslog_start_date => $defstart, - accesslog_end_date => $now, - ); - my $more_records = 0; - -# set current - my %curr; - foreach my $item ('show','page','activity') { - $curr{$item} = $env{'form.'.$item}; - } - my ($startdate,$enddate) = - &Apache::lonuserutils::get_dates_from_form('accesslog_start_date','accesslog_end_date'); - $curr{'accesslog_start_date'} = $startdate; - $curr{'accesslog_end_date'} = $enddate; - foreach my $key (keys(%defaults)) { - if ($curr{$key} eq '') { - $curr{$key} = $defaults{$key}; - } - } - my ($minshown,$maxshown); - $minshown = 1; - my $count = 0; - if ($curr{'show'} =~ /\D/) { - $curr{'page'} = 1; - } else { - $maxshown = $curr{'page'} * $curr{'show'}; - if ($curr{'page'} > 1) { - $minshown = 1 + ($curr{'page'} - 1) * $curr{'show'}; - } - } - -# form header - $r->print('
'. - &activity_display_filter($formname,\%curr)); - - my $showntableheader = 0; - 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() - .' ' - .''.&mt('When').'' - .''.&mt('HostID').'' - .''.&mt('Event').'' - .''.&mt('Other data').'' - .&Apache::loncommon::end_data_table_header_row(); - - my %filters=( - start => $curr{'accesslog_start_date'}, - end => $curr{'accesslog_end_date'}, - action => $curr{'activity'}, - ); - - my $reply = &Apache::lonnet::userlog_query($uname,$udom,%filters); - unless ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { - my (%courses,%missing); - my @results = split(/\&/,$reply); - foreach my $item (reverse(@results)) { - my ($timestamp,$host,$event) = split(/:/,$item); - next unless ($event =~ /^(Log|Role)/); - if ($curr{'show'} !~ /\D/) { - if ($count >= $curr{'page'} * $curr{'show'}) { - $more_records = 1; - last; - } - } - $count ++; - next if ($count < $minshown); - unless ($showntableheader) { - $r->print($nav_script - .&Apache::loncommon::start_data_table() - .$tableheader); - $r->rflush(); - $showntableheader = 1; - } - my ($shown,$extra); - my ($event,$data) = split(/\s+/,&unescape($event),2); - if ($event eq 'Role') { - my ($rolecode,$extent) = split(/\./,$data,2); - next if ($extent eq ''); - my ($crstype,$desc,$info); - if ($extent =~ m{^/($match_domain)/($match_courseid)(?:/(\w+)|)$}) { - my ($cdom,$cnum,$sec) = ($1,$2,$3); - my $cid = $cdom.'_'.$cnum; - if (exists($courses{$cid})) { - $crstype = $courses{$cid}{'type'}; - $desc = $courses{$cid}{'description'}; - } elsif ($missing{$cid}) { - $crstype = 'Course'; - $desc = 'Course/Community'; - } else { - my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.'); - if (ref($crsinfo{$cdom.'_'.$cnum}) eq 'HASH') { - $courses{$cid} = $crsinfo{$cid}; - $crstype = $crsinfo{$cid}{'type'}; - $desc = $crsinfo{$cid}{'description'}; - } else { - $missing{$cid} = 1; - } - } - $extra = &mt($crstype).': '.$desc.''; - if ($sec ne '') { - $extra .= ' ('.&mt('Section: [_1]',$sec).')'; - } - } elsif ($extent =~ m{^/($match_domain)/($match_username|$)}) { - my ($dom,$name) = ($1,$2); - if ($rolecode eq 'au') { - $extra = ''; - } elsif ($rolecode =~ /^(ca|aa)$/) { - $extra = &mt('Authoring Space: [_1]',$name.':'.$dom); - } elsif ($rolecode =~ /^(li|dg|dh|dc|sc)$/) { - $extra = &mt('Domain: [_1]',$dom); - } - } - my $rolename; - if ($rolecode =~ m{^cr/($match_domain)/($match_username)/(\w+)}) { - my $role = $3; - my $owner = "($2:$1)"; - if ($2 eq $1.'-domainconfig') { - $owner = '(ad hoc)'; - } - $rolename = &mt('Custom role: [_1]',$role.' '.$owner); - } else { - $rolename = &Apache::lonnet::plaintext($rolecode,$crstype); - } - $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); - } - } - $r->print( - &Apache::loncommon::start_data_table_row() - .''.$count.'' - .''.&Apache::lonlocal::locallocaltime($timestamp).'' - .''.$host.'' - .''.$shown.'' - .''.$extra.'' - .&Apache::loncommon::end_data_table_row()."\n"); - } - } - - if ($showntableheader) { # Table footer, if content displayed above - $r->print(&Apache::loncommon::end_data_table(). - &userlogdisplay_navlinks(\%curr,$more_records)); - } else { # No content displayed above - $r->print($heading.'

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

'); - } - - if ($env{'form.popup'} == 1) { - $r->print(''."\n"); - } - - # Form Footer - $r->print( - '' - .'' - .'' - .'' - .'' - .'' - .'' - .'' - .'' - .'' - .'' - .'' - .'
'); - return; -} - -sub earlyout_accesslog_form { - my ($formname,$prevphasestr,$udom) = @_; - my $srchterm = &HTML::Entities::encode($env{'form.srchterm'},'<>"&'); - return <<"END"; -
- - - - - - - - - -
-END -} - -sub activity_display_filter { - my ($formname,$curr) = @_; - my $nolink = 1; - my $output = ''; - my $startform = - &Apache::lonhtmlcommon::date_setter($formname,'accesslog_start_date', - $curr->{'accesslog_start_date'},undef, - undef,undef,undef,undef,undef,undef,$nolink); - my $endform = - &Apache::lonhtmlcommon::date_setter($formname,'accesslog_end_date', - $curr->{'accesslog_end_date'},undef, - undef,undef,undef,undef,undef,undef,$nolink); - my %lt = &Apache::lonlocal::texthash ( - activity => 'Activity', - Role => 'Role selection', - log => 'Log-in or Logout', - ); - $output .= ''. - ''. - ''. - '
'. - ''.&mt('Actions/page:').'
'. - &Apache::lonmeta::selectbox('show',$curr->{'show'},undef, - (&mt('all'),5,10,20,50,100,1000,10000)). - '		  '.&mt('Window during which actions occurred:').'
'. - ''. - ''. - '
'.&mt('After:'). - ''.$startform.'
'.&mt('Before:').''.$endform.'
'. - '		  '.&mt('Activities').'
'. - '
'; - # Update Display button - $output .= '

' - .'' - .'

'; - return $output; -} - -sub userlogdisplay_js { - my ($formname) = @_; - return <<"ENDSCRIPT"; - function chgPage(caller) { if (caller == 'previous') { document.$formname.page.value --; @@ -7746,30 +6622,28 @@ function chgPage(caller) { document.$formname.submit(); return; } +// ]]> + ENDSCRIPT -} - -sub userlogdisplay_navlinks { - my ($curr,$more_records) = @_; - return unless(ref($curr) eq 'HASH'); - # Navigation Buttons - my $nav_links = '

'; - if (($curr->{'page'} > 1) || ($more_records)) { - if (($curr->{'page'} > 1) && ($curr->{'show'} !~ /\D/)) { - $nav_links .= ' '; - } - if ($more_records) { - $nav_links .= ''; + # Navigation Buttons + $nav_links = '

'; + if (($curr->{'page'} > 1) || ($more_records)) { + if ($curr->{'page'} > 1) { + $nav_links .= ' '; + } + if ($more_records) { + $nav_links .= ''; + } } + $nav_links .= '

'; } - $nav_links .= '

'; - return $nav_links; + return ($nav_script,$nav_links); } sub role_display_filter { @@ -7826,12 +6700,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) = @_; @@ -8932,29 +6823,13 @@ sub user_search_result { } } if ($response ne '') { - $response = ''.$response.'
    '; + $response = ''.$response.''; } if ($srch->{'srchin'} eq 'instd') { - my $instd_chk = &instdirectorysrch_check($srch); + my $instd_chk = &directorysrch_check($srch); if ($instd_chk ne 'ok') { - my $domd_chk = &domdirectorysrch_check($srch); - $response .= ''.$instd_chk.'
    '; - if ($domd_chk eq 'ok') { - $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'); - } - $response .= '
    '; - } - } 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')) { - my $instd_chk = &instdirectorysrch_check($srch); - $response .= ''.$domd_chk.'
    '; - if ($instd_chk eq 'ok') { - $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.'); - } - $response .= '
    '; - } + $response = ''.$instd_chk.''. + '
    '.&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').'

    '; } } if ($response ne '') { @@ -8984,9 +6859,6 @@ sub user_search_result { &build_search_response($context,$srch,%srch_results); } else { $currstate = 'modify'; - if ($env{'form.action'} eq 'accesslogs') { - $currstate = 'activity'; - } my $uname = $srch->{'srchterm'}; my $udom = $srch->{'srchdomain'}; $srch_results{$uname.':'.$udom} = @@ -9053,7 +6925,7 @@ sub user_search_result { &mt('Institutional directory search is not available in domain: [_1]',$showdom). '
    '. &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). - '
    '; + '

    '; } } } else { @@ -9121,38 +6993,18 @@ sub user_search_result { ($currstate,$response,$forcenewuser) = &build_search_response($context,$srch,%srch_results); } else { - my $showdom = &display_domain_info($srch->{'srchdomain'}); - $response = ''. + my $showdom = &display_domain_info($srch->{'srchdomain'}); $response = ''. &mt('Institutional directory search is not available in domain: [_1]',$showdom). '
    '. &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.'). - '
    '; + '

    '; } } } return ($currstate,$response,$forcenewuser,\%srch_results); } -sub domdirectorysrch_check { - my ($srch) = @_; - my $response; - my %dom_inst_srch = &Apache::lonnet::get_dom('configuration', - ['directorysrch'],$srch->{'srchdomain'}); - my $showdom = &display_domain_info($srch->{'srchdomain'}); - if (ref($dom_inst_srch{'directorysrch'}) eq 'HASH') { - if ($dom_inst_srch{'directorysrch'}{'lcavailable'} eq '0') { - return &mt('LON-CAPA directory search is not available in domain: [_1]',$showdom); - } - if ($dom_inst_srch{'directorysrch'}{'lclocalonly'}) { - if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) { - return &mt('LON-CAPA directory search in domain: [_1] is only allowed for users with a current role in the domain.',$showdom); - } - } - } - return 'ok'; -} - -sub instdirectorysrch_check { +sub directorysrch_check { my ($srch) = @_; my $can_search = 0; my $response; @@ -9274,11 +7126,7 @@ sub build_search_response { $currstate = 'select'; } else { if (keys(%srch_results) == 1) { - if ($env{'form.action'} eq 'accesslogs') { - $currstate = 'activity'; - } else { - $currstate = 'modify'; - } + $currstate = 'modify'; $response = &mt("$single{$srch->{'srchtype'}} was found for the $names{$srch->{'srchby'}} ([_1]) in $names{$srch->{'srchin'}}.",$srch->{'srchterm'}); if ($srch->{'srchin'} eq 'dom' || $srch->{'srchin'} eq 'instd') { $response .= ': '.&display_domain_info($srch->{'srchdomain'}); @@ -9298,7 +7146,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'}) { @@ -9323,8 +7171,7 @@ sub build_search_response { $createdom = $env{'form.coursedom'}; } } - unless (($env{'form.action'} eq 'accesslogs') || (($srch->{'srchby'} eq 'uname') && ($srch->{'srchin'} eq 'dom') && - ($srch->{'srchtype'} eq 'exact') && ($srch->{'srchdomain'} eq $createdom))) { + if (!($srch->{'srchby'} eq 'uname' && $srch->{'srchin'} eq 'dom' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchdomain'} eq $createdom)) { my $cancreate = &Apache::lonuserutils::can_create_user($createdom,$context); my $targetdom = ''.$createdom.''; @@ -9348,20 +7195,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.' + ,' ' + ,'') + .'

    '; } } } @@ -9645,7 +7490,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 { @@ -9981,7 +7826,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') {