--- loncom/interface/lonsupportreq.pm	2006/04/13 19:07:11	1.34
+++ loncom/interface/lonsupportreq.pm	2006/07/11 15:37:59	1.36
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.34 2006/04/13 19:07:11 albertel Exp $
+# $Id: lonsupportreq.pm,v 1.36 2006/07/11 15:37:59 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,9 @@ use Apache::loncommon();
 use Apache::lonnet;
 use Apache::lonlocal;
 use Apache::lonacc();
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 sub handler {
     my ($r) = @_;
@@ -50,7 +53,7 @@ sub handler {
         &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') {
@@ -973,10 +976,11 @@ Please review the information in "Log-in
 
 sub retrieve_instcodes {
     my ($coursecodes,$codedom,$totcodes) = @_;
-    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.');
+    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.',
+                                                undef,undef,'Course');
     foreach my $course (keys %courses) {
         if ($courses{$course} =~ m/^[^:]*:([^:]+)/) {
-            $$coursecodes{$course} = &Apache::lonnet::unescape($1);
+            $$coursecodes{$course} = &unescape($1);
             $totcodes ++;
         }
     }