--- loncom/interface/lonpreferences.pm 2014/02/15 18:20:42 1.196.4.14 +++ loncom/interface/lonpreferences.pm 2016/01/27 01:43:01 1.196.4.17 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.196.4.14 2014/02/15 18:20:42 raeburn Exp $ +# $Id: lonpreferences.pm,v 1.196.4.17 2016/01/27 01:43:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -183,6 +183,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.', 'jsmath' => 'jsMath:', 'tth' => 'tth (TeX to HTML):', 'mimetex' => 'mimetex (Convert to Images):', @@ -219,10 +220,10 @@ $lt{'exmpl'}
-MathJax provides rendered equations whose source code can be extracted in TeX and MathML formats by right clicking the equation. +$lt{'mathjaxinfo'}
- +
- +
ENDLSCREEN if ($env{'environment.texengine'} ne 'jsMath') { @@ -788,7 +789,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.=''.$blocktext.'
'); + return; + } if ((!defined($caller)) || ($caller eq 'preferences')) { $user = $env{'user.name'}; $domain = $env{'user.domain'}; @@ -1490,6 +1497,12 @@ sub server_form { sub verify_and_change_password { 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'};