--- loncom/interface/lonpreferences.pm	2005/07/05 15:25:34	1.66
+++ loncom/interface/lonpreferences.pm	2006/05/08 22:25:17	1.86
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.66 2005/07/05 15:25:34 albertel Exp $
+# $Id: lonpreferences.pm,v 1.86 2006/05/08 22:25:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,6 +33,7 @@
 package Apache::lonpreferences;
 
 use strict;
+use LONCAPA;
 use Apache::Constants qw(:common);
 use Apache::File;
 use Crypt::DES;
@@ -98,16 +99,16 @@ sub wysiwygchanger {
     my $r = shift;
     my %userenv = &Apache::lonnet::get
         ('environment',['wysiwygeditor']);
+    my $onselect='checked="checked"';
     my $offselect='';
-    my $onselect='checked="1"';
-    if ($userenv{'wysiwygeditor'}) {
+    if ($userenv{'wysiwygeditor'} eq 'on') {
 	$onselect='';
-	$offselect='checked="1"';
+	$offselect='checked="checked"';
     }
     my $switchoff=&mt('Disable WYSIWYG editor');
     my $switchon=&mt('Enable WYSIWYG editor');
     $r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="set_wysiwyg" />
 <br />
 <label><input type="radio" name="wysiwyg" value="off" $onselect /> $switchoff</label><br />
@@ -147,7 +148,7 @@ sub languagechanger {
     my $selectionbox=&Apache::loncommon::select_form($language,'language',
 						     %langchoices);
     $r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_languages" />
 <br />$pref: $selectionbox
 ENDLSCREEN
@@ -188,7 +189,7 @@ sub texenginechanger {
     my $texengine=$userenv{'texengine'};
 
     my $pref=&mt('Preferred method to display Math');
-    my %mathchoices=('' => 'No Preference',
+    my %mathchoices=('' => 'Default',
 		     'tth' => 'TeX to HTML',
 		     #'ttm' => 'TeX to MathML',
 		     'jsMath' => 'jsMath',
@@ -196,25 +197,22 @@ sub texenginechanger {
                      );
     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);
-<form name="server" action="/adm/preferences" method="post">
+<br />
+
+<form name="prefs" 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?inhibitmenu=yes&texengine=tth" width="400" hieght="200"></iframe>
+</p>
 <p>jsMath <br /> 
-
+$jsMath_start
 <script type="text/javascript">
 if (jsMath.nofonts == 1) {
     document.writeln
@@ -231,9 +229,13 @@ if (jsMath.nofonts == 1) {
 	 +'</font></small></div></center>');
 }
 </script>
+<iframe src="/res/adm/pages/math_example.tex?inhibitmenu=yes&texengine=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?inhibitmenu=yes&texengine=mimetex" width="400" hieght="200"></iframe>
+</p>
 ENDLSCREEN
     if ($env{'environment.texengine'} ne 'jsMath') {
 	$r->print('<script type="text/javascript">jsMath.Process()</script>');
@@ -303,10 +305,10 @@ visited and places a table of these at t
 People with very few roles should leave this feature disabled.
 </p>
 
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_rolespref" />
-<br />Enable Recent Roles Hotlist:
-<input type="checkbox" $checked name="recentroles" value="true" />
+<br /><label>Enable Recent Roles Hotlist:
+<input type="checkbox" $checked name="recentroles" value="true" /></label>
 <br />Number of roles in Hotlist:
 <select name="recentrolesn" size="1">
 $options
@@ -361,7 +363,7 @@ sub screennamechanger {
     my $screenname=$userenv{'screenname'};
     my $nickname=$userenv{'nickname'};
     $r->print(<<ENDSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_screenname" />
 <br />New screenname (shown if you post anonymously):
 <input type="text" size="20" value="$screenname" name="screenname" />
@@ -402,7 +404,7 @@ sub verify_and_change_screenname {
         &Apache::lonnet::delenv('environment\.nickname');
         $message.='Reset nickname';
     }
-
+    &Apache::lonnet::devalidate_cache_new('namescache',$user.':'.$domain);
     $r->print(<<ENDVCSCREEN);
 $message
 ENDVCSCREEN
@@ -429,7 +431,7 @@ sub msgforwardchanger {
 
     $r->print(<<ENDMSG);
 $forwardingHelp <br />
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_msgforward" />
 New Forwarding Address(es) (<tt>user:domain,user:domain,...</tt>):
 <input type="text" size="40" value="$msgforward" name="msgforward" /><hr />
@@ -504,17 +506,7 @@ ENDVCMSG
 sub colorschanger {
     my $r = shift;
 # figure out colors
-    my $function='student';
-    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
-	$function='coordinator';
-    }
-    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
-	$function='admin';
-    }
-    if (($env{'request.role'}=~/^(au|ca)/) ||
-	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
-	$function='author';
-    }
+    my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
     my %colortypes=('pgbg'  => 'Page Background',
                     'tabbg' => 'Header Background',
@@ -523,19 +515,23 @@ sub colorschanger {
                     'link'  => 'Un-Visited Link',
                     'vlink' => 'Visited Link',
                     'alink' => 'Active Link');
+    my $start_data_table = &Apache::loncommon::start_data_table();
     my $chtable='';
     foreach my $item (sort(keys(%colortypes))) {
        my $curcol=&Apache::loncommon::designparm($function.'.'.$item,$domain);
-       $chtable.='<tr><td>'.$colortypes{$item}.'</td><td bgcolor="'.$curcol.
+       $chtable.=&Apache::loncommon::start_data_table_row().
+	   '<td>'.$colortypes{$item}.'</td><td style="background: '.$curcol.
         '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><input name="'.$item.
         '" size="10" value="'.$curcol.
 '" /></td><td><a href="javascript:pjump('."'color_custom','".$colortypes{$item}.
 "','".$curcol."','"
-	    .$item."','parmform.pres','psub'".');">Select</a></td></tr>';
+	    .$item."','parmform.pres','psub'".');">Select</a></td>'.
+	    &Apache::loncommon::end_data_table_row()."\n";
     }
+    my $end_data_table = &Apache::loncommon::end_data_table();
     my $pjump_def = &Apache::lonhtmlcommon::pjump_javascript_definition();
     $r->print(<<ENDCOL);
-<script>
+<script type="text/javascript">
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -549,7 +545,7 @@ sub colorschanger {
         pclose();
         if (document.parmform.pres_marker.value!='') {
             if (document.parmform.pres_type.value!='') {
-                eval('document.server.'+
+                eval('document.prefs.'+
                      document.parmform.pres_marker.value+
 		     '.value=document.parmform.pres_value.value;');
 	    }
@@ -566,10 +562,11 @@ sub colorschanger {
 <input type="hidden" name="pres_type" />
 <input type="hidden" name="pres_value" />
 </form>
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_colors" />
-<table border="2">
+$start_data_table
 $chtable
+$end_data_table
 </table>
 <input type="submit" value="Change Custom Colors" />
 <input type="submit" name="resetall" value="Reset All Colors to Default" />
@@ -580,17 +577,7 @@ ENDCOL
 sub verify_and_change_colors {
     my $r = shift;
 # figure out colors
-    my $function='student';
-    if ($env{'request.role'}=~/^(cc|in|ta|ep)/) {
-	$function='coordinator';
-    }
-    if ($env{'request.role'}=~/^(su|dc|ad|li)/) {
-	$function='admin';
-    }
-    if (($env{'request.role'}=~/^(au|ca)/) ||
-	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
-	$function='author';
-    }
+    my $function=&Apache::loncommon::get_users_function();
     my $domain=&Apache::loncommon::determinedomain();
     my %colortypes=('pgbg'  => 'Page Background',
                     'tabbg' => 'Header Background',
@@ -614,9 +601,13 @@ sub verify_and_change_colors {
 	    $message.='Reset '.$colortypes{$item}.'<br />';
 	}
     }
+    my $now = time;
+    &Apache::lonnet::put('environment',{'color.timestamp' => $now});
+    &Apache::lonnet::appenv('environment.color.timestamp' => $now);
+
     $r->print(<<ENDVCCOL);
 $message
-<form name="client" action="/adm/preferences" method="post">
+<form name="client" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="changecolors" />
 </form>
 ENDVCCOL
@@ -658,8 +649,6 @@ sub passwordchanger {
     $lkey_npass2= hex($lkey_npass2);
     # Output javascript to deal with passwords
     # Output DES javascript
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print($html."<head>");
     {
 	my $include = $r->dir_config('lonIncludes');
 	my $jsh=Apache::File->new($include."/londes.js");
@@ -699,7 +688,7 @@ $errormessage
      ensure that unencrypted passwords will not be sent out by a
      crappy browser -->
 
-<form name="pserver" action="/adm/preferences" method="post">
+<form name="pserver" action="/adm/preferences" method="POST">
 <input type="hidden" name="logtoken"    value="$logtoken" />
 <input type="hidden" name="action"      value="verify_and_change_pass" />
 <input type="hidden" name="currentpass" value="" />
@@ -740,14 +729,6 @@ 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(<<ENDHEADER);
-$html
-<head>
-<title>LON-CAPA Preferences:  Change password for $user</title>
-</head>
-ENDHEADER
-    #
     my $currentpass = $env{'form.currentpass'}; 
     my $newpass1    = $env{'form.newpass_1'}; 
     my $newpass2    = $env{'form.newpass_2'};
@@ -772,7 +753,7 @@ password decryption.  Please log out and
 </p>
 ENDERROR
         # Probably should log an error here
-        return;
+        return 1;
     }
     my ($ckey,$n1key,$n2key)=split(/&/,$tmpinfo);
     # 
@@ -785,14 +766,14 @@ ENDERROR
 			 '<font color="#ff0000">ERROR:</font>'.
 			 'The new passwords you entered do not match.  '.
 			 'Please try again.');
-	return;
+	return 1;
     }
     if (length($newpass1) < 7) {
 	&passwordchanger($r,
 			 '<font color="#ff0000">ERROR:</font>'.
 			 'Passwords must be a minimum of 7 characters long.  '.
 			 'Please try again.');
-	return;
+	return 1;
     }
     #
     # Check for bad characters
@@ -827,6 +808,7 @@ ENDTEXT
 <h2><font color="#ff0000">The password for $user was not changed</font></h2>
 Please make sure your old password was entered correctly.
 ENDERROR
+        return 1;
     }
     return;
 }
@@ -895,40 +877,38 @@ sub discussionchanger {
     }
     
     $r->print(<<"END");
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_discussion" />
 <br />
 $lt{'sdpf'}<br/> $lt{'prca'}  <ol><li>$lt{'whpo'}</li><li>$lt{'unwh'}</li></ol> 
 <br />
 <br />
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$lt{'pref'}</b></td>
-        <td><b>$lt{'curr'}</b></td>
-        <td><b>$lt{'actn'}?</b></td>
+END
+    $r->print(&Apache::loncommon::start_data_table());
+    $r->print(<<"END");
+       <tr>
+        <th>$lt{'pref'}</th>
+        <th>$lt{'curr'}</th>
+        <th>$lt{'actn'}?</th>
        </tr>
-       <tr bgcolor="#dddddd">
+END
+    $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(<<"END");
        <td>$lt{'disa'}</td>
        <td>$lt{$discdisp}</td>
-       <td><input type="checkbox" name="discdisp" /><input type="hidden" name="newdisp" value="$newdisp" />&nbsp;$lt{'chgt'} "$dispchange"</td>
-      </tr><tr bgcolor="#eeeeee">
+       <td><label><input type="checkbox" name="discdisp" /><input type="hidden" name="newdisp" value="$newdisp" />&nbsp;$lt{'chgt'} "$dispchange"</label></td>
+END
+    $r->print(&Apache::loncommon::end_data_table_row().
+	      &Apache::loncommon::start_data_table_row());
+    $r->print(<<"END");
        <td>$lt{'npmr'}</td>
        <td>$lt{$discmark}</td>
-       <td><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</td>
+       <td><label><input type="checkbox" name="discmark" /><input type="hidden" name="newmark" value="$newmark" />&nbsp;$lt{'chgt'} "$markchange"</label></td>
       </tr>
-     </table>
-    </td>
-   </tr>
-  </table>
- </td>
-</tr>
-</table>
+END
+    $r->print(&Apache::loncommon::end_data_table_row().
+	      &Apache::loncommon::end_data_table());
+    $r->print(<<"END");
 <br />
 <br />
 <input type="submit" name="sub" value="Store Changes" />
@@ -981,24 +961,32 @@ sub coursedisplaychanger {
     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 $currvalue = 'whatsnew';
+    my $firstselect = '';
+    my $whatsnewselect = 'checked="checked"';
+    if (exists($userenv{'course_init_display'})) {
+        if ($userenv{'course_init_display'} eq 'firstres') {
+            $currvalue = 'firstres';
+            $firstselect = 'checked="checked"';
+	    $whatsnewselect = '';
+        }
     }
-    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.');
+    my %pagenames = (
+                       firstres => 'First resource',
+                       whatsnew => "What's new page",
+                    );
+    my $whatsnew_off=&mt('Display the [_1] in the course.','<b>first resource</b>');
+    my $whatsnew_on=&mt('Display the "[_1]" page - a summary of items in the course which require attention.',"<b>What's New</b>");
 
-    $r->print('<br /><b>'.&mt('Set the page to be displayed when you select the role of Course Coordinator').':</b>');
+    $r->print('<br /><b>'.&mt('Set the default page to be displayed when you select a course role').'</b>&nbsp;'.&mt('(Currently: [_1])',$pagenames{$currvalue}).'<br />'.&mt('The global user preference you set for your courses can be overridden in an individual course by setting a course specific setting via the "[_1]" page in the course',"<i>What's New</i>").'<br /><br />');
     $r->print(<<ENDLSCREEN);
-<form name="server" action="/adm/preferences" method="post">
+<form name="prefs" action="/adm/preferences" method="POST">
 <input type="hidden" name="action" value="verify_and_change_coursepage" />
+<br />
 <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>
+<label><input type="radio" name="newdisp" value="whatsnew" $whatsnewselect /> $whatsnew_on</label><input type="hidden" name="refpage" value="$env{'form.refpage'}" />
 ENDLSCREEN
-    $r->print('<br /><input type="submit" value="'.&mt('Change').'" />
+    $r->print('<br /><br /><input type="submit" value="'.&mt('Change').'" />
 </form>');
 }
 
@@ -1006,22 +994,25 @@ 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',
+        'defs' => 'Default now set',
+        'when' => 'when you select a course 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', 
+        'dasp' => "Display the What's New page listing course action items", 
     );
     my $newdisp  = $env{'form.newdisp'};
+    $message = '<b>'.$lt{'defs'}.'</b>: '.$lt{'when'}.', ';
     if ($newdisp eq 'firstres') {
-        $message .= $lt{'when'}.', '.$lt{'ywbt'}.'<br/>';
+        $message .= $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/>';
+        $message .= $lt{'apwb'}.'<br/>';
         &Apache::lonnet::del('environment',['course_init_display']);
         &Apache::lonnet::delenv('environment\.course_init_display');
     }
+    my $refpage = $env{'form.refpage'};
     if (($env{'request.course.fn'}) && ($env{'request.course.id'})) {
         if ($newdisp eq 'firstres') {
             my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -1030,7 +1021,8 @@ sub verify_and_change_coursepage {
                 &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>';
+            $message .= '<br /><font size="+1"><a href="/adm/whatsnew?refpage='.
+                        $refpage.'">'.$lt{'dasp'}.'</a></font>';
         }
     }
     $r->print(<<ENDVCSCREEN);
@@ -1058,7 +1050,7 @@ sub handler {
     return OK if $r->header_only;
     #
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-                                            ['action','wysiwyg','returnurl']);
+                                   ['action','wysiwyg','returnurl','refpage']);
     #
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -1083,7 +1075,7 @@ sub handler {
                           breadcrumb => 
                               { href =>'/adm/preferences?action=changepass',
                                 text => 'Change Password'},
-                          printmenu => 'yes',
+                          printmenu => 'not_on_error',
                           }));
     }
     push (@Options,({ action   => 'changescreenname',
@@ -1220,7 +1212,22 @@ sub handler {
                             text => 'Change Math Preferences'},
                       printmenu => 'yes',
                       }));
-    if($env{'request.role'} =~ /^cc\.\//) {
+
+    if ($env{'environment.remote'} eq 'off') {
+	push (@Options,({ action => 'launch',
+			  linktext => 'Launch Remote Control',
+			  href => '/adm/remote?url=/adm/preferences',
+		      }));
+    } else {
+	push (@Options,({ action => 'collapse',
+			  linktext => 'Collapse Remote Control',
+			  href => '/adm/remote?url=/adm/preferences',
+		      }));
+    }
+
+    if (&Apache::lonnet::allowed('whn',$env{'request.course.id'})
+	|| &Apache::lonnet::allowed('whn',$env{'request.course.id'}.'/'
+				    .$env{'request.course.sec'})) {
         push (@Options,({ action => 'changecourseinit',
                           linktext => 'Change Course Initialization Preference',
                           href => '/adm/preferences',
@@ -1243,13 +1250,9 @@ sub handler {
                           subroutine => \&toggle_debug,
                           }));
     }
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDHEADER);
-$html
-<head>
-<title>LON-CAPA Preferences</title>
-</head>
-ENDHEADER
+
+    $r->print(&Apache::loncommon::start_page('Change Preferences'));
+
     my $call = undef;
     my $help = undef;
     my $printmenu = 'yes';
@@ -1264,13 +1267,14 @@ ENDHEADER
 	    $help=$option->{'help'};
         }
     }
-    $r->print(&Apache::loncommon::bodytag('Change Preferences'));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs
-              (undef,'Change Preferences',$help));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Change Preferences',$help));
+    my $error;
     if (defined($call)) {
-        $call->($r);
+        $error = $call->($r);
     }
-    if (($printmenu eq 'yes') && (!$env{'form.returnurl'})) {
+    if ( ( ($printmenu eq 'yes')
+	   || ($printmenu eq 'not_on_error' && !$error) )
+	 && (!$env{'form.returnurl'})) {
         my $optionlist = '<table cellpadding="5">';
         if ($env{'user.name'} =~ 
                          /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle|raeburn)$/
@@ -1287,9 +1291,10 @@ ENDHEADER
         foreach my $option(@Options) {
             my $optiontext = '';
             if (exists($option->{'href'})) {
-                $optiontext .= 
-                    '<a href="'.$option->{'href'}.
-                    '?action='.$option->{'action'}.'">'.
+		$option->{'href_args'}{'action'}=$option->{'action'};
+		$optiontext .= 
+                    '<a href="'.&add_get_param($option->{'href'},
+					       $option->{'href_args'}).'">'.
                     &mt($option->{'linktext'}).'</a>';
             }
             if (exists($option->{'text'})) {
@@ -1314,7 +1319,7 @@ ENDHEADER
 	$r->print('<br /><a href="'.$env{'form.returnurl'}.'"><font size="+1">'.
 		  &mt('Return').'</font></a>');
     }
-    $r->print(&Apache::loncommon::endbodytag().'</html>');
+    $r->print(&Apache::loncommon::end_page());
     return OK;
 }