--- loncom/interface/lonsupportreq.pm	2006/04/10 21:40:09	1.33
+++ loncom/interface/lonsupportreq.pm	2006/09/01 21:07:11	1.37
@@ -1,5 +1,5 @@
 #
-# $Id: lonsupportreq.pm,v 1.33 2006/04/10 21:40:09 albertel Exp $
+# $Id: lonsupportreq.pm,v 1.37 2006/09/01 21:07:11 raeburn 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') {
@@ -972,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 ++;
         }
     }
@@ -1100,9 +1105,9 @@ sub sort_cats {
     my ($num,$cat_order,$codetitles,$idsarrayref,$sorted) = @_;
     my @unsorted = @{$idsarrayref};
     if (defined($$cat_order{$$codetitles[$num]})) {
-        foreach (@{$$cat_order{$$codetitles[$num]}}) {
-            if (grep/^$_$/,@unsorted) {
-                push @{$sorted}, $_;
+        foreach my $item (@{$$cat_order{$$codetitles[$num]}}) {
+            if (grep/^\Q$item\E$/,@unsorted) {
+                push @{$sorted}, $item;
             }
         }
     } else {