--- loncom/interface/lonpreferences.pm 2024/03/01 21:28:39 1.196.4.28.2.4 +++ loncom/interface/lonpreferences.pm 2022/09/08 01:41:13 1.241 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.196.4.28.2.4 2024/03/01 21:28:39 raeburn Exp $ +# $Id: lonpreferences.pm,v 1.241 2022/09/08 01:41:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -165,7 +165,7 @@ sub texenginechanger { my %mathchoices=('' => 'Default', 'tth' => 'tth (TeX to HTML)', #'ttm' => 'TeX to MathML', - 'MathJax' => 'MathJax', + 'MathJax' => 'MathJax', 'mimetex' => 'mimetex (Convert to Images)', 'raw' => 'Raw (Screen Reader)' ); @@ -182,7 +182,7 @@ sub texenginechanger { 'change' => 'Save', 'exmpl' => 'Examples', 'mathjax' => 'MathJax:', - 'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.', + 'mathjaxinfo' => 'MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation.', 'tth' => 'tth (TeX to HTML):', 'mimetex' => 'mimetex (Convert to Images):', ); @@ -280,7 +280,7 @@ sub rolesprefchanger { my $hotlist_n=$userenv{'recentrolesn'}; my ($checkedon,$checkedoff); if ($hotlist_flag) { - $checkedon = 'checked="checked"'; + $checkedon = 'checked="checked"'; } else { $checkedoff = 'checked="checked"'; } @@ -683,16 +683,51 @@ sub verify_and_change_clicker { my $r = shift; my $user = $env{'user.name'}; my $domain = $env{'user.domain'}; + my $uhome = $env{'user.home'}; my $newclickers = $env{'form.clickers'}; + my $message; $newclickers=~s/[^\w\:\-]+/\,/gs; $newclickers=~tr/a-z/A-Z/; $newclickers=~s/[\:\-]+/\-/g; $newclickers=~s/\,+/\,/g; $newclickers=~s/^\,//; $newclickers=~s/\,$//; - &Apache::lonnet::put('environment',{'clickers' => $newclickers}); - &Apache::lonnet::appenv({'environment.clickers' => $newclickers}); - my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers)); + my @oldclickers = split(/,/,$env{'environment.clickers'}); + my @newclickers = split(/,/,$newclickers); + my %newuniq; + map { $newuniq{$_} = 1; } @newclickers; + @newclickers = sort(keys(%newuniq)); + my @differences = &Apache::loncommon::compare_arrays(\@oldclickers,\@newclickers); + if (@differences) { + my $putres = &Apache::lonnet::put('environment',{'clickers' => $newclickers}); + if ($putres eq 'ok') { + my @adds = (); + my @dels = (); + foreach my $item (@differences) { + if (grep(/^\Q$item\E$/,@newclickers)) { + push(@adds,$item); + } else { + push(@dels,$item); + } + } + if (@dels) { + my %delclicker; + map { $delclicker{$_} = $user; } @dels; + my $putresult = &Apache::lonnet::iddel($domain,\%delclicker,$uhome,'clickers'); + } + if (@adds) { + my %addclicker; + map { $addclicker{$_} = $user; } @adds; + my $putresult = &Apache::lonnet::updateclickers($domain,'add',\%addclicker,$uhome,1); + } + &Apache::lonnet::appenv({'environment.clickers' => $newclickers}); + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Registering clickers: [_1]',$newclickers)); + } else { + $message=&Apache::lonhtmlcommon::confirm_success(&mt('Error saving clicker ID').1); + } + } else { + $message=''.&mt('Clicker information unchanged').''; + } $message=&Apache::loncommon::confirmwrapper($message); &print_main_menu($r, $message); } @@ -1142,10 +1177,10 @@ sub colorschanger { foreach my $item (sort(keys(%colortypes))) { my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain); $chtable.=&Apache::loncommon::start_data_table_row(). - ''.$colortypes{$item}.''. - &Apache::loncommon::end_data_table_row()."\n"; + ''.$colortypes{$item}.''. + &Apache::loncommon::end_data_table_row()."\n"; } my $end_data_table = &Apache::loncommon::end_data_table(); my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition(); @@ -1197,9 +1232,9 @@ sub verify_and_change_colors { my $message=''; foreach my $item (keys(%colortypes)) { my $color=$env{'form.'.$item}; - if (!($color =~ /^#/)) { - $color = '#' . $color; - } + if (!($color =~ /^#/)) { + $color = '#' . $color; + } my $entry='color.'.$function.'.'.$item; if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) { &Apache::lonnet::put('environment',{$entry => $color}); @@ -1285,9 +1320,9 @@ sub passwordchanger { } else { $r->print( '

' - .&mt('Sorry, the URL generated when you requested reset of' - .' your password contained incomplete information.') - .'

' + .&mt('Sorry, the URL generated when you requested reset of' + .' your password contained incomplete information.') + .'

' ); return; } @@ -1402,7 +1437,7 @@ sub jscript_send { var posspass = this.document.client.elements.newpass_1.value; if (min > 0) { if (posspass.length < min) { - errors.push("$js_lt{'short'}"); + errors.push("$js_lt{'short'}"); } } if (currauth == 'internal:') { @@ -1431,7 +1466,7 @@ sub jscript_send { } else if (rules[i] == 'spec') { var pattern = /^[!@#$%^&*()_+\\-=\\[\\]{};':"\\\|,.\\/?]/; if (!posspass.match(pattern)) { - errors.push("$js_lt{'spec'}"); + errors.push("$js_lt{'spec'}"); } } } @@ -1725,10 +1760,10 @@ ENDERROR } else { my $warning = &Apache::loncommon::check_passwd_rules($domain,$newpass1); if ($warning) { - &passwordchanger($r,''. - $warning. - &mt('Please try again.').'', - $caller,$mailtoken,$timelimit,$extrafields); + &passwordchanger($r,''. + $warning. + &mt('Please try again.').'', + $caller,$mailtoken,$timelimit,$extrafields); if ($caller eq 'reset_by_email') { return 'rules'; } else { @@ -2043,112 +2078,9 @@ sub author_space_settings { my $domain = $env{'user.domain'}; my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']); if (keys(%author_roles) > 0) { - my ($showdomdefs,$js,$args,@items); - my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\''); - my $reqdmajor = 2; - my $reqdminor = 11; - my $reqddotnum = 4; - my $reqddotlett= 'B'; - my $reqdreldate = '2024030109'; - my $reqletterfail; - my $loncaparev = &Apache::lonnet::get_server_loncaparev($env{'user.domain'},$env{'user.home'}); - my ($major,$minor,$dotrel,$reldate) = ($loncaparev =~ /^\'?(\d+)\.(\d+)\.([\w.]+)\-(\d+)\'?$/); - my ($dotnum,$dotlett) = split(/\./,$dotrel); - my %lettdig = &Apache::lonnet::letter_to_digits(); - if ((exists($lettdig{$dotlett})) && (exists($lettdig{$reqddotlett}))) { - if ($lettdig{$reqddotlett} > $lettdig{$dotlett}) { - $reqletterfail = 1; - } - } - unless (($major eq '' && $minor eq '') || - ($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)) || - (($reqdmajor == $major) && ($reqdminor == $minor) && ($reqddotnum > $dotnum)) || - (($reqdmajor == $major) && ($reqdminor == $minor) && ($reqddotnum == $dotnum) && $reqletterfail) || - (($reqdmajor == $major) && ($reqdminor == $minor) && ($reqddotnum == $dotnum) && ($reqdreldate > $reldate))) { - @items = ('nocodemirror','copyright','sourceavail'); - $showdomdefs = 1; - $js = &toggle_options_js(); - my $onload; - foreach my $item (@items) { - $onload .= "javascript:toggleOptions(document.prefs,'$item','user_$item');" - } - $args = { 'add_entries' => { 'onload' => $onload } }; - } - $r->print(Apache::loncommon::start_page('Authoring Space Settings',$js,$args)); - $r->print(Apache::lonhtmlcommon::breadcrumbs('Authoring Space Settings')); - if ($showdomdefs) { - my %userenv = &Apache::lonnet::get('environment',\@items); - my %domdefs = &Apache::lonnet::get_domain_defaults($domain); - my %staticdefaults = ( - 'nocodemirror' => '0', - 'copyright' => 'default', - 'sourceavail' => 'closed', - ); - my %lt = &authoring_settings_text(); - my %titles = &authoring_settings_titles(); - $r->print("

$lt{'auss'}


\n". - '
'."\n". - ''."\n". - ''."\n"); - foreach my $item (@items) { - my ($domdef,$checkeddom,$checkeduser,$domdefdisplay,$divsty,$userelem); - $checkeddom = ' checked="checked"'; - $divsty = 'display:none'; - if (exists($domdefs{$item})) { - $domdef = $domdefs{$item}; - } else { - $domdef = $staticdefaults{$item}; - } - if ($item eq 'copyright') { - $domdefdisplay = &Apache::loncommon::copyrightdescription($domdef); - $userelem = &selectbox('userchoice_'.$item,$userenv{$item},'', - \&Apache::loncommon::copyrightdescription, - (grep !/^priv|custom$/,(&Apache::loncommon::copyrightids))); - } elsif ($item eq 'sourceavail') { - $domdefdisplay = &Apache::loncommon::source_copyrightdescription($domdef); - $userelem = &selectbox('userchoice_'.$item,$userenv{$item},'', - \&Apache::loncommon::source_copyrightdescription, - (&Apache::loncommon::source_copyrightids)); - } elsif ($item eq 'nocodemirror') { - if ($domdef) { - $domdefdisplay = $lt{'yes'}; - } else { - $domdefdisplay = $lt{'no'}; - } - my %checked; - $checked{'no'} = ' checked="checked"'; - if ($userenv{$item} eq 'yes') { - $checked{'yes'} = $checked{'no'}; - $checked{'no'} = ''; - } - $userelem = ''; - foreach my $choice ('yes','no') { - $userelem .= '   '; - } - $userelem .= ''; - } - if ($userenv{$item} ne '') { - $checkeduser = $checkeddom; - $checkeddom = ''; - $divsty = 'display:inline-block'; - } - $r->print(<<"END"); -

$titles{$item}

-

$lt{'curd'}: $domdefdisplay

-

-    -

-
-$lt{'ousv'} -$userelem -

-END - } - $r->print('
'. - ''. - '
'."\n"); - } else { + $r->print(Apache::loncommon::start_page('Authoring Space Settings')); + $r->print(Apache::lonhtmlcommon::breadcrumbs('Authoring Space Settings')); + my %userenv = &Apache::lonnet::get('environment',['nocodemirror']); my $constchecked=''; if ($env{'environment.nocodemirror'}) { $constchecked=' checked="checked"'; @@ -2156,6 +2088,7 @@ END my $text=&mt('By default, CodeMirror an editor with advanced functionality for editing code is activated for authors.'); my $cmoff=&mt('Deactivate CodeMirror. This can improve performance on slow computers and accessibility.'); my $change=&mt('Save'); + my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\''); $r->print(< @@ -2165,7 +2098,6 @@ END ENDSCREEN - } } } @@ -2175,8 +2107,6 @@ sub change_authoring_settings { my $domain = $env{'user.domain'}; my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']); if (keys(%author_roles) > 0) { - my $message; - if (0) { my %ausettings=('environment.nocodemirror' => ''); if ($env{'form.cmoff'}) { $ausettings{'environment.nocodemirror'}='yes'; } &Apache::lonnet::put('environment',\%ausettings); @@ -2187,138 +2117,16 @@ sub change_authoring_settings { } else { $status=&mt('off'); } - $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&mt('Deactivate CodeMirror in Authoring Space').'',''.$status.'')); + my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&mt('Deactivate CodeMirror in Authoring Space').'',''.$status.'')); $message=&Apache::loncommon::confirmwrapper($message); - } else { - my @items = ('nocodemirror','copyright','sourceavail'); - my %oldsettings = &Apache::lonnet::get('environment',\@items); - my %domdefs = &Apache::lonnet::get_domain_defaults($domain); - my %lt = &authoring_settings_text(); - my %titles = &authoring_settings_titles(); - my ($result,%newsettings,%changes,@delete,@unchanged,@delerrors,@adderrors); - foreach my $item (@items) { - if ($env{'form.'.$item} eq 'dom') { - if ($oldsettings{$item} eq '') { - push(@unchanged,$item); - } else { - push(@delete,$item); - } - } elsif ($env{'form.'.$item} eq 'user') { - my $newval = $env{'form.userchoice_'.$item}; - my @possibles; - if ($item eq 'nocodemirror') { - if ($newval =~ /^yes|no$/) { - $newsettings{$item} = $newval; - } - } elsif ($item eq 'copyright') { - @possibles = (grep !/^priv|custom$/,(&Apache::loncommon::copyrightids)); - if (grep(/^\Q$newval\E$/,@possibles)) { - $newsettings{$item} = $newval; - } - } elsif ($item eq 'sourceavail') { - @possibles = (&Apache::loncommon::source_copyrightids); - if (grep(/^\Q$newval\E$/,@possibles)) { - $newsettings{$item} = $newval; - } - } - if ($oldsettings{$item} eq $newsettings{$item}) { - push(@unchanged,$item); - } else { - $changes{$item} = $newsettings{$item}; - } - } - } - if (@delete) { - if (&Apache::lonnet::del('environment',\@delete) eq 'ok') { - foreach my $key (@delete) { - &Apache::lonnet::delenv('environment.'.$key); - } - } else { - @delerrors = @delete; - } - } - if (keys(%changes)) { - if (&Apache::lonnet::put('environment',\%changes) eq 'ok') { - my %newenvhash; - map {$newenvhash{'environment.'.$_} = $changes{$_}; } (keys(%changes)); - &Apache::lonnet::appenv(\%newenvhash); - } else { - foreach my $item (@items) { - if (exists($changes{$item})) { - push(@adderrors,$item); - } - } - } - } - if (@adderrors) { - $result = &mt('An error occurred when saving user-specific settings for').': '. - join(', ', map { $titles{$_} } @adderrors); - $message = &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result,1)); - } elsif (keys(%changes)) { - $result = &mt('User-specific settings saved:').''; - $message = &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result)); - } - if (@delerrors) { - $result = &mt('An error occurred when deleting user-specific settings for').':'; - $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result,1)); - } elsif (@delete) { - $result = &mt('Set use of domain default for').':'; - $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result)); - } - if (@unchanged) { - $result = &mt('No changes made for').':'; - $message .= &Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($result)); + if ($env{'form.returnurl'}) { + &do_redirect($r,$env{'form.returnurl'},$message); + } else { + &print_main_menu($r,$message); } - } - if ($env{'form.returnurl'}) { - &do_redirect($r,$env{'form.returnurl'},$message); - } else { - &print_main_menu($r,$message); - } } } -sub authoring_settings_text { - return &Apache::lonlocal::texthash( - 'auss' => 'Authoring Space Settings', - 'used' => 'Use domain default', - 'usyo' => 'Use your own user-specific setting', - 'curd' => 'Current domain default is', - 'ousv' => 'Own user-specific value', - 'save' => 'Save', - 'yes' => 'Deactivated', - 'no' => 'Activated', - ); -} - -sub authoring_settings_titles { - return &Apache::lonlocal::texthash( - 'nocodemirror' => 'CodeMirror for EditXML editor', - 'copyright' => 'Default Copyright/Distribution in new metadata file', - 'sourceavail' => 'Default Source Available in new metadata file', - ); -} - sub lockednameschanger { my $r = shift; my %userenv = &Apache::lonnet::get('environment',['lockedname']); @@ -2415,9 +2223,39 @@ sub timezonechanger { my $uname = $env{'user.name'}; my $udom = $env{'user.domain'}; if (&Apache::lonnet::usertools_access($uname,$udom,'timezone')) { - my $js = &toggle_options_js(); + my $js = <<"ENDSCRIPT"; + +ENDSCRIPT my %loaditems = ( - onload => "javascript:toggleOptions(document.prefs,'settimezone','LC_timezone_selector');", + onload => 'javascript:toggleTZdisplay(document.prefs);', ); my $args = { 'add_entries' => \%loaditems }; &Apache::lonhtmlcommon::add_breadcrumb( @@ -2440,7 +2278,7 @@ sub timezonechanger { $checked{'lctz'} = ' checked="checked"'; $tzsty = 'none'; } - my $onclick = ' onclick="javascript:toggleOptions(this.form,'."'settimezone','LC_timezone_selector'".');"'; + my $onclick = ' onclick="javascript:toggleTZdisplay(this.form);"'; my $selector = &Apache::loncommon::select_timezone('timezone',$timezone,undef,1); $r->print(<<"END");
@@ -2511,8 +2349,6 @@ if (&Apache::lonnet::usertools_access($u if (&Apache::lonnet::usertools_access($user,$domain,'timezone')) { $permissions{'timezone'} = 'F'; } -my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']); -my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']); my @menu= ({ categorytitle=>'Personal Data', items =>[ @@ -2601,33 +2437,6 @@ my @menu= }, ] }, - ); -if (keys(%author_coauthor_roles) > 0) { - push(@menu, - { categorytitle=>'Authoring Settings', - items => [ - { - linktext => 'Authoring Space Configuration', - url => '/adm/preferences?action=authorsettings', - permission => 'F', - icon => 'codemirror.png', - linktitle => 'Settings for your authoring space.', - }, - ] - }, - ); - if (keys(%author_roles) > 0) { - push(@{ $menu[4]->{items} }, { - linktext => 'Restrict Domain Coordinator Access', - url => '/adm/preferences?action=changedomcoord', - permission => 'F', - #help => '', - icon => 'system-lock-screen.png', - linktitle => 'Restrict domain coordinator access.', - }); - } -} -push(@menu, { categorytitle=>'Other', items =>[ { linktext => 'Register Response Devices ("Clickers")', @@ -2642,7 +2451,7 @@ push(@menu, ); if ($currentauth =~ /^(unix|internal):/) { - push(@{ $menu[0]->{items} }, { +push(@{ $menu[0]->{items} }, { linktext => 'Password', url => '/adm/preferences?action=changepass', permission => 'F', @@ -2651,25 +2460,6 @@ push(@menu, linktitle => 'Change your password.', }); } - if ($env{'environment.remote'} eq 'off') { - push(@{ $menu[1]->{items} }, { - linktext => 'Launch Remote Control', - url => '/adm/remote?url=/adm/preferences&action=launch', - permission => 'F', - #help => '', - icon => 'remotecontrol.png', - linktitle => 'Launch the remote control for LON-CAPA.', - }); - }else{ -push(@{ $menu[1]->{items} }, { - linktext => 'Collapse Remote Control', - url => '/adm/remote?url=/adm/preferences&action=collapse', - permission => 'F', - #help => '', - icon => 'remotecontrol.png', - linktitle => 'Collapse the remote control for LON-CAPA.', - }); - } if (&can_toggle_namelocking()) { push(@{ $menu[0]->{items} }, { @@ -2682,10 +2472,22 @@ push(@{ $menu[1]->{items} }, { }); } + my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au']); + if (keys(%author_roles) > 0) { +push(@{ $menu[4]->{items} }, { + linktext => 'Restrict Domain Coordinator Access', + url => '/adm/preferences?action=changedomcoord', + permission => 'F', + #help => '', + icon => 'system-lock-screen.png', + linktitle => 'Restrict domain coordinator access.', + }); + } + if (&Apache::lonnet::allowed('whn',$env{'request.course.id'}) || &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/' .$env{'request.course.sec'})) { -push(@{ $menu[-1]->{items} }, { +push(@{ $menu[4]->{items} }, { linktext => 'Course Initialization', url => '/adm/preferences?action=changecourseinit', permission => 'F', @@ -2696,8 +2498,19 @@ push(@{ $menu[-1]->{items} }, { } + my %author_coauthor_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']); + if (keys(%author_coauthor_roles) > 0) { + push(@{ $menu[4]->{items} }, { + linktext => 'Authoring Space Configuration', + url => '/adm/preferences?action=authorsettings', + permission => 'F', + icon => 'codemirror.png', + linktitle => 'Settings for your authoring space.', + }); + } + if (&can_toggle_debug()) { -push(@{ $menu[-1]->{items} }, { +push(@{ $menu[4]->{items} }, { linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'), url => '/adm/preferences?action=debugtoggle', permission => 'F', @@ -2759,8 +2572,8 @@ sub handler { text => $brtxt, help => $brhelp,}); if(!exists $env{'form.action'}) { - &print_main_menu($r); - $ended = 1; + &print_main_menu($r); + $ended = 1; }elsif($env{'form.action'} eq 'changepass'){ &passwordchanger($r); }elsif($env{'form.action'} eq 'verify_and_change_pass'){ @@ -2929,66 +2742,13 @@ sub updateable_userinfo { sub do_redirect { my ($r,$url,$msg) = @_; $r->print( - &Apache::loncommon::start_page('Loading ...',undef, - {'redirect' => [2,$url]}). + &Apache::loncommon::start_page('Switching Server ...',undef, + {'redirect' => [0.5,$url]}). '
'."\n". "$msg\n". &Apache::loncommon::end_page()); return; } -sub toggle_options_js { - return <<"ENDSCRIPT"; - -ENDSCRIPT -} - -sub selectbox { - my ($name,$value,$readonly,$functionref,@idlist)=@_; - my $selout = ''; - return $selout; -} - 1; __END__