--- loncom/interface/lonpreferences.pm	2004/11/19 20:17:52	1.50
+++ loncom/interface/lonpreferences.pm	2005/02/17 08:29:43	1.53
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Preferences
 #
-# $Id: lonpreferences.pm,v 1.50 2004/11/19 20:17:52 albertel Exp $
+# $Id: lonpreferences.pm,v 1.53 2005/02/17 08:29:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -567,7 +567,8 @@ sub passwordchanger {
     $lkey_npass2= hex($lkey_npass2);
     # Output javascript to deal with passwords
     # Output DES javascript
-    $r->print("<html><head>");
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html."<head>");
     {
 	my $include = $r->dir_config('lonIncludes');
 	my $jsh=Apache::File->new($include."/londes.js");
@@ -581,22 +582,22 @@ 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();
     }
 
 </script>
@@ -607,7 +608,7 @@ $errormessage
      ensure that unencrypted passwords will not be sent out by a
      crappy browser -->
 
-<form name="server" 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="" />
@@ -648,8 +649,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(<<ENDHEADER);
-<html>
+$html
 <head>
 <title>LON-CAPA Preferences:  Change password for $user</title>
 </head>
@@ -1047,14 +1049,15 @@ sub handler {
                       }));
 
 
-    if ($ENV{'user.name'} =~ /^(albertel|koretemey|korte|hallmat3|turtle)$/) {
+    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(<<ENDHEADER);
-<html>
+$html
 <head>
 <title>LON-CAPA Preferences</title>
 </head>
@@ -1082,7 +1085,7 @@ ENDHEADER
     if (($printmenu eq 'yes') && (!$ENV{'form.returnurl'})) {
         my $optionlist = '<table cellpadding="5">';
         if ($ENV{'user.name'} =~ 
-                         /^(albertel|kortemey|korte|hallmat3|turtle)$/
+                         /^(albertel|kortemey|fox|foxr|korte|hallmat3|turtle)$/
             ) {
             push (@Options,({ action => 'debugtoggle',
                               linktext => 'Toggle Debug Messages',
