--- loncom/interface/lonhelpmenu.pm	2004/09/29 19:13:20	1.12
+++ loncom/interface/lonhelpmenu.pm	2004/12/20 19:58:41	1.17
@@ -76,11 +76,66 @@ sub display_help_banner {
     my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');
     my $pagecolor = &Apache::loncommon::designparm($function.'.pgbg');
     my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
-    my $location=&lonhttpdurl("/adm");
+    my $location=&Apache::loncommon::lonhttpdurl("/adm");
     if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) {
-        $tablecolor = '#CCCCFF';
+        $tablecolor = '#EEEE99';
     }
+    my $scripttag = '';
+    if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
+        my $displayurl = &Apache::lonnet::escape($origurl);
+        $scripttag = (<<"SCRIPT_ONE");
+<script>
+function gohelpdesk() {
+    var actiontype = null;
+    try {
+        actiontype = parent.bodyframe.document.logproblem.action.value;
+    }
+    catch(error) {
+        parent.bodyframe.location = "/adm/support?origurl=$displayurl&function=$function";
+        return;
+    }
+    if (actiontype) {
+        var loc = parent.bodyframe.location.href;
+        if (loc.indexOf("/adm/support") > -1) {
+            if (parent.bodyframe.document.logproblem.action.value == "process") {
+                if (validmail(parent.bodyframe.document.logproblem.email) == false) {
+                    alert("The e-mail address you entered: "+parent.bodyframe.document.logproblem.email.value+" is not a valid e-mail address.");
+                    return;
+                }
+                parent.bodyframe.document.logproblem.submit();
+                return;
+            }
+        }
+        parent.bodyframe.location = "/adm/support?origurl=$displayurl&function=$function";
+        return;
+    }
+}
+SCRIPT_ONE
+        $scripttag .= (<<'SCRIPT_TWO');
+function validmail(field) {
+    var str = field.value;
+    if (window.RegExp) {
+        var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
+        var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$";
+        var reg1 = new RegExp(reg1str);
+        var reg2 = new RegExp(reg2str);
+        if (!reg1.test(str) && reg2.test(str)) {
+            return true;
+        }
+        return false;
+    }
+    else
+    {
 
+        if(str.indexOf("@") >= 0) {
+            return true;
+        }
+        return false;
+    }
+}
+</script>
+SCRIPT_TWO
+    }
     $r->print(<<END);
 <html>
 <head>
@@ -93,6 +148,7 @@ sub display_help_banner {
  a:hover {text-decoration: underline; color: $vlinkcolor; }
 -->
 </style>
+$scripttag
 </head>
 $bodytag
 END
@@ -123,34 +179,34 @@ END
             $r->print("
             <td align=\"center\">&nbsp;<b><a href=\"$component_url\" target=\"bodyframe\">");
         } elsif ($ENV{'user.adv'}) {
-            $r->print('<td align="center">&nbsp;<b><a href="$location/help/nohelptopic.html" target="bodyframe">');
+            $r->print('<td align="center">&nbsp;<b><a href="/adm/help/nohelptopic.html" target="bodyframe">');
         }
         $r->print('
-  <image src="$location/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');
+  <img src="'.$location.'/help/gif/smallHelp.gif" border="0" alt="(Topic help)" valign="middle" />&nbsp;Topic help</a></b>&nbsp;</td>');
     }
     if ($requestmail =~ m/^[^\@]+\@[^\@]+$/) {
         $r->print('
-            <td align="center">&nbsp;<b><a href="/adm/support?origurl='.&Apache::lonnet::escape($origurl).'&function='.$function.'" target="bodyframe"><image src="$location/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;Ask helpdesk</a></b>&nbsp;</td>');
+            <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'}) {
-        $r->print(<<END)
+        $r->print(<<END);
             <td align="center">
-             &nbsp;<b><a href="$faqbaseurl/fom/cache/$faq.html" target="bodyframe"><image src="$location/lonMisc/smallFAQ.gif" border="0" alt="(FAQ)" valign="middle" />&nbsp;FAQ</a></b>&nbsp;
+             &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'}) {
-        $r->print(<<END)
-            <td align="center">&nbsp;<b><a href="$bugurl" target="bodyframe"><image src="$location/lonMisc/smallBug.gif" border="0" alt="(Report a bug)" valign="middle" />&nbsp;Report a bug</a>&nbsp;</b></td>
+        $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
     }
     if ($stayOnPage) {
         $r->print(<<END);
-            <td align="center">&nbsp;<b><a href="$origurl" target="_top"><image src="$location/lonIcons/move_up.gif" border="0" alt="(Return to last location)" valign="middle" />&nbsp;Return to last location</a></b>&nbsp;</td>
+            <td align="center">&nbsp;<b><a href="$origurl" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="(Return to last location)" valign="middle" />&nbsp;Return to last location</a></b>&nbsp;</td>
 END
     } else {
         $r->print(<<END);
-            <td align="center">&nbsp;<b><a href="javascript:window.close()" target="_top"><image src="$location/lonIcons/closepage.gif" border="0" alt="(Close window)" valign="bottom" />&nbsp;Close</a></b>&nbsp;</td>
+            <td align="center">&nbsp;<b><a href="javascript:window.close()" target="_top"><img src="$location/lonIcons/closepage.gif" border="0" alt="(Close window)" valign="bottom" />&nbsp;Close</a></b>&nbsp;</td>
 END
     }
     $r->print(<<END);
