--- loncom/interface/lonpreferences.pm	2005/03/22 17:15:22	1.58
+++ loncom/interface/lonpreferences.pm	2005/08/16 16:31:09	1.67
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.58 2005/03/22 17:15:22 matthew Exp $
+# $Id: lonpreferences.pm,v 1.67 2005/08/16 16:31:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use DynaLoader; # for Crypt::DES version
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
 use Apache::lonlocal;
+use Apache::lonnet;
 
 #
 # Write lonnet::passwd to do the call below.
@@ -109,8 +110,8 @@ sub wysiwygchanger {
 <form name="server" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="set_wysiwyg" />
 <br />
-<input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff<br />
-<input type="radio" name="wysiwyg" value="on" $offselect /> $switchon
+<label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
+<label><input type="radio" name="wysiwyg" value="on" $offselect /> $switchon</label>
 ENDLSCREEN
     $r->print('<br /><input type="submit" value="'.&mt('Change').'" />');
 }
@@ -118,7 +119,7 @@ ENDLSCREEN
 
 sub verify_and_change_wysiwyg {
     my $r = shift;
-    my $newsetting=$ENV{'form.wysiwyg'};
+    my $newsetting=$env{'form.wysiwyg'};
     &Apache::lonnet::put('environment',{'wysiwygeditor' => $newsetting});
     &Apache::lonnet::appenv('environment.wysiwygeditor' => $newsetting);
     $r->print('<p>'.&mt('Setting WYSIWYG editor to:').' '.&mt($newsetting).'</p>');
@@ -129,8 +130,8 @@ sub verify_and_change_wysiwyg {
 ################################################################
 sub languagechanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['languages']);
     my $language=$userenv{'languages'};
@@ -156,10 +157,10 @@ ENDLSCREEN
 
 sub verify_and_change_languages {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
 # Screenname
-    my $newlanguage  = $ENV{'form.language'};
+    my $newlanguage  = $env{'form.language'};
     $newlanguage=~s/[^\-\w]//g;
     my $message='';
     if ($newlanguage) {
@@ -181,39 +182,36 @@ ENDVCSCREEN
 ################################################################
 sub texenginechanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    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',
+		     #'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 $jsMath_start=&Apache::lontexconvert::jsMath_header();
     my $change=&mt('Change');
     $r->print(<<ENDLSCREEN);
+<br />
+
 <form name="server" action="/adm/preferences" method="post">
 <input type="hidden" name="action" value="verify_and_change_texengine" />
 <p>$pref: $selectionbox</p>
 <p><input type="submit" value="$change" /></p>
 </form>
 Examples:
-<p> TeX to HTML <br /> $tth_example</p>
-<script type="text/javascript">function NoFontMessage () { }</script>
-<script src="/adm/jsMath/jsMath.js"></script>
+<p> TeX to HTML <br /> 
+<iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=tth" width="400" hieght="200"></iframe>
+</p>
 <p>jsMath <br /> 
-
+$jsMath_start
 <script type="text/javascript">
 if (jsMath.nofonts == 1) {
     document.writeln
@@ -230,11 +228,15 @@ if (jsMath.nofonts == 1) {
 	 +'</font></small></div></center>');
 }
 </script>
+<iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=jsMath" width="400" hieght="200"></iframe>
 
-$jsMath_example</p>
-<p> Convert to Images <br /> $mimetex_example</p>
+</p>
+<p> Convert to Images <br />
+<br />
+<iframe src="/res/adm/pages/math_example.tex?buttons=no&mode=mimetex" width="400" hieght="200"></iframe>
+</p>
 ENDLSCREEN
-    if ($ENV{'environment.texengine'} ne 'jsMath') {
+    if ($env{'environment.texengine'} ne 'jsMath') {
 	$r->print('<script type="text/javascript">jsMath.Process()</script>');
     }
 }
@@ -242,15 +244,15 @@ ENDLSCREEN
 
 sub verify_and_change_texengine {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
 # Screenname
-    my $newtexengine  = $ENV{'form.texengine'};
+    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') {
+	if ($env{'environment.texengine'} eq 'ttm') {
 	    &Apache::lonnet::appenv('browser.mathml' => 0);
 	}
     }
@@ -276,8 +278,8 @@ ENDVCSCREEN
 ################################################################
 sub rolesprefchanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['recentroles','recentrolesn']);
     my $hotlist_flag=$userenv{'recentroles'};
@@ -318,11 +320,11 @@ ENDSCREEN
 
 sub verify_and_change_rolespref {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    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 $hotlist_flag  = $env{'form.recentroles'};
+    my $hotlist_n  = $env{'form.recentrolesn'};
     my $message='';
     if ($hotlist_flag) {
         &Apache::lonnet::put('environment',{'recentroles' => $hotlist_flag});
@@ -353,8 +355,8 @@ ENDRPSCREEN
 ################################################################
 sub screennamechanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['screenname','nickname']);
     my $screenname=$userenv{'screenname'};
@@ -373,10 +375,10 @@ ENDSCREEN
 
 sub verify_and_change_screenname {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
 # Screenname
-    my $newscreen  = $ENV{'form.screenname'};
+    my $newscreen  = $env{'form.screenname'};
     $newscreen=~s/[^ \w]//g;
     my $message='';
     if ($newscreen) {
@@ -390,7 +392,7 @@ sub verify_and_change_screenname {
     }
 # Nickname
     $message.='<br />';
-    $newscreen  = $ENV{'form.nickname'};
+    $newscreen  = $env{'form.nickname'};
     $newscreen=~s/[^ \w]//g;
     if ($newscreen) {
         &Apache::lonnet::put('environment',{'nickname' => $newscreen});
@@ -413,8 +415,8 @@ ENDVCSCREEN
 
 sub msgforwardchanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get('environment',['msgforward','notification','critnotification']);
     my $msgforward=$userenv{'msgforward'};
     my $notification=$userenv{'notification'};
@@ -443,11 +445,11 @@ ENDMSG
 
 sub verify_and_change_msgforward {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my $newscreen  = '';
     my $message='';
-    foreach (split(/\,/,$ENV{'form.msgforward'})) {
+    foreach (split(/\,/,$env{'form.msgforward'})) {
 	my ($msuser,$msdomain)=split(/[\@\:]/,$_);
         $msuser=~s/\W//g;
         $msdomain=~s/\W//g;
@@ -469,7 +471,7 @@ sub verify_and_change_msgforward {
         &Apache::lonnet::delenv('environment\.msgforward');
         $message.='Reset message forwarding<br />';
     }
-    my $notification=$ENV{'form.notification'};
+    my $notification=$env{'form.notification'};
     $notification=~s/\s//gs;
     if ($notification) {
         &Apache::lonnet::put('environment',{'notification' => $notification});
@@ -480,7 +482,7 @@ sub verify_and_change_msgforward {
         &Apache::lonnet::delenv('environment\.notification');
         $message.='Reset message notification<br />';
     }
-    my $critnotification=$ENV{'form.critnotification'};
+    my $critnotification=$env{'form.critnotification'};
     $critnotification=~s/\s//gs;
     if ($critnotification) {
         &Apache::lonnet::put('environment',{'critnotification' => $critnotification});
@@ -504,13 +506,13 @@ sub colorschanger {
     my $r = shift;
 # figure out colors
     my $function='student';
-    if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
 	$function='coordinator';
     }
-    if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
 	$function='admin';
     }
-    if (($ENV{'request.role'}=~/^(au|ca)/) ||
+    if (($env{'request.role'}=~/^(au|ca)/) ||
 	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
 	$function='author';
     }
@@ -580,13 +582,13 @@ sub verify_and_change_colors {
     my $r = shift;
 # figure out colors
     my $function='student';
-    if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
 	$function='coordinator';
     }
-    if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
 	$function='admin';
     }
-    if (($ENV{'request.role'}=~/^(au|ca)/) ||
+    if (($env{'request.role'}=~/^(au|ca)/) ||
 	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
 	$function='author';
     }
@@ -601,9 +603,9 @@ sub verify_and_change_colors {
 
     my $message='';
     foreach my $item (keys %colortypes) {
-        my $color=$ENV{'form.'.$item};
+        my $color=$env{'form.'.$item};
         my $entry='color.'.$function.'.'.$item;
-	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$ENV{'form.resetall'})) {
+	if (($color=~/^\#[0-9A-Fa-f]{6}$/) && (!$env{'form.resetall'})) {
 	    &Apache::lonnet::put('environment',{$entry => $color});
 	    &Apache::lonnet::appenv('environment.'.$entry => $color);
 	    $message.='Set '.$colortypes{$item}.' to '.$color.'<br />';
@@ -630,9 +632,9 @@ sub passwordchanger {
     my $r = shift;
     my $errormessage = shift;
     $errormessage = ($errormessage || '');
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
-    my $homeserver = $ENV{'user.home'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my $homeserver = $env{'user.home'};
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
     # Check for authentication types that allow changing of the password.
     return if ($currentauth !~ /^(unix|internal):/);
@@ -732,9 +734,9 @@ ENDFORM
 
 sub verify_and_change_password {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
-    my $homeserver = $ENV{'user.home'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my $homeserver = $env{'user.home'};
     my $currentauth=&Apache::lonnet::queryauthenticate($user,$domain);
     # Check for authentication types that allow changing of the password.
     return if ($currentauth !~ /^(unix|internal):/);
@@ -747,10 +749,10 @@ $html
 </head>
 ENDHEADER
     #
-    my $currentpass = $ENV{'form.currentpass'}; 
-    my $newpass1    = $ENV{'form.newpass_1'}; 
-    my $newpass2    = $ENV{'form.newpass_2'};
-    my $logtoken    = $ENV{'form.logtoken'};
+    my $currentpass = $env{'form.currentpass'}; 
+    my $newpass1    = $env{'form.newpass_1'}; 
+    my $newpass2    = $env{'form.newpass_2'};
+    my $logtoken    = $env{'form.logtoken'};
     # Check for empty data 
     unless (defined($currentpass) && 
 	    defined($newpass1)    && 
@@ -835,8 +837,8 @@ ENDERROR
 ################################################################
 sub discussionchanger {
     my $r = shift;
-    my $user       = $ENV{'user.name'};
-    my $domain     = $ENV{'user.domain'};
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
     my %userenv = &Apache::lonnet::get
         ('environment',['discdisplay','discmarkread']);
     my $discdisp = 'allposts';
@@ -858,7 +860,7 @@ sub discussionchanger {
 
     my $function = &Apache::loncommon::get_users_function();
     my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $ENV{'user.domain'});
+                                                    $env{'user.domain'});
     my %lt = &Apache::lonlocal::texthash(
         'pref' => 'Display Preference',
         'curr' => 'Current setting ',
@@ -940,11 +942,11 @@ END
                                                                                                                 
 sub verify_and_change_discussion {
     my $r = shift;
-    my $user     = $ENV{'user.name'};
-    my $domain   = $ENV{'user.domain'};
+    my $user     = $env{'user.name'};
+    my $domain   = $env{'user.domain'};
     my $message='';
-    if (defined($ENV{'form.discdisp'}) ) {
-        my $newdisp  = $ENV{'form.newdisp'};
+    if (defined($env{'form.discdisp'}) ) {
+        my $newdisp  = $env{'form.newdisp'};
         if ($newdisp eq 'unread') {
             $message .='In discussions: only new posts will be displayed.<br/>';
             &Apache::lonnet::put('environment',{'discdisplay' => $newdisp});
@@ -955,8 +957,8 @@ sub verify_and_change_discussion {
             &Apache::lonnet::delenv('environment\.discdisplay');
         }
     }
-    if (defined($ENV{'form.discmark'}) ) {
-        my $newmark = $ENV{'form.newmark'};
+    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.<br/>';
             &Apache::lonnet::put('environment',{'discmarkread' => $newmark});
@@ -972,6 +974,73 @@ $message
 ENDVCSCREEN
 }
 
+################################################################
+# Subroutines for page display on course access (Course Coordinators)
+################################################################
+sub coursedisplaychanger {
+    my $r = shift;
+    my $user       = $env{'user.name'};
+    my $domain     = $env{'user.domain'};
+    my %userenv = &Apache::lonnet::get('environment',['course_init_display']);
+
+    my $firstselect='checked="checked"';
+    my $whatsnewselect='';
+    if ($userenv{'course_init_display'} ne 'firstres') {
+        $firstselect='';
+        $whatsnewselect='checked="checked"';
+    }
+    my $whatsnew_off=&mt('Display the first resource in the course.');
+    my $whatsnew_on=&mt('Display a summary of items in the course which require action from the course coordinator.');
+
+    $r->print('<br /><b>'.&mt('Set the page to be displayed when you select the role of Course Coordinator').':</b>');
+    $r->print(<<ENDLSCREEN);
+<form name="server" action="/adm/preferences" method="post">
+<input type="hidden" name="action" value="verify_and_change_coursepage" />
+<label><input type="radio" name="newdisp" value="firstres" $firstselect /> $whatsnew_off</label><br />
+<label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label>
+ENDLSCREEN
+    $r->print('<br /><input type="submit" value="'.&mt('Change').'" />
+</form>');
+}
+
+sub verify_and_change_coursepage {
+    my $r = shift;
+    my $message='';
+    my %lt = &Apache::lonlocal::texthash(
+        'when' => 'Whenever you select the Course Coordinator role from the roles screen',
+        'ywbt' => 'you will be taken to the start of the course.',
+        'apwb' => 'a page will be displayed that lists items in the course that may require action from you.',
+        'gtts' => 'Go to the start of the course',
+        'dasp' => 'Display a summary page listing course action items', 
+    );
+    my $newdisp  = $env{'form.newdisp'};
+    if ($newdisp eq 'firstres') {
+        $message .= $lt{'when'}.', '.$lt{'ywbt'}.'<br/>';
+        &Apache::lonnet::put('environment',{'course_init_display' => $newdisp});
+        &Apache::lonnet::appenv('environment.course_init_display' => $newdisp);
+    } else {
+        $message .= $lt{'when'}.', '.$lt{'apwb'}.'<br/>';
+        &Apache::lonnet::del('environment',['course_init_display']);
+        &Apache::lonnet::delenv('environment\.course_init_display');
+    }
+    if (($env{'request.course.fn'}) && ($env{'request.course.id'})) {
+        if ($newdisp eq 'firstres') {
+            my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+            my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; 
+            my ($furl,$ferr)=
+                &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
+            $message .= '<br /><font size="+1"><a href="'.$furl.'">'.$lt{'gtts'}.' <i>'.&mt('now').'</i></a></font>';
+        } else {
+            $message .= '<br /><font size="+1"><a href="/adm/whatsnew">'.$lt{'dasp'}.'</a></font>';
+        }
+    }
+    $r->print(<<ENDVCSCREEN);
+$message
+<br /><br />
+ENDVCSCREEN
+}
+
+
 ######################################################
 #            other handler subroutines               #
 ######################################################
@@ -981,8 +1050,8 @@ ENDVCSCREEN
 ################################################################
 sub handler {
     my $r = shift;
-    my $user = $ENV{'user.name'};
-    my $domain = $ENV{'user.domain'};
+    my $user = $env{'user.name'};
+    my $domain = $env{'user.domain'};
     &Apache::loncommon::content_type($r,'text/html');
     # Some pages contain DES keys and should not be cached.
     &Apache::loncommon::no_cache($r);
@@ -1051,7 +1120,7 @@ sub handler {
                       printmenu => 'yes',
                       subroutine => \&verify_and_change_msgforward }));
     my $aboutmeaction=
-        '/adm/'.$ENV{'user.domain'}.'/'.$ENV{'user.name'}.'/aboutme';
+        '/adm/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/aboutme';
     push (@Options,{ action => 'none', 
                      linktext =>
                          q{Edit the 'About Me' Personal Information Screen},
@@ -1152,9 +1221,24 @@ sub handler {
                             text => 'Change Math Preferences'},
                       printmenu => 'yes',
                       }));
+    if($env{'request.role'} =~ /^cc\.\//) {
+        push (@Options,({ action => 'changecourseinit',
+                          linktext => 'Change Course Initialization Preference',
+                          href => '/adm/preferences',
+                          subroutine => \&coursedisplaychanger,
+                          breadcrumb =>
+                              { href => '/adm/preferences?action=changecourseinit',
+                                text => 'Change Course Init. Pref.'},
+                          },
+                        { action => 'verify_and_change_coursepage',
+                          breadcrumb =>
+                          { href => '/adm/preferences?action=changecourseinit',                               text => 'Change Course Initialization Preference'},
+                        printmenu => 'yes',
+                        subroutine => \&verify_and_change_coursepage,
+                       }));
+    }
 
-
-    if ($ENV{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle)$/) {
+    if ($env{'user.name'} =~ /^(albertel|fox|foxr|koretemey|korte|hallmat3|turtle|raeburn)$/) {
         push (@Options,({ action => 'debugtoggle',
                           printmenu => 'yes',
                           subroutine => \&toggle_debug,
@@ -1171,7 +1255,7 @@ ENDHEADER
     my $help = undef;
     my $printmenu = 'yes';
     foreach my $option (@Options) {
-        if ($option->{'action'} eq $ENV{'form.action'}) {
+        if ($option->{'action'} eq $env{'form.action'}) {
             $call = $option->{'subroutine'};
             $printmenu = $option->{'printmenu'};
             if (exists($option->{'breadcrumb'})) {
@@ -1187,15 +1271,15 @@ ENDHEADER
     if (defined($call)) {
         $call->($r);
     }
-    if (($printmenu eq 'yes') && (!$ENV{'form.returnurl'})) {
+    if (($printmenu eq 'yes') && (!$env{'form.returnurl'})) {
         my $optionlist = '<table cellpadding="5">';
-        if ($ENV{'user.name'} =~ 
-                         /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle)$/
+        if ($env{'user.name'} =~ 
+                         /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
             ) {
             push (@Options,({ action => 'debugtoggle',
                               linktext => 'Toggle Debug Messages',
                               text => 'Current Debug status is -'.
-                                  $ENV{'user.debug'}.'-.',
+                                  $env{'user.debug'}.'-.',
                               href => '/adm/preferences',
                               printmenu => 'yes',
                               subroutine => \&toggle_debug,
@@ -1227,8 +1311,8 @@ ENDHEADER
         }
         $optionlist .= '</table>';
         $r->print($optionlist);
-    } elsif ($ENV{'form.returnurl'}) {
-	$r->print('<br /><a href="'.$ENV{'form.returnurl'}.'"><font size="+1">'.
+    } elsif ($env{'form.returnurl'}) {
+	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
 		  &mt('Return').'</font></a>');
     }
     $r->print(&Apache::loncommon::endbodytag().'</html>');
@@ -1236,7 +1320,7 @@ ENDHEADER
 }
 
 sub toggle_debug {
-    if ($ENV{'user.debug'}) {
+    if ($env{'user.debug'}) {
         &Apache::lonnet::delenv('user\.debug');
     } else {
         &Apache::lonnet::appenv('user.debug' => 1);