--- loncom/interface/lonhelpmenu.pm	2005/02/17 08:29:42	1.19
+++ loncom/interface/lonhelpmenu.pm	2005/04/07 06:56:23	1.20
@@ -31,6 +31,7 @@ use lib qw(/home/httpd/lib/perl);
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonlocal;
+use Apache::lonnet;
 
 sub handler {
     my ($r) = @_;
@@ -41,14 +42,14 @@ sub handler {
     if ($r->header_only) {
         return OK;
     }
-    my $color = $ENV{'form.color'};
-    my $faq = $ENV{'form.faq'};
-    my $bug = $ENV{'form.bug'};
-    my $topic = $ENV{'form.topic'};
-    my $function = $ENV{'form.function'};
-    my $component_help = $ENV{'form.component_help'};
-    my $origurl = $ENV{'form.origurl'};
-    my $stayOnPage = $ENV{'form.stayonpage'};
+    my $color = $env{'form.color'};
+    my $faq = $env{'form.faq'};
+    my $bug = $env{'form.bug'};
+    my $topic = $env{'form.topic'};
+    my $function = $env{'form.function'};
+    my $component_help = $env{'form.component_help'};
+    my $origurl = $env{'form.origurl'};
+    my $stayOnPage = $env{'form.stayonpage'};
     my $component_url = $component_help;
     if ($component_url) {
         $component_url = '/adm/help/'.$component_url.'.hlp';
@@ -60,9 +61,9 @@ sub handler {
     }
     my $faqbaseurl = $Apache::lonnet::perlvar{'FAQHost'};
     my $requestmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
-    if ($ENV{'form.page'} eq 'banner') {
+    if ($env{'form.page'} eq 'banner') {
         &display_help_banner($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail,$stayOnPage);
-    } elsif ($ENV{'form.page'} eq 'body') {
+    } elsif ($env{'form.page'} eq 'body') {
         &display_help_mainpage($r,$color,$function,$faq,$bug,$topic,$component_url,$origurl,$bugurl,$faqbaseurl,$requestmail);
     }
     return OK;
@@ -176,11 +177,11 @@ END
 	  <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
            <tr bgcolor="$tablecolor">
 END
-    if (($component_url) || ($ENV{'user.adv'})) {
+    if (($component_url) || ($env{'user.adv'})) {
         if ($component_url) {
             $r->print("
             <td align=\"center\"><b><a href=\"$component_url\" target=\"bodyframe\">");
-        } elsif ($ENV{'user.adv'}) {
+        } elsif ($env{'user.adv'}) {
             $r->print('<td align="center">&nbsp;<b><a href="/adm/help/nohelptopic.html" target="bodyframe">');
         }
         $r->print('
@@ -190,14 +191,14 @@ END
         $r->print('
             <td align="center">&nbsp;<b><a href="javascript:gohelpdesk()"><img src="'.$location.'/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;Ask helpdesk</a></b>&nbsp;</td>');
     }
-    if ($faq && $ENV{'user.adv'}) {
+    if ($faq && $env{'user.adv'}) {
         $r->print(<<END);
             <td align="center">
              &nbsp;<b><a href="$faqbaseurl/fom/cache/$faq.html" target="bodyframe"><img src="$location/lonMisc/smallFAQ.gif" border="0" alt="(FAQ)" valign="middle" />&nbsp;FAQ</a></b>&nbsp;
             </td>
 END
     }
-    if ($ENV{'user.adv'}) {
+    if ($env{'user.adv'}) {
         $r->print(<<END);
             <td align="center">&nbsp;<b><a href="$bugurl" target="bodyframe"><img src="$location/lonMisc/smallBug.gif" border="0" alt="(Report a bug)" valign="middle" />&nbsp;Report a bug</a>&nbsp;</b></td>
 END
@@ -274,7 +275,7 @@ END
         $r->print(".");
     }
     if ($topic) {
-        if ( ($component_url) || ($ENV{'user.adv'}) ) {
+        if ( ($component_url) || ($env{'user.adv'}) ) {
             if ($component_url) {
                 $r->print("
           <ul>
@@ -282,7 +283,7 @@ END
           </ul>
           <p>$lt{'disp'}</p>
                 ");
-            } elsif ($ENV{'user.adv'}) {
+            } elsif ($env{'user.adv'}) {
                 $r->print("
               <ul>
                <li><td align=\"center\">&nbsp;<a href=\"/adm/help/nohelptopic.html\">$lt{'inhs'} $topic</a></li></ul>
@@ -296,12 +297,12 @@ END
            <li><a href=\"/adm/support?origurl=".&Apache::lonnet::escape($origurl)."&function=$function\">$lt{'cont'}</a></li>
           </ul>
           <p>$lt{'suhr'}");
-         unless ($ENV{'user.adv'}) {
+         unless ($env{'user.adv'}) {
              $r->print('<br /><b>'.&mt('Note').'</b>: '.$lt{'stuq'}.'. '.&mt('This can be done using the').' <a href="/adm/communicate" target="_top">'.&mt('COM').'</a> '.&mt('button, or the FDBK button when viewing a content page.'));
          }
          $r->print("</p>");
     }
-    if ($faqbaseurl && $ENV{'user.adv'}) {
+    if ($faqbaseurl && $env{'user.adv'}) {
         if (!defined($faq) ||$faq eq '') {
             $faq = '1';
         }
@@ -312,7 +313,7 @@ END
           <p>$lt{'tfaq'}</p>
         ");
     }
-    if ($bugurl && $ENV{'user.adv'}) {
+    if ($bugurl && $env{'user.adv'}) {
         $bugurl .= '?'.$bug;
         $r->print("
           <ul>