--- loncom/interface/lonsupportreq.pm	2004/12/18 23:58:34	1.14
+++ loncom/interface/lonsupportreq.pm	2004/12/19 00:21:46	1.15
@@ -159,10 +159,11 @@ $jscript
 </head>
 $bodytag
 ENDHEAD
-    if ($r->uri() eq '/adm/helpdesk') {
+    if ($r->uri eq '/adm/helpdesk') {
         &print_header($r,$origurl);
     }
     $r->print(<<"END");
+<form method="post" name="logproblem" enctype="multipart/form-data">
  <table width="580" border="0" cellpadding="0" cellspacing="0" bgcolor="#000000">
   <tr>
    <td>
@@ -173,7 +174,6 @@ ENDHEAD
         <tr>
          <td>
 	  <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
-           <form method="post" name="logproblem" enctype="multipart/form-data">
            <tr>
             <td width="140" bgcolor="$tablecolor">
              <table width="140" border="0" cellpadding="8" cellspacing="0">
@@ -263,7 +263,7 @@ END
         }
         if ($udomform eq '') {
             $udomform = '<i>domain</i>:&nbsp;';
-            $udomform .= &Apache::loncommon::select_dom_form('','udom');
+            $udomform .= &Apache::loncommon::select_dom_form($defdom,'udom');
         }
         if ($unameform eq '') {
             $unameform= '<i>username</i>:&nbsp;<input type="text" size="20" name="loncname" value="'.$uname.'" />&nbsp;&nbsp;';
@@ -545,7 +545,7 @@ END
               <tr>
                <td>
                 <input type="hidden" name="action" value="process" />
-                <input type="button" value="Submit Request Form" onClick="validate()"/> &nbsp;
+                <input type="button" value="Submit Request" onClick="validate()"/> &nbsp;
                </td>
                <td>&nbsp;</td>
                <td>
@@ -1071,10 +1071,10 @@ sub javascript_code_selections {
 function courseSet(caller) {
     var ids = new Array ("$seltitle_str");
     var formitems = new Array ($numtitles);
-    var idyr = document.forms.logproblem.Year.selectedIndex
-    var idsem  = document.forms.logproblem.Semester.selectedIndex
-    var iddept = document.forms.logproblem.Department.selectedIndex
-    var idclass = document.forms.logproblem.Number.selectedIndex
+    var idyr = document.logproblem.Year.selectedIndex
+    var idsem  = document.logproblem.Semester.selectedIndex
+    var iddept = document.logproblem.Department.selectedIndex
+    var idclass = document.logproblem.Number.selectedIndex
     var idyears = new Array("$$idlist{$$codetitles[0]}");
     var idsems = new Array ($$idnums{$$codetitles[0]});
     var idsemlongs = new Array ($$idnums{$$codetitles[0]});
@@ -1101,51 +1101,51 @@ END
     }
     $$script_tag .= (<<END_OF_BLOCK);
  if (caller == "Year") {
-   document.forms.logproblem.Department.length = 0
-   document.forms.logproblem.Number.length = 0
-   document.forms.logproblem.Department.options[0] = new Option("<-Pick Semester.","-1",true,true)
-   document.forms.logproblem.Number.options[0] = new Option("<-Pick Department","-1",true,true)
+   document.logproblem.Department.length = 0
+   document.logproblem.Number.length = 0
+   document.logproblem.Department.options[0] = new Option("<-Pick Semester.","-1",true,true)
+   document.logproblem.Number.options[0] = new Option("<-Pick Department","-1",true,true)
    if (idyr == 0) {
-    document.forms.logproblem.Semester.length = 0
-    document.forms.logproblem.Semester.options[0] = new Option("<-Pick Year","-1",true,true)
+    document.logproblem.Semester.length = 0
+    document.logproblem.Semester.options[0] = new Option("<-Pick Year","-1",true,true)
    }
    else {
-    document.forms.logproblem.Semester.length = 0
-    document.forms.logproblem.Semester.options[0] = new Option("Select","-1",true,true)
+    document.logproblem.Semester.length = 0
+    document.logproblem.Semester.options[0] = new Option("Select","-1",true,true)
     for (var i=0; i<idsems[idyr-1].length; i++) {
-      document.forms.logproblem.Semester.options[i+1] = new Option(idsemlongs[idyr-1][i],idsems[idyr-1][i],false,false)
+      document.logproblem.Semester.options[i+1] = new Option(idsemlongs[idyr-1][i],idsems[idyr-1][i],false,false)
     }
    }
-   document.forms.logproblem.Semester.selectedIndex = 0;
+   document.logproblem.Semester.selectedIndex = 0;
  }
  if (caller == "Semester") {
-   document.forms.logproblem.Department.length = 0
-   document.forms.logproblem.Number.length = 0
-   document.forms.logproblem.Number.options[0] = new Option("<-Pick Department.","-1",true,true)
+   document.logproblem.Department.length = 0
+   document.logproblem.Number.length = 0
+   document.logproblem.Number.options[0] = new Option("<-Pick Department.","-1",true,true)
    if (idsem == 0) {
-     document.forms.logproblem.Department.options[0] = new Option("<-Pick Semester.","-1",true,true)
-     document.forms.logproblem.Department.options[0] = new Option("<-Pick Semester","-1",true,true)
+     document.logproblem.Department.options[0] = new Option("<-Pick Semester.","-1",true,true)
+     document.logproblem.Department.options[0] = new Option("<-Pick Semester","-1",true,true)
    }
    else {
-    document.forms.logproblem.Department.options[0] = new Option("Select","-1",true,true)    
+    document.logproblem.Department.options[0] = new Option("Select","-1",true,true)    
     for (var i=0; i<idcodes[idyr-1][idsem-1].length; i++) {
-      document.forms.logproblem.Department.options[i+1] = new Option(idcodes[idyr-1][idsem-1][i],idcodes[idyr-1][idsem-1][i],false,false)
+      document.logproblem.Department.options[i+1] = new Option(idcodes[idyr-1][idsem-1][i],idcodes[idyr-1][idsem-1][i],false,false)
     }
    }
-   document.forms.logproblem.Department.selectedIndex = 0
+   document.logproblem.Department.selectedIndex = 0
  }
  if (caller == "Department") {
-   document.forms.logproblem.Number.length = 0
+   document.logproblem.Number.length = 0
    if (iddept == 0) {
-     document.forms.logproblem.Number.options[0] = new Option("<-Pick Department.","-1",true,true)
+     document.logproblem.Number.options[0] = new Option("<-Pick Department.","-1",true,true)
    }
    else {
-    document.forms.logproblem.Number.options[0] = new Option("Select","-1",true,true)
+    document.logproblem.Number.options[0] = new Option("Select","-1",true,true)
     for (var i=0; i<idcourses[idyr-1][idsem-1][iddept-1].length; i++) {
-      document.forms.logproblem.Number.options[i+1] = new Option(idcourses[idyr-1][idsem-1][iddept-1][i],idcourses[idyr-1][idsem-1][iddept-1][i],false,false)
+      document.logproblem.Number.options[i+1] = new Option(idcourses[idyr-1][idsem-1][iddept-1][i],idcourses[idyr-1][idsem-1][iddept-1][i],false,false)
     }
    }
-   document.forms.logproblem.Number.selectedIndex = 0
+   document.logproblem.Number.selectedIndex = 0
  }
 }
 END_OF_BLOCK