--- loncom/interface/lonpreferences.pm 2004/02/21 01:31:04 1.35 +++ loncom/interface/lonpreferences.pm 2005/02/28 19:08:11 1.57 @@ -1,7 +1,7 @@ # The LearningOnline Network # Preferences # -# $Id: lonpreferences.pm,v 1.35 2004/02/21 01:31:04 matthew Exp $ +# $Id: lonpreferences.pm,v 1.57 2005/02/28 19:08:11 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,18 +25,6 @@ # # http://www.lon-capa.org/ # -# (Internal Server Error Handler -# -# (Login Screen -# 5/21/99,5/22,5/25,5/26,5/31,6/2,6/10,7/12,7/14, -# 1/14/00,5/29,5/30,6/1,6/29,7/1,11/9 Gerd Kortemeyer) -# -# 3/1/1 Gerd Kortemeyer) -# -# 3/1 Gerd Kortemeyer -# -# 2/13/02 2/14 2/15 Matthew Hall -# # This package uses the "londes.js" javascript code. # # TODOs that have to be completed: @@ -63,7 +51,7 @@ use Apache::lonlocal; ################################################## sub des_keys { # Make a new key for DES encryption. - # Each key has two parts which are returned seperately. + # Each key has two parts which are returned separately. # Please note: Each key must be passed through the &hex function # before it is output to the web browser. The hex versions cannot # be used to decrypt. @@ -104,6 +92,41 @@ sub des_decrypt { ################################################################ # Language Change Subroutines # ################################################################ + +sub wysiwygchanger { + my $r = shift; + my %userenv = &Apache::lonnet::get + ('environment',['wysiwygeditor']); + my $offselect=''; + my $onselect='checked="1"'; + if ($userenv{'wysiwygeditor'}) { + $onselect=''; + $offselect='checked="1"'; + } + my $switchoff=&mt('Disable WYSIWYG editor'); + my $switchon=&mt('Enable WYSIWYG editor'); + $r->print(< + +
+ $switchoff
+ $switchon +ENDLSCREEN + $r->print('
'); +} + + +sub verify_and_change_wysiwyg { + my $r = shift; + my $newsetting=$ENV{'form.wysiwyg'}; + &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting}); + &Apache::lonnet::appenv('environment.wysiwygeditor' => $newsetting); + $r->print('

'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'

'); +} + +################################################################ +# Language Change Subroutines # +################################################################ sub languagechanger { my $r = shift; my $user = $ENV{'user.name'}; @@ -154,6 +177,179 @@ $message ENDVCSCREEN } +################################################################ +# Tex Engine Change Subroutines # +################################################################ +sub texenginechanger { + my $r = shift; + my $user = $ENV{'user.name'}; + my $domain = $ENV{'user.domain'}; + my %userenv = &Apache::lonnet::get('environment',['texengine']); + my $texengine=$userenv{'texengine'}; + + my $pref=&mt('Preferred method to display Math'); + my %mathchoices=('' => 'No Preference', + 'tth' => 'TeX to HTML', + 'ttm' => 'TeX to MathML', + 'jsMath' => 'jsMath', + 'mimetex' => 'Convert to Images' + ); + my $selectionbox=&Apache::loncommon::select_form($texengine,'texengine', + %mathchoices); + my $mathexample='$$\int\left(\frac{a+b}{c^6*d}\right)$$'; + my $jsMath_example=&Apache::lontexconvert::jsMath_converted(\$mathexample); + $mathexample='$$\int\left(\frac{a+b}{c^6*d}\right)$$'; + my $tth_example=&Apache::lontexconvert::tth_converted(\$mathexample); + $mathexample='$$\int\left(\frac{a+b}{c^6*d}\right)$$'; + my $mimetex_example=&Apache::lontexconvert::mimetex_converted(\$mathexample); + my $change=&mt('Change'); + $r->print(< + +

$pref: $selectionbox

+

+ +Examples: +

TeX to HTML
$tth_example

+ + +

jsMath
+ + + +$jsMath_example

+

Convert to Images
$mimetex_example

+ENDLSCREEN + if ($ENV{'environment.texengine'} ne 'jsMath') { + $r->print(''); + } +} + + +sub verify_and_change_texengine { + my $r = shift; + my $user = $ENV{'user.name'}; + my $domain = $ENV{'user.domain'}; +# Screenname + my $newtexengine = $ENV{'form.texengine'}; + $newtexengine=~s/[^\-\w]//g; + if ($newtexengine eq 'ttm') { + &Apache::lonnet::appenv('browser.mathml' => 1); + } else { + if ($ENV{'environment.texengine'} eq 'ttm') { + &Apache::lonnet::appenv('browser.mathml' => 0); + } + } + my $message=''; + if ($newtexengine) { + &Apache::lonnet::put('environment',{'texengine' => $newtexengine}); + &Apache::lonnet::appenv('environment.texengine' => $newtexengine); + $message='Set new preferred math display to '.$newtexengine; + } else { + &Apache::lonnet::del('environment',['texengine']); + &Apache::lonnet::delenv('environment\.texengine'); + $message='Reset preferred math display.'; + } + + + $r->print(< +$message +ENDVCSCREEN +} + +################################################################ +# Roles Page Preference Change Subroutines # +################################################################ +sub rolesprefchanger { + my $r = shift; + my $user = $ENV{'user.name'}; + my $domain = $ENV{'user.domain'}; + my %userenv = &Apache::lonnet::get + ('environment',['recentroles','recentrolesn']); + my $hotlist_flag=$userenv{'recentroles'}; + my $hotlist_n=$userenv{'recentrolesn'}; + my $checked; + if ($hotlist_flag) { + $checked = 'checked="checked"'; + } + + if (!$hotlist_n) { $hotlist_n=3; } + my $options; + for (my $i=1; $i<10; $i++) { + my $select; + if ($hotlist_n == $i) { $select = 'selected="selected"'; } + $options .= "\n"; + } + + $r->print(<Some LON-CAPA users have a long list of roles. The Recent Roles Hotlist +feature keeps track of the last N roles which have been +visited and places a table of these at the top of the roles page. +People with very few roles should leave this feature disabled. +

+ +
+ +
Enable Recent Roles Hotlist: + +
Number of roles in Hotlist: + +
+ +
+ENDSCREEN +} + +sub verify_and_change_rolespref { + my $r = shift; + my $user = $ENV{'user.name'}; + my $domain = $ENV{'user.domain'}; +# Recent Roles Hotlist Flag + my $hotlist_flag = $ENV{'form.recentroles'}; + my $hotlist_n = $ENV{'form.recentrolesn'}; + my $message=''; + if ($hotlist_flag) { + &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag}); + &Apache::lonnet::appenv('environment.recentroles' => $hotlist_flag); + $message='Recent Roles Hotlist is Enabled'; + } else { + &Apache::lonnet::del('environment',['recentroles']); + &Apache::lonnet::delenv('environment\.recentroles'); + $message='Recent Roles Hotlist is Disabled'; + } + if ($hotlist_n) { + &Apache::lonnet::put('environment',{'recentrolesn' => $hotlist_n}); + &Apache::lonnet::appenv('environment.recentrolesn' => $hotlist_n); + if ($hotlist_flag) { + $message.="
Display $hotlist_n Most Recent Roles\n"; + } + } + + $r->print(< +$message +ENDRPSCREEN +} + + ################################################################ # Anonymous Discussion Name Change Subroutines # @@ -467,7 +663,8 @@ sub passwordchanger { $lkey_npass2= hex($lkey_npass2); # Output javascript to deal with passwords # Output DES javascript - $r->print(""); + my $html=&Apache::lonxml::xmlbegin(); + $r->print($html.""); { my $include = $r->dir_config('lonIncludes'); my $jsh=Apache::File->new($include."/londes.js"); @@ -481,33 +678,33 @@ sub passwordchanger { lextkey=this.document.client.elements.lkey_cpass.value; initkeys(); - this.document.server.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.server.elements.newpass_1.value + this.document.pserver.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.server.elements.newpass_2.value + this.document.pserver.elements.newpass_2.value =crypted(this.document.client.elements.newpass_2.value); - this.document.server.submit(); + this.document.pserver.submit(); } $errormessage

- -

+ @@ -548,8 +745,9 @@ sub verify_and_change_password { # Check for authentication types that allow changing of the password. return if ($currentauth !~ /^(unix|internal):/); # + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html LON-CAPA Preferences: Change password for $user @@ -638,6 +836,149 @@ ENDERROR return; } +################################################################ +# discussion display subroutines +################################################################ +sub discussionchanger { + my $r = shift; + my $user = $ENV{'user.name'}; + my $domain = $ENV{'user.domain'}; + my %userenv = &Apache::lonnet::get + ('environment',['discdisplay','discmarkread']); + my $discdisp = 'allposts'; + my $discmark = 'onmark'; + + if (defined($userenv{'discdisplay'})) { + unless ($userenv{'discdisplay'} eq '') { + $discdisp = $userenv{'discdisplay'}; + } + } + if (defined($userenv{'discmarkread'})) { + unless ($userenv{'discdisplay'} eq '') { + $discmark = $userenv{'discmarkread'}; + } + } + + my $newdisp = 'unread'; + my $newmark = 'ondisp'; + + my $function = &Apache::loncommon::get_users_function(); + my $color = &Apache::loncommon::designparm($function.'.tabbg', + $ENV{'user.domain'}); + my %lt = &Apache::lonlocal::texthash( + 'pref' => 'Display Preference', + 'curr' => 'Current setting ', + 'actn' => 'Action', + 'sdpf' => 'Set display preferences for discussion posts for both bulletin boards and individual resources in all your courses.', + 'prca' => 'Preferences can be set that determine', + 'whpo' => 'Which posts are displayed when you display a bulletin board or resource, and', + 'unwh' => 'Under what circumstances posts are identfied as "New"', + 'allposts' => 'All posts', + 'unread' => 'New posts only', + 'ondisp' => 'Once displayed', + 'onmark' => 'Once marked as read', + 'disa' => 'Posts displayed?', + 'npmr' => 'New posts cease to be identified as "New"?', + 'thde' => 'The preferences you set here can be overridden within each individual discussion.', + 'chgt' => 'Change to ' + ); + my $dispchange = $lt{'unread'}; + my $markchange = $lt{'ondisp'}; + my $currdisp = $lt{'allposts'}; + my $currmark = $lt{'onmark'}; + + if ($discdisp eq 'unread') { + $dispchange = $lt{'allposts'}; + $currdisp = $lt{'unread'}; + $newdisp = 'allposts'; + } + + if ($discmark eq 'ondisp') { + $markchange = $lt{'onmark'}; + $currmark = $lt{'ondisp'}; + $newmark = 'onmark'; + } + + $r->print(<<"END"); + + +
+$lt{'sdpf'}
$lt{'prca'}
  1. $lt{'whpo'}
  2. $lt{'unwh'}
+
+
+ + + + +
+ + + + +
+ + + + + + + + + + + + + + + +
$lt{'pref'}$lt{'curr'}$lt{'actn'}?
$lt{'disa'}$lt{$discdisp} $lt{'chgt'} "$dispchange"
$lt{'npmr'}$lt{$discmark} $lt{'chgt'} "$markchange"
+
+
+
+
+ +
+
+Note: $lt{'thde'} + +END +} + +sub verify_and_change_discussion { + my $r = shift; + my $user = $ENV{'user.name'}; + my $domain = $ENV{'user.domain'}; + my $message=''; + if (defined($ENV{'form.discdisp'}) ) { + my $newdisp = $ENV{'form.newdisp'}; + if ($newdisp eq 'unread') { + $message .='In discussions: only new posts will be displayed.
'; + &Apache::lonnet::put('environment',{'discdisplay' => $newdisp}); + &Apache::lonnet::appenv('environment.discdisplay' => $newdisp); + } else { + $message .= 'In discussions: all posts will be displayed.
'; + &Apache::lonnet::del('environment',['discdisplay']); + &Apache::lonnet::delenv('environment\.discdisplay'); + } + } + if (defined($ENV{'form.discmark'}) ) { + my $newmark = $ENV{'form.newmark'}; + if ($newmark eq 'ondisp') { + $message.='In discussions: new posts will be cease to be identified as "new" after display.
'; + &Apache::lonnet::put('environment',{'discmarkread' => $newmark}); + &Apache::lonnet::appenv('environment.discmarkread' => $newmark); + } else { + $message.='In discussions: posts will be identified as "new" until marked as read by the reader.
'; + &Apache::lonnet::del('environment',['discmarkread']); + &Apache::lonnet::delenv('environment\.discmarkread'); + } + } + $r->print(< +$message +ENDVCSCREEN +} + ###################################################### # other handler subroutines # ###################################################### @@ -656,7 +997,7 @@ sub handler { return OK if $r->header_only; # &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['action']); + ['action','wysiwyg','returnurl']); # &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb @@ -668,7 +1009,7 @@ sub handler { my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain); if ($currentauth =~ /^(unix|internal):/) { push (@Options,({ action => 'changepass', - linktext => 'Change password', + linktext => 'Change Password', href => '/adm/preferences', help => 'Change_Password', subroutine => \&passwordchanger, @@ -702,8 +1043,7 @@ sub handler { })); push (@Options,({ action => 'changemsgforward', - linktext => 'Change Message Forwarding', - text => 'and Notification Addresses', + linktext => 'Change Message Forwarding and Notification Addresses', href => '/adm/preferences', help => 'Prefs_Forwarding', breadcrumb => @@ -721,7 +1061,8 @@ sub handler { '/adm/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/aboutme'; push (@Options,{ action => 'none', linktext => - q{Edit the 'About Me' personal information screen}, + q{Edit the 'About Me' Personal Information Screen}, + help => 'Prefs_About_Me', href => $aboutmeaction}); push (@Options,({ action => 'changecolors', linktext => 'Change Color Scheme', @@ -740,8 +1081,9 @@ sub handler { subroutine => \&verify_and_change_colors, })); push (@Options,({ action => 'changelanguages', - linktext => 'Change Language Prefences', + linktext => 'Change Language Preferences', href => '/adm/preferences', + help => 'Prefs_Language', breadcrumb=> { href => '/adm/preferences?action=changelanguages', text => 'Change Language'}, @@ -754,41 +1096,108 @@ sub handler { printmenu => 'yes', subroutine=>\&verify_and_change_languages, } )); - if ($ENV{'user.name'} =~ /^(albertel|koretemey|korte|hallmat3|turtle)$/) { + push (@Options,({ action => 'changewysiwyg', + linktext => 'Change WYSIWYG Editor Preferences', + href => '/adm/preferences', + breadcrumb => + { href => '/adm/preferences?action=changewysiwyg', + text => 'Change WYSIWYG Preferences'}, + subroutine => \&wysiwygchanger, + }, + { action => 'set_wysiwyg', + breadcrumb => + { href => '/adm/preferences?action=changewysiwyg', + text => 'Change WYSIWYG Preferences'}, + printmenu => 'yes', + subroutine => \&verify_and_change_wysiwyg, } + )); + push (@Options,({ action => 'changediscussions', + linktext => 'Change Discussion Display Preferences', + href => '/adm/preferences', + help => 'Change_Discussion_Display', + breadcrumb => + { href => '/adm/preferences?action=changediscussions', + text => 'Change Discussion Preferences'}, + subroutine => \&discussionchanger, + }, + { action => 'verify_and_change_discussion', + breadcrumb => + { href => '/adm/preferences?action=changediscussions', + text => 'Change Discussion Preferences'}, + printmenu => 'yes', + subroutine => \&verify_and_change_discussion, } + )); + + push (@Options,({ action => 'changerolespref', + linktext => 'Change Roles Page Preferences', + href => '/adm/preferences', + subroutine => \&rolesprefchanger, + breadcrumb => + { href => '/adm/preferences?action=changerolespref', + text => 'Change Roles Pref'}, + }, + { action => 'verify_and_change_rolespref', + subroutine => \&verify_and_change_rolespref, + breadcrumb => + { href => '/adm/preferences?action=changerolespref', + text => 'Change Roles Preferences'}, + printmenu => 'yes', + })); + + push (@Options,({ action => 'changetexenginepref', + linktext => 'Change How Math Equations Are Displayed', + href => '/adm/preferences', + subroutine => \&texenginechanger, + breadcrumb => + { href => '/adm/preferences?action=changetexenginepref', + text => 'Change Math Pref'}, + }, + { action => 'verify_and_change_texengine', + subroutine => \&verify_and_change_texengine, + breadcrumb => + { href => '/adm/preferences?action=changetexenginepref', + text => 'Change Math Preferences'}, + printmenu => 'yes', + })); + + + if ($ENV{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle)$/) { push (@Options,({ action => 'debugtoggle', printmenu => 'yes', subroutine => \&toggle_debug, })); } + my $html=&Apache::lonxml::xmlbegin(); $r->print(< +$html LON-CAPA Preferences ENDHEADER my $call = undef; + my $help = undef; my $printmenu = 'yes'; foreach my $option (@Options) { if ($option->{'action'} eq $ENV{'form.action'}) { - &Apache::lonnet::logthis('got action '.$option->{'action'}); $call = $option->{'subroutine'}; $printmenu = $option->{'printmenu'}; if (exists($option->{'breadcrumb'})) { &Apache::lonhtmlcommon::add_breadcrumb ($option->{'breadcrumb'}); } + $help=$option->{'help'}; } } $r->print(&Apache::loncommon::bodytag('Change Preferences')); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (undef,'Change Preferences')); + (undef,'Change Preferences',$help)); if (defined($call)) { $call->($r); } - if ($printmenu eq 'yes') { + if (($printmenu eq 'yes') && (!$ENV{'form.returnurl'})) { my $optionlist = ''; if ($ENV{'user.name'} =~ - /^(albertel|koretemey|korte|hallmat3|turtle)$/ + /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle)$/ ) { push (@Options,({ action => 'debugtoggle', linktext => 'Toggle Debug Messages', @@ -805,10 +1214,10 @@ ENDHEADER $optiontext .= ''. - $option->{'linktext'}.''; + &mt($option->{'linktext'}).''; } if (exists($option->{'text'})) { - $optiontext .= ' '.$option->{'text'}; + $optiontext .= ' '.&mt($option->{'text'}); } if ($optiontext ne '') { $optiontext = ''.$optiontext.''; @@ -825,11 +1234,11 @@ ENDHEADER } $optionlist .= '
'; $r->print($optionlist); + } elsif ($ENV{'form.returnurl'}) { + $r->print('
'. + &mt('Return').''); } - $r->print(< - -ENDFOOTER + $r->print(&Apache::loncommon::endbodytag().''); return OK; }