--- loncom/interface/loncreateuser.pm 2024/02/29 21:43:33 1.406.2.20.2.5 +++ loncom/interface/loncreateuser.pm 2024/07/04 00:56:21 1.406.2.21 @@ -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.406.2.21 2024/07/04 00:56:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -81,7 +81,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 +102,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 +124,14 @@ sub auth_abbrev { # ==================================================== sub user_quotas { - my ($ccuname,$ccdomain,$name) = @_; + my ($ccuname,$ccdomain) = @_; my %lt = &Apache::lonlocal::texthash( + 'usrt' => "User Tools", 'cust' => "Custom quota", 'chqu' => "Change quota", ); - my ($output,$longinsttype); - my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain); - my %titles = &Apache::lonlocal::texthash ( - portfolio => "Disk space allocated to user's portfolio files", - author => "Disk space allocated to user's Authoring Space", - ); - my ($currquota,$quotatype,$inststatus,$defquota) = - &Apache::loncommon::get_user_quota($ccuname,$ccdomain,$name); - if ($longinsttype eq '') { - if ($inststatus ne '') { - if ($usertypes->{$inststatus} ne '') { - $longinsttype = $usertypes->{$inststatus}; - } - } - } - my ($showquota,$custom_on,$custom_off,$defaultinfo,$colspan); - $custom_on = ' '; - $custom_off = ' checked="checked" '; - $colspan = ' colspan="2"'; - if ($quotatype eq 'custom') { - $custom_on = $custom_off; - $custom_off = ' '; - $showquota = $currquota; - if ($longinsttype eq '') { - $defaultinfo = &mt('For this user, the default quota would be [_1]' - .' MB.',$defquota); - } else { - $defaultinfo = &mt("For this user, the default quota would be [_1]". - " MB,[_2]as determined by the user's institutional". - " affiliation ([_3]).",$defquota,'
',$longinsttype); - } - } else { - if ($longinsttype eq '') { - $defaultinfo = &mt('For this user, the default quota is [_1]' - .' MB.',$defquota); - } else { - $defaultinfo = &mt("For this user, the default quota of [_1]". - " MB,[_2]is determined by the user's institutional". - " affiliation ([_3]).",$defquota,'
',$longinsttype); - } - } - - if (&Apache::lonnet::allowed('mpq',$ccdomain)) { - $output .= ''."\n". - ' '.$titles{$name}.''."\n". - ' '."\n". - &Apache::loncommon::start_data_table_row()."\n". - ' '. - &mt('Current quota: [_1] MB',$currquota).'  '. - $defaultinfo.''."\n". - &Apache::loncommon::end_data_table_row()."\n". - &Apache::loncommon::start_data_table_row()."\n". - ''.$lt{'chqu'}. - ':  '. - '  '. - ' '.&mt('MB').''."\n". - &Apache::loncommon::end_data_table_row()."\n"; - } - return $output; -} - -sub user_quota_js { - return <<"END_SCRIPT"; + + my $quota_javascript = <<"END_SCRIPT"; END_SCRIPT + my $longinsttype; + my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($ccdomain); + my $output = $quota_javascript."\n". + '

'.$lt{'usrt'}.'

'."\n". + &Apache::loncommon::start_data_table(); + + if ((&Apache::lonnet::allowed('mut',$ccdomain)) || + (&Apache::lonnet::allowed('udp',$ccdomain))) { + $output .= &build_tools_display($ccuname,$ccdomain,'tools'); + } -} - -sub set_custom_js { - return <<"END_SCRIPT"; - - - -END_SCRIPT + my ($showquota,$custom_on,$custom_off,$defaultinfo); + $custom_on = ' '; + $custom_off = ' checked="checked" '; + if ($quotatype eq 'custom') { + $custom_on = $custom_off; + $custom_off = ' '; + $showquota = $currquota; + if ($longinsttype eq '') { + $defaultinfo = &mt('For this user, the default quota would be [_1]' + .' MB.',$defquota); + } else { + $defaultinfo = &mt("For this user, the default quota would be [_1]". + " MB, as determined by the user's institutional". + " affiliation ([_2]).",$defquota,$longinsttype); + } + } else { + if ($longinsttype eq '') { + $defaultinfo = &mt('For this user, the default quota is [_1]' + .' MB.',$defquota); + } else { + $defaultinfo = &mt("For this user, the default quota of [_1]". + " MB, is determined by the user's institutional". + " affiliation ([_2]).",$defquota,$longinsttype); + } + } + if (&Apache::lonnet::allowed('mpq',$ccdomain)) { + $output .= ''."\n". + ' '.$titles{$name}.''."\n". + ' '."\n". + &Apache::loncommon::start_data_table_row()."\n". + ' '. + &mt('Current quota: [_1] MB',$currquota).'  '. + $defaultinfo.''."\n". + &Apache::loncommon::end_data_table_row()."\n". + &Apache::loncommon::start_data_table_row()."\n". + ' '.$lt{'chqu'}. + ':  '. + '  '. + ' '.&mt('MB').''."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + } + $output .= &Apache::loncommon::end_data_table(); + return $output; } sub build_tools_display { my ($ccuname,$ccdomain,$context) = @_; my (@usertools,%userenv,$output,@options,%validations,%reqtitles,%reqdisplay, - $colspan,$isadv,%domconfig,@defaulteditors,@customeditors); + $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 +254,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 +264,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($ccdomain,$ccuname); } elsif ($context eq 'requestauthor') { - %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'requestauthor'); + %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, + 'requestauthor'); @usertools = ('requestauthor'); @options =('norequest','approval','automatic'); %reqtitles = &requestauthor_titles(); %reqdisplay = &requestauthor_display(); + $colspan = ' colspan="2"'; %domconfig = &Apache::lonnet::get_dom('configuration',['requestauthor'],$ccdomain); - } elsif ($context eq 'authordefaults') { - %domconfig = - &Apache::lonnet::get_dom('configuration',['quotas','authordefaults'],$ccdomain); - %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,'tools.webdav', - 'authoreditors'); - @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 +304,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 +359,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 +369,7 @@ sub build_tools_display { } else { $currdisp = $reqdisplay{$curroption}; } - $custdisp = '
'; + $custdisp = ''; foreach my $option (@options) { my $val = $option; if ($option eq 'norequest') { @@ -498,87 +392,53 @@ sub build_tools_display { $checked = ' checked="checked"'; } } - if ($option eq 'autolimit') { - $custdisp .= '
'; + my $name = 'crsreq_'.$item; + if ($context eq 'requestauthor') { + $name = $item; } - $custdisp .= ''."\n". - &Apache::loncommon::end_data_table_row()."\n"; - unless (&Apache::lonnet::allowed('udp',$ccdomain)) { - $output .= &Apache::loncommon::start_data_table_row()."\n". - ''. - $lt{'chse'}.': '.(' ' x3). - '
'. - '
'; - foreach my $editor ('edit','xml','daxe') { - my $checked; - if ($userenv{'author'.$item} eq '') { - if (grep(/^\Q$editor\E$/,@defaulteditors)) { - $checked = ' checked="checked"'; - } - } elsif (grep(/^\Q$editor\E$/,@customeditors)) { - $checked = ' checked="checked"'; - } - $output .= ' '; - } - $output .= '
'. - &Apache::loncommon::end_data_table_row()."\n"; + $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"; + unless (&Apache::lonnet::allowed('udp',$ccdomain)) { + $output .= &Apache::loncommon::start_data_table_row()."\n". - ''. + ' '. $lt{'chse'}.': '.(' ' x3). + $cust_off.'/>'.$lt{'usde'}.''.(' ' x3). ''; - if ($colspan) { - $output .= ''; - } - $output .= $custradio.''. - &Apache::loncommon::end_data_table_row()."\n"; - } + $cust_on.'/>'.$lt{'uscu'}.''.$custradio.''. + &Apache::loncommon::end_data_table_row()."\n"; } } return $output; @@ -664,7 +524,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 +532,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', @@ -1394,9 +1242,8 @@ sub print_user_modification_page { my $groupslist = &Apache::lonuserutils::get_groupslist(); - my $js = &validation_javascript($context,$ccdomain,$pjump_def, - $crstype,$groupslist,$newuser, - $formname,\%loaditem,$permission); + my $js = &validation_javascript($context,$ccdomain,$pjump_def,$crstype, + $groupslist,$newuser,$formname,\%loaditem); my %breadcrumb_text = &singleuser_breadcrumb($crstype,$context,$ccdomain); my $helpitem = 'Course_Change_Privileges'; if ($env{'form.action'} eq 'singlestudent') { @@ -1405,7 +1252,6 @@ sub print_user_modification_page { $helpitem = 'Author_Change_Privileges'; } elsif ($context eq 'domain') { $helpitem = 'Domain_Change_Privileges'; - $js .= &set_custom_js(); } push (@{$brcrum}, {href => "javascript:backPage($form)", @@ -1431,32 +1277,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 +1313,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 +1355,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 +1370,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'). @@ -1664,7 +1466,7 @@ ENDAUTH $inst_results{$ccuname.':'.$ccdomain})); if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) { - $r->print('

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

'."\n". + $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 +1477,28 @@ 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'})) || + if ((!$isauthor) && + ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) || (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) && - ($env{'request.role.domain'} eq $ccdomain)) { - if (!$isauthor) { - $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); - } - $user_text{'authordefaults'} = &authoring_defaults($ccuname,$ccdomain); - if (&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) { - $need_quota_js = 1; - } + ($env{'request.role.domain'} eq $ccdomain)) { + $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain); } $user_text{'auth'} = &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission); if ((&Apache::lonnet::allowed('mpq',$ccdomain)) || (&Apache::lonnet::allowed('mut',$ccdomain)) || (&Apache::lonnet::allowed('udp',$ccdomain))) { - $user_text{'quota'} = '

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

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

'); - if ($need_quota_js) { - $r->print(&user_quota_js()); - } return; } @@ -1884,16 +1667,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))) { @@ -2712,8 +2493,8 @@ sub personal_data_display { } $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". @@ -2845,10 +2626,9 @@ sub personal_data_display { '
'; if ($usertype ne '') { - $output .= ''; + $output .= ''. + &Apache::lonhtmlcommon::row_closure(1); } - $output .= &Apache::lonhtmlcommon::row_closure(1); } } $output .= &Apache::lonhtmlcommon::end_pick_box(); @@ -3069,10 +2849,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 +2960,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'})) { @@ -3269,13 +3025,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 +3158,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 +3186,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 +3294,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 +3319,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 +3328,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 +3348,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 +3358,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) { @@ -3835,7 +3527,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 +3534,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 +3559,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 +3743,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 +3756,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 +3774,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 +3800,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 +3810,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 +3851,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 +3879,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 +4373,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 +4383,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; } @@ -5710,8 +5303,7 @@ sub handler { ''.&mt('You do not have permission to view change logs').''); } } elsif ($env{'form.action'} eq 'helpdesk') { - if (($permission->{'owner'} || $permission->{'co-owner'}) && - ($permission->{'cusr'} || $permission->{'view'})) { + if (($permission->{'owner'}) || ($permission->{'co-owner'})) { if ($env{'form.state'} eq 'process') { if ($permission->{'owner'}) { &update_helpdeskaccess($r,$permission,$brcrum); @@ -6138,8 +5730,7 @@ sub print_main_menu { icon => 'helpdesk-access.png', #help => 'Course_Helpdesk_Access', url => '/adm/createuser?action=helpdesk', - permission => (($permission->{'owner'} || $permission->{'co-owner'}) && - ($permission->{'view'} || $permission->{'cusr'})), + permission => ($permission->{'owner'} || $permission->{'co-owner'}), linktitle => 'Helpdesk access options', }, { @@ -9645,7 +9236,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 {