--- loncom/interface/lonpreferences.pm 2018/09/03 14:03:03 1.196.4.24 +++ loncom/interface/lonpreferences.pm 2014/02/12 20:29:36 1.211 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.196.4.24 2018/09/03 14:03:03 raeburn Exp $ +# $Id: lonpreferences.pm,v 1.211 2014/02/12 20:29:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -160,14 +160,12 @@ sub texenginechanger { my $domain = $env{'user.domain'}; my %userenv = &Apache::lonnet::get('environment',['texengine']); my $texengine=$userenv{'texengine'}; - if (lc($texengine) eq 'jsmath') { - $texengine = 'MathJax'; - } my %mathchoices=('' => 'Default', 'tth' => 'tth (TeX to HTML)', #'ttm' => 'TeX to MathML', - 'MathJax' => 'MathJax', + 'jsMath' => 'jsMath', + 'MathJax' => 'MathJax', 'mimetex' => 'mimetex (Convert to Images)', 'raw' => 'Raw (Screen Reader)' ); @@ -178,17 +176,33 @@ sub texenginechanger { 'texengine', \%mathchoices); my $MathJax_start=&Apache::lontexconvert::MathJax_header(); + my $jsMath_start=&Apache::lontexconvert::jsMath_header(); my %lt=&Apache::lonlocal::texthash( 'headline' => 'Change how math is displayed', 'preftxt' => 'Preferred method to display math', '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.', + 'jsmath' => 'jsMath:', 'tth' => 'tth (TeX to HTML):', 'mimetex' => 'mimetex (Convert to Images):', ); + my $jsMathWarning='

' + .'

' + .&mt("It looks like you don't have the TeX math fonts installed.") + .'
' + .'
' + .&mt('The jsMath example on this page may not look right without them. ' + .'The [_1]jsMath Home Page[_2] has information on how to download the ' + .'needed fonts. In the meantime, jsMath will do the best it can ' + .'with the fonts you have, but it may not be pretty and some equations ' + .'may not be rendered correctly.' + ,'' + ,'') + .'
' + .'

'; + $r->print(<$lt{'headline'}
@@ -205,22 +219,37 @@ $lt{'exmpl'}

$lt{'mathjax'}

- +

-$lt{'mathjaxinfo'} +MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation. +

+ +

$lt{'jsmath'}

+

+$jsMath_start + +

$lt{'mimetex'}

- +

$lt{'tth'}

- +

ENDLSCREEN + if ($env{'environment.texengine'} ne 'jsMath') { + $r->print(''); + } } @@ -231,9 +260,6 @@ sub verify_and_change_texengine { # Screenname my $newtexengine = $env{'form.texengine'}; $newtexengine=~s/[^\-\w]//g; - if (lc($newtexengine) eq 'jsmath') { - $newtexengine = 'MathJax'; - } if ($newtexengine eq 'ttm') { &Apache::lonnet::appenv({'browser.mathml' => 1}); } else { @@ -282,7 +308,7 @@ sub rolesprefchanger { my $hotlist_n=$userenv{'recentrolesn'}; my ($checkedon,$checkedoff); if ($hotlist_flag) { - $checkedon = 'checked="checked"'; + $checkedon = 'checked="checked"'; } else { $checkedoff = 'checked="checked"'; } @@ -365,7 +391,7 @@ $options.' &Apache::lonhtmlcommon::row_closure(1). &Apache::lonhtmlcommon::end_pick_box().' '); - if ($roles_check_list) { + if ($roles_check_list) { $r->print('

'.&mt('Freeze Roles').'

'.&mt('The table below can be used to [_1]freeze[_2] '.$lc_role.'s in the Hotlist.','','').'
'. @@ -722,10 +748,8 @@ sub domcoordchanger { my $text=&mt('By default, the Domain Coordinator can enter your Authoring Space.'); my $construction=&mt('Block access to Authoring Space'); my $change=&mt('Save'); - my $returnurl = &HTML::Entities::encode($env{'form.returnurl'},'"<>&\''); $r->print(< - $text

@@ -750,11 +774,7 @@ sub verify_and_change_domcoord { } my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&mt('Block access to Authoring Space').'',''.$status.'')); $message=&Apache::loncommon::confirmwrapper($message); - if ($env{'form.returnurl'}) { - &do_redirect($r,$env{'form.returnurl'},$message); - } else { - &print_main_menu($r,$message); - } + &print_main_menu($r,$message); } ################################################################# @@ -768,7 +788,7 @@ sub lockwarning { my $textbottom=&mt('Changing roles or logging out may result in data corruption.'); my ($num,%which)=&Apache::lonnet::get_locks(); my $which=''; - foreach my $id (keys(%which)) { + foreach my $id (keys %which) { $which.='

  • '.$which{$id}.'
    • '; } my $change=&mt('Override'); @@ -1145,10 +1165,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(); @@ -1198,11 +1218,11 @@ sub verify_and_change_colors { ); my $message=''; - foreach my $item (keys(%colortypes)) { + 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}); @@ -1241,12 +1261,6 @@ sub passwordchanger { $r->print(Apache::loncommon::start_page('Personal Data')); $r->print(Apache::lonhtmlcommon::breadcrumbs('Change Password')); } - my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('passwd'); - if ($blocked) { - $r->print('

    '.$blocktext.'

    '); - return; - } if ((!defined($caller)) || ($caller eq 'preferences')) { $user = $env{'user.name'}; $domain = $env{'user.domain'}; @@ -1259,7 +1273,7 @@ sub passwordchanger { $r->print( '

    ' .&mt('Sorry, the URL you provided to complete the reset of your password was invalid. Either the token included in the URL has been deleted or the URL you provided was invalid. Please submit a [_1]new request[_2] for a password reset, and follow the link to the new URL included in the e-mail that will be sent to you, to allow you to enter a new password.' - ,'','') + ,'','') .'

    ' ); return; @@ -1280,9 +1294,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; @@ -1303,9 +1317,9 @@ sub passwordchanger { return if ($currentauth !~ /^(unix|internal):/); # # Generate keys - my ($lkey_cpass ,$ukey_cpass ) = &Apache::loncommon::des_keys(); - my ($lkey_npass1,$ukey_npass1) = &Apache::loncommon::des_keys(); - my ($lkey_npass2,$ukey_npass2) = &Apache::loncommon::des_keys(); + my ($lkey_cpass ,$ukey_cpass ) = &des_keys(); + my ($lkey_npass1,$ukey_npass1) = &des_keys(); + my ($lkey_npass2,$ukey_npass2) = &des_keys(); # Store the keys in the log files my $lonhost = $r->dir_config('lonHostID'); my $logtoken=Apache::lonnet::reply('tmpput:' @@ -1353,18 +1367,21 @@ sub jscript_send { uextkey=this.document.client.elements.ukey_cpass.value; lextkey=this.document.client.elements.lkey_cpass.value; initkeys(); - this.document.pserver.elements.currentpass.value = - getCrypted(this.document.client.elements.currentpass.value); + + this.document.pserver.elements.currentpass.value + =crypted(this.document.client.elements.currentpass.value); + uextkey=this.document.client.elements.ukey_npass1.value; lextkey=this.document.client.elements.lkey_npass1.value; initkeys(); this.document.pserver.elements.newpass_1.value - =getCrypted(this.document.client.elements.newpass_1.value); + =crypted(this.document.client.elements.newpass_1.value); + uextkey=this.document.client.elements.ukey_npass2.value; lextkey=this.document.client.elements.lkey_npass2.value; initkeys(); this.document.pserver.elements.newpass_2.value - =getCrypted(this.document.client.elements.newpass_2.value); + =crypted(this.document.client.elements.newpass_2.value); |; if ($caller eq 'reset_by_email') { $output .= qq| @@ -1379,7 +1396,6 @@ sub jscript_send { $ output .= qq| this.document.pserver.submit(); } - |; } @@ -1399,19 +1415,13 @@ sub client_form { my $output = '' .&Apache::lonhtmlcommon::start_pick_box(); if ($caller eq 'reset_by_email') { - my $mobileargs; - (undef,undef,undef,undef,undef,undef,my $clientmobile) = - &Apache::loncommon::decode_user_agent(); - if ($clientmobile) { - $mobileargs = 'autocapitalize="off" autocorrect="off" '; - } $output .= &Apache::lonhtmlcommon::row_title( '') - .'' + .'' .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title( '') - .'' + .'' .'' .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title( @@ -1421,16 +1431,16 @@ sub client_form { } else { $output .= &Apache::lonhtmlcommon::row_title( '') - .'' + .'' .&Apache::lonhtmlcommon::row_closure(); } $output .= &Apache::lonhtmlcommon::row_title( '') - .'' + .'' .&Apache::lonhtmlcommon::row_closure() .&Apache::lonhtmlcommon::row_title( '') - .'' + .'' .&Apache::lonhtmlcommon::row_closure(1) .&Apache::lonhtmlcommon::end_pick_box(); $output .= '

    ' @@ -1477,14 +1487,8 @@ sub server_form { } sub verify_and_change_password { - my ($r,$caller,$mailtoken,$ended) = @_; + my ($r,$caller,$mailtoken) = @_; my ($user,$domain,$homeserver); - my ($blocked,$blocktext) = - &Apache::loncommon::blocking_status('passwd'); - if ($blocked) { - $r->print('

    '.$blocktext.'

    '); - return; - } if ($caller eq 'reset_by_email') { $user = $env{'form.uname'}; $domain = $env{'form.udom'}; @@ -1622,9 +1626,6 @@ ENDERROR $r->print($message.'
    '); } else { &print_main_menu($r, $message); - if (ref($ended)) { - $$ended = 1; - } } } else { # error error: run in circles, scream and shout @@ -1639,9 +1640,6 @@ ENDERROR &mt("The password for user [_1] was not changed.",''.$user.'').' '.&mt('Please make sure your old password was entered correctly.'),1); $message=&Apache::loncommon::confirmwrapper($message); &print_main_menu($r, $message); - if (ref($ended)) { - $$ended = 1; - } } } return; @@ -1877,64 +1875,6 @@ sub verify_and_change_coursepage { &print_main_menu($r,$message); } -sub author_space_settings { - my $r = shift; - &Apache::lonhtmlcommon::add_breadcrumb( - { href => '/adm/preferences?action=authorsettings', - text => 'Authoring Space Settings'}); - my $user = $env{'user.name'}; - my $domain = $env{'user.domain'}; - my %author_roles = &Apache::lonnet::get_my_roles($user,$domain,'userroles','',['au','ca','aa']); - if (keys(%author_roles) > 0) { - $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"'; - } - 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(< - - - $text
    -
    - - -ENDSCREEN - } -} - -sub change_authoring_settings { - my $r = shift; - my $user = $env{'user.name'}; - 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 %ausettings=('environment.nocodemirror' => ''); - if ($env{'form.cmoff'}) { $ausettings{'environment.nocodemirror'}='yes'; } - &Apache::lonnet::put('environment',\%ausettings); - &Apache::lonnet::appenv({'environment.nocodemirror' => $ausettings{'environment.nocodemirror'}}); - my $status=''; - if ($ausettings{'environment.nocodemirror'} eq 'yes') { - $status=&mt('on'); - } else { - $status=&mt('off'); - } - my $message=&Apache::lonhtmlcommon::confirm_success(&mt('Set [_1] to [_2]',''.&mt('Deactivate CodeMirror in Authoring Space').'',''.$status.'')); - $message=&Apache::loncommon::confirmwrapper($message); - if ($env{'form.returnurl'}) { - &do_redirect($r,$env{'form.returnurl'},$message); - } else { - &print_main_menu($r,$message); - } - } -} - sub lockednameschanger { my $r = shift; &Apache::lonhtmlcommon::add_breadcrumb( @@ -2139,25 +2079,6 @@ push(@{ $menu[0]->{items} }, { 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} }, { @@ -2195,18 +2116,6 @@ push(@{ $menu[4]->{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[4]->{items} }, { linktext => 'Toggle Debug Messages (Currently '.($env{'user.debug'} ? 'on)' : 'off)'), @@ -2244,26 +2153,14 @@ sub handler { ['action','wysiwyg','returnurl','refpage']); # Apache::lonhtmlcommon::clear_breadcrumbs(); - my ($brlink,$brtxt,$brhelp,$ended); + my ($brlink,$brtxt,$brhelp); if (($env{'form.action'} eq 'changerolespref') && ($env{'form.returnurl'} eq '/adm/roles')) { $brlink ='/adm/roles'; $brtxt = 'User Roles'; - } elsif ((($env{'form.action'} eq 'changedomcoord') || - ($env{'form.action'} eq 'authorsettings')) && - (($env{'form.returnurl'} =~ m{^/(priv/|res($|/))}) || - ($env{'form.returnurl'} eq '/adm/createuser'))) { - $brlink = $env{'form.returnurl'}; - if ($env{'form.returnurl'} eq '/adm/createuser') { - $brtxt = 'User Management'; - } elsif ($env{'form.returnurl'} =~ m{^/res($\/)}) { - $brtxt = 'Browse published resources'; - } else { - $brtxt = 'Authoring Space'; - } } else { $brlink ='/adm/preferences'; $brtxt = 'Set User Preferences'; - $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display'; + $brhelp = 'Prefs_About_Me,Prefs_Language,Prefs_Screen_Name_Nickname,Change_Colors,Change_Password,Prefs_Messages,Change_Discussion_Display'; } Apache::lonhtmlcommon::add_breadcrumb ({href => $brlink, @@ -2271,16 +2168,14 @@ sub handler { help => $brhelp,}); if(!exists $env{'form.action'}) { &print_main_menu($r); - $ended = 1; }elsif($env{'form.action'} eq 'changepass'){ &passwordchanger($r); }elsif($env{'form.action'} eq 'verify_and_change_pass'){ - &verify_and_change_password($r,'preferences','',\$ended); + &verify_and_change_password($r); }elsif($env{'form.action'} eq 'changescreenname'){ &screennamechanger($r); }elsif($env{'form.action'} eq 'verify_and_change_screenname'){ &verify_and_change_screenname($r); - $ended = 1; }elsif($env{'form.action'} eq 'changemsgforward'){ &msgforwardchanger($r); }elsif($env{'form.action'} eq 'verify_and_change_msgforward'){ @@ -2289,47 +2184,38 @@ sub handler { &colorschanger($r); }elsif($env{'form.action'} eq 'verify_and_change_colors'){ &verify_and_change_colors($r); - $ended = 1; }elsif($env{'form.action'} eq 'changelanguages'){ &languagechanger($r); }elsif($env{'form.action'} eq 'verify_and_change_languages'){ &verify_and_change_languages($r); - $ended = 1; }elsif($env{'form.action'} eq 'changewysiwyg'){ &wysiwygchanger($r); }elsif($env{'form.action'} eq 'set_wysiwyg'){ &verify_and_change_wysiwyg($r); - $ended = 1; }elsif($env{'form.action'} eq 'changediscussions'){ &discussionchanger($r); }elsif($env{'form.action'} eq 'verify_and_change_discussion'){ &verify_and_change_discussion($r); - $ended = 1; }elsif($env{'form.action'} eq 'changerolespref'){ &rolesprefchanger($r); }elsif($env{'form.action'} eq 'verify_and_change_rolespref'){ &verify_and_change_rolespref($r); - $ended = 1; }elsif($env{'form.action'} eq 'changetexenginepref'){ &texenginechanger($r); }elsif($env{'form.action'} eq 'verify_and_change_texengine'){ &verify_and_change_texengine($r); - $ended = 1; }elsif($env{'form.action'} eq 'changeicons'){ &iconchanger($r); }elsif($env{'form.action'} eq 'verify_and_change_icons'){ &verify_and_change_icons($r); - $ended = 1; }elsif($env{'form.action'} eq 'changeclicker'){ &clickerchanger($r); }elsif($env{'form.action'} eq 'verify_and_change_clicker'){ &verify_and_change_clicker($r); - $ended = 1; }elsif($env{'form.action'} eq 'changedomcoord'){ &domcoordchanger($r); }elsif($env{'form.action'} eq 'verify_and_change_domcoord'){ &verify_and_change_domcoord($r); - $ended = 1; }elsif($env{'form.action'} eq 'lockwarning'){ &lockwarning($r); }elsif($env{'form.action'} eq 'verify_and_change_locks'){ @@ -2338,29 +2224,22 @@ sub handler { &coursedisplaychanger($r); }elsif($env{'form.action'} eq 'verify_and_change_coursepage'){ &verify_and_change_coursepage($r); - $ended = 1; - }elsif($env{'form.action'} eq 'authorsettings'){ - &author_space_settings($r); - }elsif($env{'form.action'} eq 'change_authoring_settings'){ - &change_authoring_settings($r); - $ended = 1; }elsif($env{'form.action'} eq 'debugtoggle'){ if (&can_toggle_debug()) { &toggle_debug(); } &print_main_menu($r); - $ended = 1; } elsif ($env{'form.action'} eq 'changelockednames') { &lockednameschanger($r); } elsif ($env{'form.action'} eq 'verify_and_change_lockednames') { &verify_and_change_lockednames($r); - $ended = 1; } # Properly end the HTML page of all preference pages # started in each sub routine # Exception: print_main_menu has its own end_page call - unless ($ended) { + unless (!exists $env{'form.action'} || + $env{'form.action'} eq 'debugtoggle') { $r->print(&Apache::loncommon::end_page()); } @@ -2433,16 +2312,5 @@ sub updateable_userinfo { return %updateable; } -sub do_redirect { - my ($r,$url,$msg) = @_; - $r->print( - &Apache::loncommon::start_page('Switching Server ...',undef, - {'redirect' => [0.5,$url]}). - '
    '."\n". - "$msg\n". - &Apache::loncommon::end_page()); - return; -} - 1; __END__