--- loncom/interface/lonsupportreq.pm	2006/03/23 22:01:57	1.31
+++ loncom/interface/lonsupportreq.pm	2006/05/30 12:46:09	1.35
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.31 2006/03/23 22:01:57 albertel Exp $
+# $Id: lonsupportreq.pm,v 1.35 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,10 @@ use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::lonacc();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 sub handler {
     my ($r) = @_;
@@ -46,10 +50,10 @@ sub handler {
     }
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['origurl','function']);
     if ($r->uri eq '/adm/helpdesk') {
-        &Apache::loncommon::get_posted_cgi($r);
+        &Apache::lonacc::get_posted_cgi($r);
     }
     my $function = $env{'form.function'};
-    my $origurl = &Apache::lonnet::unescape($env{'form.origurl'});
+    my $origurl = &unescape($env{'form.origurl'});
     my $action = $env{'form.action'};
 
     if ($action eq 'process') {
@@ -197,12 +201,14 @@ function initialize_codes() {
 	
     my $js = '<script type"text/javascript">'."\n$scripttag\n$jscript\n".
 	'</script>';
-    my $add_entries =
-	'topmargin="0" marginheight="0" onLoad="initialize_codes()"',
+    my %add_entries = (topmargin    => "0",
+		       marginheight => "0",
+		       onLoad       =>"initialize_codes()",);
+
     my $start_page =
 	&Apache::loncommon::start_page('Support Request',$js,
 				       { 'function'    => $function,
-					 'add_entries' => $add_entries,
+					 'add_entries' => \%add_entries,
 					 'only_body'   => 1,});
     $r->print($start_page);
 
@@ -643,7 +649,6 @@ sub print_request_receipt {
     my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');
     my @cookievars = ('lonID');
 
-    my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0"',1);
     my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};
     my $to =  $Apache::lonnet::perlvar{'lonSupportEMail'};
     my $from = $admin;
@@ -694,12 +699,18 @@ Date/Time: $reporttime
 <font color="$fontcolor">URL: </font><font color="$vlinkcolor">$env{'form.sourceurl'}</font><br />
 <font color="$fontcolor">Date/Time: </font><font color="$vlinkcolor">$reporttime</font><br />
     |;
-    my $html=&Apache::lonxml::xmlbegin();
-    my $head = &Apache::loncommon::head('LON-CAPA support request recorded');
+
+    my $start_page = 
+	&Apache::loncommon::start_page('Support request recorded',undef,
+				       {'function'    => $function,
+					'add_entries' => {
+					    topmargin    => "0",
+					    marginheight => "0",
+					},
+					'only_body'   => 1,});
+
     $r->print(<<"END");
-$html
-$head
-$bodytag
+$start_page
 <form name="logproblem">
 <input type="hidden" name="action" value="result" />
 </form>
@@ -968,7 +979,7 @@ sub retrieve_instcodes {
     my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.');
     foreach my $course (keys %courses) {
         if ($courses{$course} =~ m/^[^:]*:([^:]+)/) {
-            $$coursecodes{$course} = &Apache::lonnet::unescape($1);
+            $$coursecodes{$course} = &unescape($1);
             $totcodes ++;
         }
     }