--- loncom/interface/lonsupportreq.pm	2004/12/19 00:21:46	1.15
+++ loncom/interface/lonsupportreq.pm	2006/04/13 19:07:11	1.34
@@ -1,13 +1,41 @@
+#
+# $Id: lonsupportreq.pm,v 1.34 2006/04/13 19:07:11 albertel Exp $
+#
+# Copyright Michigan State University Board of Trustees
+#
+# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+#
+# LON-CAPA is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# LON-CAPA is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LON-CAPA; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+# /home/httpd/html/adm/gpl.txt
+#
+# http://www.lon-capa.org/
+#
+
 package Apache::lonsupportreq;
 
 use strict;
 use lib qw(/home/httpd/lib/perl);
 use MIME::Types;
 use MIME::Lite;
+use CGI::Cookie();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
-use Apache::lonnet();
+use Apache::lonnet;
 use Apache::lonlocal;
+use Apache::lonacc();
 
 sub handler {
     my ($r) = @_;
@@ -19,11 +47,11 @@ 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 $action = $ENV{'form.action'};
+    my $function = $env{'form.function'};
+    my $origurl = &Apache::lonnet::unescape($env{'form.origurl'});
+    my $action = $env{'form.action'};
 
     if ($action eq 'process') {
         &print_request_receipt($r,$origurl,$function);
@@ -35,24 +63,28 @@ sub handler {
     
 sub print_request_form {
     my ($r,$origurl,$function) = @_;
-    my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server);
-    my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0",marginheight="0"',1);
+    my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,$formname);
     my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
     if (($tablecolor eq '') || ($tablecolor eq '#FFFFFF')) {
         $tablecolor = '#EEEE99';
     }
     $ccode = '';
-    $os = $ENV{'browser.os'};
-    $browser = $ENV{'browser.type'};
-    $bversion = $ENV{'browser.version'};
-    $uhost = $ENV{'request.host'};
-    $uname = $ENV{'user.name'};
-    $udom = $ENV{'user.domain'};
-    $uhome = $ENV{'user.home'};
-    $urole = $ENV{'request.role'};
-    $usec = $ENV{'request.course.sec'};
-    $cid = $ENV{'request.course.id'};
-    $server = $ENV{'SERVER_NAME'};
+    $os = $env{'browser.os'};
+    $browser = $env{'browser.type'};
+    $bversion = $env{'browser.version'};
+    $uhost = $env{'request.host'};
+    $uname = $env{'user.name'};
+    $udom = $env{'user.domain'};
+    $uhome = $env{'user.home'};
+    $urole = $env{'request.role'};
+    $usec = $env{'request.course.sec'};
+    $cid = $env{'request.course.id'};
+    $formname = 'logproblem';
+    if ($origurl =~ m-^http://-) {
+        $server = $origurl;
+    } else {
+        $server = 'http://'.$ENV{'SERVER_NAME'}.$origurl;
+    }
     my $scripttag = (<<'END');
 function validate() {
     if (validmail(document.logproblem.email) == false) {
@@ -66,7 +98,7 @@ 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 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)) {
@@ -83,6 +115,7 @@ function validmail(field) {
     }
 }
 END
+
     if ($cid =~ m/_/) {
         ($cdom,$cnum) = split/_/,$cid;
     }
@@ -92,17 +125,17 @@ END
         $ccode = $csettings{'internal.coursecode'};
         $sectionlist = $csettings{'internal.sectionnums'};
     }
-    if ($ENV{'environment.critnotification'}) {
-        $email = $ENV{'environment.critnotification'};
+    if ($env{'environment.critnotification'}) {
+        $email = $env{'environment.critnotification'};
     }
-    if (!$email && $ENV{'environment.notification'}) {
-        $email = $ENV{'environment.notification'};
+    if (!$email && $env{'environment.notification'}) {
+        $email = $env{'environment.notification'};
     }
-    if ($ENV{'environment.lastname'}) {
-        $lastname = $ENV{'environment.lastname'};
+    if ($env{'environment.lastname'}) {
+        $lastname = $env{'environment.lastname'};
     }
-    if ($ENV{'environment.firstname'}) {
-        $firstname = $ENV{'environment.firstname'};
+    if ($env{'environment.firstname'}) {
+        $firstname = $env{'environment.firstname'};
     }
     my @sections = split/,/,$sectionlist;
     my %groupid = ();
@@ -110,8 +143,15 @@ END
         my ($sec,$grp) = split/:/,$_;
         $groupid{$sec} = $grp;
     }
-    my $defdom = $Apache::lonnet::perlvar{'lonDefDomain'};
-    my $codedom = $defdom;
+    my $codedom = $Apache::lonnet::perlvar{'lonDefDomain'};
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['codedom']);
+    if (exists($env{'form.codedom'})) {
+        $codedom = $env{'form.codedom'};
+    }
+    my $details_title;
+    if ($codedom) {
+        $details_title = '<br />('.$codedom.')';
+    }
     my %coursecodes = ();
     my %codes = ();
     my @codetitles = ();
@@ -124,7 +164,11 @@ END
     my $totcodes = 0;
     my $format_reply;
     my $jscript = '';
-    
+    my $loaditems = qq|
+function initialize_codes() {
+    return;
+}
+    |;
     if ($cdom) {
         $codedom = $cdom;
     }
@@ -141,24 +185,30 @@ END
         $totcodes = &retrieve_instcodes(\%coursecodes,$codedom,$totcodes);
     }
     if ($totcodes > 0) {
-        $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
         if ($ccode eq '') {
-            my $numtypes = @codetitles;
-            &build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
-            &javascript_code_selections($numtypes,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles);
-        }
-    }
-    $r->print(<<ENDHEAD);
-<html>
-<head>
- <title>LON-CAPA support request</title>
-<script>
-$scripttag
-$jscript
-</script>
-</head>
-$bodytag
-ENDHEAD
+            $format_reply = &Apache::lonnet::auto_instcode_format($caller,$codedom,\%coursecodes,\%codes,\@codetitles,\%cat_titles,\%cat_order);
+            if ($format_reply eq 'ok') {
+                my $numtypes = @codetitles;
+                &build_code_selections(\%codes,\@codetitles,\%cat_titles,\%cat_order,\%idlist,\%idnums,\%idlist_titles);
+                &javascript_code_selections($formname,$numtypes,\%cat_titles,\$jscript,\%idlist,\%idnums,\%idlist_titles,\@codetitles);
+                $loaditems = '';
+            }
+        }
+    }
+	
+    my $js = '<script type"text/javascript">'."\n$scripttag\n$jscript\n".
+	'</script>';
+    my %add_entries = (topmargin    => "0",
+		       marginheight => "0",
+		       onLoad       =>"initialize_codes()",);
+
+    my $start_page =
+	&Apache::loncommon::start_page('Support Request',$js,
+				       { 'function'    => $function,
+					 'add_entries' => \%add_entries,
+					 'only_body'   => 1,});
+    $r->print($start_page);
+
     if ($r->uri eq '/adm/helpdesk') {
         &print_header($r,$origurl);
     }
@@ -198,9 +248,10 @@ END
         } elsif (defined($lastname) && $lastname ne '') {
             $fullname= " $lastname";
         }
-        $r->print('<input type="text" size="20" name="username" value="'.$fullname.'" /><br />');
+        $r->print('<input type="text" size="20" name="username" value="'.$fullname.'" />');
     }
     $r->print(<<END);
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="Submit Request" onClick="validate()" />&nbsp;
                </td>
               </tr>
              </table>
@@ -263,10 +314,10 @@ END
         }
         if ($udomform eq '') {
             $udomform = '<i>domain</i>:&nbsp;';
-            $udomform .= &Apache::loncommon::select_dom_form($defdom,'udom');
+            $udomform .= &Apache::loncommon::select_dom_form($codedom,'udom');
         }
         if ($unameform eq '') {
-            $unameform= '<i>username</i>:&nbsp;<input type="text" size="20" name="loncname" value="'.$uname.'" />&nbsp;&nbsp;';
+            $unameform= '<i>username</i>:&nbsp;<input type="text" size="12" name="uname" value="'.$uname.'" />&nbsp;&nbsp;';
         }
         $r->print($unameform.$udomform.'<br />Enter the username you use to log-in to your LON-CAPA system, and choose your domain.');
     }
@@ -294,7 +345,7 @@ END
              <table width="100%" border="0" cellpadding="8" cellspacing="0">
               <tr>
                <td>
-                http://$server$origurl<input type="hidden" name="sourceurl" value="http://$server$origurl" />
+                $server<input type="hidden" name="sourceurl" value="$server" />
                </td>
               </tr>
              </table>
@@ -333,7 +384,7 @@ END
             <td width="140" bgcolor="$tablecolor">
              <table width="140" border="0" cellpadding="8" cellspacing="0">
               <tr>
-               <td align="right"><b>Course Details:</b>
+               <td align="right"><b>Course Details:</b>$details_title
                </td>
               </tr>
              </table>
@@ -368,13 +419,28 @@ END
                       '<select name="'.$codetitles[0].'" onChange="courseSet('."'$codetitles[0]'".')">'."\n".
                       ' <option value="-1" />Select'."\n");
                 my @items = ();
+                my @longitems = ();
                 if ($idlist{$codetitles[0]} =~ /","/) {
                     @items = split/","/,$idlist{$codetitles[0]};
                 } else {
                     $items[0] = $idlist{$codetitles[0]};
                 }
-                foreach (@items) {
-                    $r->print(' <option value="'.$_.'" />'.$_);
+                if (defined($idlist_titles{$codetitles[0]})) {
+                    if ($idlist_titles{$codetitles[0]} =~ /","/) {
+                        @longitems = split/","/,$idlist_titles{$codetitles[0]};
+                    } else {
+                        $longitems[0] = $idlist_titles{$codetitles[0]};
+                    }
+                    for (my $i=0; $i<@longitems; $i++) {
+                        if ($longitems[$i] eq '') {
+                            $longitems[$i] = $items[$i];
+                        }
+                    }
+                } else {
+                    @longitems = @items;
+                }
+                for (my $i=0; $i<@items; $i++) {
+                    $r->print(' <option value="'.$items[$i].'">'.$longitems[$i].'</option>');
                 }
                 $r->print('</select></td>');
                 for (my $i=1; $i<$numtitles; $i++) {
@@ -430,12 +496,13 @@ END
                <td>
 END
     if ($sectionlist) {
-        $r->print("<select name=\"section\">");
+        $r->print("<select name=\"section\"\n>".
+                  "  <option value=\"\" selected=\"selected\">Select</option>\n");
         foreach (sort keys %groupid) {
             if ($_ eq $groupid{$_} || $groupid{$_} eq '') {
-                $r->print("<option value=\"$_\" />$_");
+                $r->print("  <option value=\"$_\" >$_</option>\n");
             } else {
-                $r->print("<option value=\"$_\" />$_ - (LON-CAPA sec: $groupid{$_})");
+                $r->print("  <option value=\"$_\" >$_ - (LON-CAPA sec: $groupid{$_})</option>\n");
             }
         }
         $r->print("</select>");
@@ -502,7 +569,7 @@ END
 	    </td>
 	   </tr>
 END
-    if (defined($ENV{'user.name'})) {
+    if (defined($env{'user.name'})) {
         $r->print(<<END);
            <tr>
             <td width="140" bgcolor="$tablecolor">
@@ -530,6 +597,7 @@ END
            </tr>
 END
     }
+
     $r->print(<<END);
            <tr>
             <td width="140" bgcolor="$tablecolor">
@@ -566,18 +634,18 @@ END
   </tr>
  </table>
 </form>
-</body>
-</html>
 END
+    $r->print(&Apache::loncommon::end_page());
     return;
 }
 
 sub print_request_receipt {
     my ($r,$url,$function) = @_;
-    my @envvars = ('lonID','HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME','browser.os','browser.type','browser.version','user.home','request.role');
+    my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');
+    my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');
     my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');
+    my @cookievars = ('lonID');
 
-    my $bodytag = &Apache::loncommon::bodytag('',$function,'topmargin="0" marginheight="0"',1);
     my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};
     my $to =  $Apache::lonnet::perlvar{'lonSupportEMail'};
     my $from = $admin;
@@ -586,39 +654,63 @@ sub print_request_receipt {
     my $vlinkcolor = &Apache::loncommon::designparm($function.'.vlink');
     my $tablecolor = &Apache::loncommon::designparm($function.'.tabbg');
     my @formvars = ('username','email','uname','udom','sourceurl','phone','section','coursecode','title','subject','description','screenshot');
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},\@formvars);
 
+    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},\@formvars);
+    my $coursecode = $env{'form.coursecode'};
+    if ($coursecode eq '') {
+        if (defined($env{'form.Year'})) {
+            $coursecode .= $env{'form.Year'};
+        }
+        if (defined($env{'form.Semester'})) {
+            $coursecode .= $env{'form.Semester'};
+        }
+        if (defined($env{'form.Department'})) {
+            $coursecode .= $env{'form.Department'};
+        }
+        if (defined($env{'form.Number'})) {
+            $coursecode .= $env{'form.Number'};
+        }
+    }
     my $supportmsg = qq|
-Name: $ENV{'form.username'}
-Email: $ENV{'form.email'}
-Username/domain: $ENV{'form.uname'} - $ENV{'form.udom'}
-Tel: $ENV{'form.phone'}
-Course Information: $ENV{'form.title'} - $ENV{'form.coursecode'} - section: $ENV{'form.section'}
-Subject: $ENV{'form.subject'}
-Description: $ENV{'form.description'}
-URL: $ENV{'form.sourceurl'}
+Name: $env{'form.username'}
+Email: $env{'form.email'}
+Username/domain: $env{'form.uname'} - $env{'form.udom'}
+Tel: $env{'form.phone'}
+Course Information: $env{'form.title'} - $coursecode - section: $env{'form.section'}
+Subject: $env{'form.subject'}
+Description: $env{'form.description'}
+URL: $env{'form.sourceurl'}
 Date/Time: $reporttime
 
     |;
-    my $descrip = $ENV{'form.description'};
+    my $descrip = $env{'form.description'};
     $descrip =~ s#\n#<br />#g;
     my $displaymsg = qq|
-<font color="$fontcolor">Name:</font><font color="$vlinkcolor"> $ENV{'form.username'}</font><br />
-<font color="$fontcolor">Email: </font><font color="$vlinkcolor">$ENV{'form.email'}</font><br />
-<font color="$fontcolor">Username/domain: </font><font color="$vlinkcolor">$ENV{'form.uname'} - $ENV{'form.udom'}</font><br />
-<font color="$fontcolor">Tel: </font><font color="$vlinkcolor">$ENV{'form.phone'}</font><br />
-<font color="$fontcolor">Course Information: </font><font color="$vlinkcolor">$ENV{'form.title'} - $ENV{'form.coursecode'} - section: $ENV{'form.section'}</font><br />
-<font color="$fontcolor">Subject: </font><font color="$vlinkcolor">$ENV{'form.subject'}</font><br />
+<font color="$fontcolor">Name:</font><font color="$vlinkcolor"> $env{'form.username'}</font><br />
+<font color="$fontcolor">Email: </font><font color="$vlinkcolor">$env{'form.email'}</font><br />
+<font color="$fontcolor">Username/domain: </font><font color="$vlinkcolor">$env{'form.uname'} - $env{'form.udom'}</font><br />
+<font color="$fontcolor">Tel: </font><font color="$vlinkcolor">$env{'form.phone'}</font><br />
+<font color="$fontcolor">Course Information: </font><font color="$vlinkcolor">$env{'form.title'} - $coursecode - section: $env{'form.section'}</font><br />
+<font color="$fontcolor">Subject: </font><font color="$vlinkcolor">$env{'form.subject'}</font><br />
 <font color="$fontcolor">Description: </font><font color="$vlinkcolor">$descrip</font><br />
-<font color="$fontcolor">URL: </font><font color="$vlinkcolor">$ENV{'form.sourceurl'}</font><br />
+<font color="$fontcolor">URL: </font><font color="$vlinkcolor">$env{'form.sourceurl'}</font><br />
 <font color="$fontcolor">Date/Time: </font><font color="$vlinkcolor">$reporttime</font><br />
     |;
+
+    my $start_page = 
+	&Apache::loncommon::start_page('Support request recorded',undef,
+				       {'function'    => $function,
+					'add_entries' => {
+					    topmargin    => "0",
+					    marginheight => "0",
+					},
+					'only_body'   => 1,});
+
     $r->print(<<"END");
-<html>
-<head>
- <title>LON-CAPA support request recorded</title>
-</head>
-$bodytag
+$start_page
+<form name="logproblem">
+<input type="hidden" name="action" value="result" />
+</form>
 END
     if ($r->uri eq '/adm/helpdesk') {
         &print_header($r,$url,'process');
@@ -638,13 +730,13 @@ END
             $to = 'helpdesk@lon-capa.org';
         }
     }
-    if (defined($ENV{'form.email'})) {
-        if ($ENV{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) {
-            $from = $ENV{'form.email'};
+    if (defined($env{'form.email'})) {
+        if ($env{'form.email'} =~ m/^[^\@]+\@[^\@]+$/) {
+            $from = $env{'form.email'};
         }
     }
 
-    my $subject = $ENV{'form.subject'};
+    my $subject = $env{'form.subject'};
     $subject =~ s#(`)#'#g;
     $subject =~ s#\$#\(\$\)#g;
     $supportmsg =~ s#(`)#'#g;
@@ -655,9 +747,9 @@ END
 
     my $attachmentpath = '';
     my $attachmentsize = '';
-    if (defined($ENV{'user.name'})) {
-        if ($ENV{'form.screenshot.filename'}) {
-            $attachmentsize = length($ENV{'form.screenshot'});
+    if (defined($env{'user.name'})) {
+        if ($env{'form.screenshot.filename'}) {
+            $attachmentsize = length($env{'form.screenshot'});
             if ($attachmentsize > 131072) {
                 $displaymsg .= "<br />The uploaded screenshot file ($attachmentsize bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.";
             } else {
@@ -666,13 +758,25 @@ END
         }
     }
 
+    my %cookies = ();
+    my $cookie=CGI::Cookie->parse($r->header_in('Cookie'));
+    if ($$cookie{'lonID'} =~ /lonID=(\w+);/) {
+        $cookies{'lonID'} = $1;
+    }
+
     if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;
-        $displaymsg .= "<br />An uploaded screenshot file - $fname ($attachmentsize bytes) was included in the request sent by $ENV{'user.name'} from LON-CAPA domain: $ENV{'user.domain'}";
+        $displaymsg .= "<br />An uploaded screenshot file - $fname ($attachmentsize bytes) was included in the request sent by $env{'user.name'} from LON-CAPA domain: $env{'user.domain'}";
         $supportmsg .= "\n";
-        foreach (@envvars) {
+        foreach (@cookievars) {
+            $supportmsg .= "$_: $cookies{$_}\n";
+        }
+        foreach (@ENVvars) {
             $supportmsg .= "$_: $ENV{$_}\n";
         }
+        foreach (@envvars) {
+            $supportmsg .= "$_: $env{$_}\n";
+        }
     }
  
     my $msg = MIME::Lite->new(
@@ -692,24 +796,24 @@ END
 
     } else {
         my $envdata = '';
-        foreach (@envvars) {
+        foreach (@cookievars) {
+            $envdata .= "$_: $cookies{$_}\n";
+        }
+        foreach (@ENVvars) {
             $envdata .= "$_: $ENV{$_}\n";
         }
+        foreach (@envvars) {
+            $envdata .= "$_: $env{$_}\n";
+        }
         foreach (@loncvars) {
-            $envdata .= "$_: $ENV{$_}\n";
+            $envdata .= "$_: $env{$_}\n";
         }
         $msg->attach(Type => 'TEXT',
                      Data => $envdata);
     }
 
 ### Send it:
-    # ->send can cause an sh launch which can pass all of %ENV along
-    # which can be to large for /bin/sh's little mind
-    my %oldENV=%ENV;
-    undef(%ENV);
     $msg->send('sendmail');
-    %ENV=%oldENV;
-    undef(%oldENV);
 
     if ($attachmentpath =~ m#$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+#) {
         unlink($attachmentpath);
@@ -762,11 +866,21 @@ END
               <tr>
                <td>
     |);
-    foreach (@envvars) {
-        unless($ENV{$_} eq '') { 
+    foreach (@cookievars) {
+        unless($cookies{$_} eq '') {
+            $r->print("$_:&nbsp;<font color='$vlinkcolor'>$cookies{$_}</font>, ");
+        }
+    }
+    foreach (@ENVvars) {
+        unless($ENV{$_} eq '') {
             $r->print("$_:&nbsp;<font color='$vlinkcolor'>$ENV{$_}</font>, ");
         }
     }
+    foreach (@envvars) {
+        unless($env{$_} eq '') { 
+            $r->print("$_:&nbsp;<font color='$vlinkcolor'>$env{$_}</font>, ");
+        }
+    }
     $r->print("
                </td>
               </tr>
@@ -783,9 +897,8 @@ END
    </td>
   </tr>
  </table>
-</body>
-</html>
     ");
+    $r->print(&Apache::loncommon::end_page());
 }
 
 sub print_header {
@@ -802,7 +915,12 @@ sub print_header {
                                            ask   => 'Ask helpdesk',
                                            getst => 'Getting started guide',
                                            back =>  'Back to last location'
-                                         );  
+                                         );
+    my ($getstartlink,$getstarttext);
+    if (-e $Apache::lonnet::perlvar{'lonDocRoot'}.'/adm/gettingstarted.html') {
+        $getstartlink = qq|<td align="center">&nbsp;<b><a href="/adm/gettingstarted.html">$lt{'getst'}</a></td>|;
+        $getstarttext = ' '.&mt('and the "Getting started" guide').' ';
+    }
     $r->print(<<END);
 <table width="620" border="0" cellspacing="0" cellpadding="0" height="55">   <tr height="50">    <td width='5'>&nbsp;</td>
    <td>
@@ -819,8 +937,7 @@ sub print_header {
           <table width="100%" border="0" cellpadding="0" cellspacing="1" bgcolor="#ffffff">
            <tr bgcolor="$tablecolor">
             <td align="center"><img src="$location/help/gif/smallHelp.gif" border="0" alt="(Login help)" valign="middle" />&nbsp;<b><a href="/adm/loginproblems.html">$lt{'login'}</a></td>
-            <td align="center">&nbsp;<b>$helpdesk_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;$lt{'ask'}</a></b>&nbsp;</td>
-            <td align="center">&nbsp;<b><a href="/adm/gettingstarted.html">$lt{'getst'}</a></td>
+            <td align="center">&nbsp;<b>$helpdesk_link<img src="$location/lonIcons/helpdesk.gif" border="0" alt="(Ask helpdesk)" valign="middle" />&nbsp;$lt{'ask'}</a></b>&nbsp;</td>$getstartlink
             <td align="center">&nbsp;<b><a href="$origurl" target="_top"><img src="$location/lonIcons/move_up.gif" border="0" alt="(Back to last location)" valign="middle" />&nbsp;$lt{'back'}</a></b>&nbsp;</td>
            </tr>
           </table>
@@ -845,7 +962,7 @@ END
         $r->print('
  <tr>
   <td colspan="3">'.&mt('
-Please read the "Log-in help" and "Getting started guide" if you can not log-in').'.  '.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk').'.<br /><font size="-1"><b>'.&mt('Note').':</b> '.&mt('Student questions about course content should be directed to the course instructor').'.</font><br /><br />
+Please review the information in "Log-in help"').$getstarttext.' '.&mt('if you are unable to log-in').'.  '.&mt('If your problem is still unresolved, the form below can be used to send a question to the LON-CAPA helpdesk').'.<br /><font size="-1"><b>'.&mt('Note').':</b> '.&mt('Student questions about course content should be directed to the course instructor').'.</font><br /><br />
   </td>
  </tr>');
     }
@@ -856,7 +973,7 @@ Please read the "Log-in help" and "Getti
 
 sub retrieve_instcodes {
     my ($coursecodes,$codedom,$totcodes) = @_;
-    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.');
+    my %courses = &Apache::lonnet::courseiddump($codedom,'.',1,'.','.','.');
     foreach my $course (keys %courses) {
         if ($courses{$course} =~ m/^[^:]*:([^:]+)/) {
             $$coursecodes{$course} = &Apache::lonnet::unescape($1);
@@ -918,9 +1035,9 @@ sub build_code_selections {
                     my @sorted_b = ();
                     my @sorted_b_titles = ();
                     &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[2]}{$key_a}{$key_b}},\@sorted_b);
-                    if (defined($$cat_titles{$$codetitles[1]})) {
+                    if (defined($$cat_titles{$$codetitles[2]})) {
                         foreach (@sorted_b) {
-                            push @sorted_b_titles, $$cat_titles{$$codetitles[1]}{$_};
+                            push @sorted_b_titles, $$cat_titles{$$codetitles[2]}{$_};
                         }
                     }
                     $$idlist{$$codetitles[2]}{$key_a}{$key_b} = join('","',@sorted_b);
@@ -938,9 +1055,18 @@ sub build_code_selections {
                     %{$$idlist{$$codetitles[3]}{$key_a}{$key_b}} = ();
                     foreach my $key_c (keys %{$idarrays{$$codetitles[3]}{$key_a}{$key_b}}) {
                         my @sorted_c = ();
+                        my @sorted_c_titles = ();
                         &sort_cats($num,$cat_order,$codetitles,\@{$idarrays{$$codetitles[3]}{$key_a}{$key_b}{$key_c}},\@sorted_c);
+                        if (defined($$cat_titles{$$codetitles[3]})) {
+                            foreach (@sorted_c) {
+                                push @sorted_c_titles, $$cat_titles{$$codetitles[3]}{$_};
+                            }
+                        }
                         $$idlist{$$codetitles[3]}{$key_a}{$key_b}{$key_c} = join('","',@sorted_c);
                         $$idnums{$$codetitles[3]}{$key_a}{$key_b}{$key_c} = scalar(@sorted_c);
+                        if (defined($$cat_titles{$$codetitles[3]})) {
+                            $$idlist_titles{$$codetitles[2]}{$key_a}{$key_b} = join('","',@sorted_c_titles);
+                        }
                     }
                 }
             }
@@ -954,7 +1080,13 @@ sub build_code_selections {
                         %{$$idlist{$$codetitles[4]}{$key_a}{$key_b}{$key_c}} = ();
                         foreach my $key_d (keys %{$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}}) {
                             my @sorted_d = ();
+                            my @sorted_d_titles = ();
                             &sort_cats($num,$cat_order,$codetitles,$idarrays{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d},\@sorted_d);
+                            if (defined($$cat_titles{$$codetitles[4]})) {
+                                foreach (@sorted_d) {
+                                    push @sorted_d_titles, $$cat_titles{$$codetitles[4]}{$_};
+                                }
+                            }
                             $$idlist{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d} = join('","',@sorted_d);
                             $$idnums{$$codetitles[4]}{$key_a}{$key_b}{$key_c}{$key_d} = scalar(@sorted_d);
                         }
@@ -1060,94 +1192,186 @@ sub recurse_list {
 }
 
 sub javascript_code_selections {
-    my ($numcats,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_;
+    my ($formname,$numcats,$cat_titles,$script_tag,$idlist,$idnums,$idlist_titles,$codetitles) = @_;
     my $numtitles = @{$codetitles};
-    my @seltitles = (); 
+    my @seltitles = ();
     for (my $j=0; $j<$numtitles; $j++) {
         $seltitles[$j] = 'id'.$$codetitles[$j];
     }
     my $seltitle_str = join('","',@seltitles);
+    my @longtitles = ();
+    for (my $i=0; $i<$numtitles; $i++) {
+       if (defined($$cat_titles{$$codetitles[$i]})) {
+           $longtitles[$i] = 1;
+       } else {
+           $longtitles[$i] = 0;
+       }
+    }
+    my $longtitles_str = join('","',@longtitles);
     $$script_tag .= <<END;
 function courseSet(caller) {
     var ids = new Array ("$seltitle_str");
     var formitems = new Array ($numtitles);
-    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 longtitles = new Array ("$longtitles_str");
+    var idyr = document.$formname.Year.selectedIndex
+    var idsem  = document.$formname.Semester.selectedIndex
+    var iddept = document.$formname.Department.selectedIndex
+    var idclass = document.$formname.Number.selectedIndex
     var idyears = new Array("$$idlist{$$codetitles[0]}");
-    var idsems = new Array ($$idnums{$$codetitles[0]});
-    var idsemlongs = new Array ($$idnums{$$codetitles[0]});
-    var idcodes = new Array ($$idnums{$$codetitles[0]});
-    var idcourses = new Array ($$idnums{$$codetitles[0]});
 END
-    my @sort_a = split/","/,$$idlist{$$codetitles[0]}; 
+    if ($longtitles[0]) {
+        $$script_tag .=
+          qq|      var idyearslongs = new Array("$$idlist_titles{$$codetitles[0]}")\n|;
+    }
+    $$script_tag .=
+          "      var idsems = new Array ($$idnums{$$codetitles[0]})\n";
+    if ($longtitles[1]) {
+        $$script_tag .=
+          "      var idsemslongs = new Array ($$idnums{$$codetitles[0]})\n";
+    }
+    $$script_tag .=
+          "      var idcodes = new Array ($$idnums{$$codetitles[0]})\n";
+    if ($longtitles[2]) {
+        $$script_tag .=
+          "      var idcodeslongs = new Array ($$idnums{$$codetitles[0]})\n";
+    }
+    $$script_tag .=
+          "      var idcourses = new Array ($$idnums{$$codetitles[0]})\n";
+    if ($longtitles[3]) {
+        $$script_tag .=
+          "      var idcourseslongs =  new Array ($$idnums{$$codetitles[0]})\n";
+    }
+    my @sort_a = split/","/,$$idlist{$$codetitles[0]};
     for (my $j=0; $j<@sort_a; $j++) {
         $$script_tag .= qq| idsems[$j] = new Array("$$idlist{$$codetitles[1]}{$sort_a[$j]}")\n|;
-        $$script_tag .= qq| idsemlongs[$j] = new Array("$$idlist_titles{$$codetitles[1]}{$sort_a[$j]}")\n|;
+        if ($longtitles[1]) {
+            $$script_tag .= qq| idsemslongs[$j] = new Array("$$idlist_titles{$$codetitles[1]}{$sort_a[$j]}")\n|;
+        }
         $$script_tag .= qq| idcodes[$j] = new Array($$idnums{$$codetitles[1]}{$sort_a[$j]})\n|;
+        if ($longtitles[2]) {
+            $$script_tag .= qq| idcodeslongs[$j] = new Array($$idnums{$$codetitles[1]}{$sort_a[$j]})\n|;
+        }
         $$script_tag .= qq| idcourses[$j] = new Array($$idnums{$$codetitles[1]}{$sort_a[$j]})\n|;
+        if ($longtitles[3]) {
+            $$script_tag .= qq| idcourseslongs[$j] = new Array($$idnums{$$codetitles[1]}{$sort_a[$j]})\n|;
+        }
         my @sort_b = split/","/,$$idlist{$$codetitles[1]}{$sort_a[$j]};
         for (my $k=0; $k<@sort_b; $k++) {
             my $idcode_entry = $$idlist{$$codetitles[2]}{$sort_a[$j]}{$sort_b[$k]};
             $$script_tag .= qq| idcodes[$j][$k] = new Array("$idcode_entry")\n|;
+            if ($longtitles[2]) {
+                my $idcodelong_entry = $$idlist_titles{$$codetitles[2]}{$sort_a[$j]}{$sort_b[$k]};
+                $$script_tag .= qq| idcodeslongs[$j][$k] = new Array("$idcodelong_entry")\n|;
+            }
             $$script_tag .= qq| idcourses[$j][$k] = new Array($$idnums{$$codetitles[2]}{$sort_a[$j]}{$sort_b[$k]})\n|;
+            if ($longtitles[3]) {
+                $$script_tag .= qq| idcourseslongs[$j][$k] = new Array($$idnums{$$codetitles[2]}{$sort_a[$j]}{$sort_b[$k]})\n|;
+            }
             my @sort_c = split/","/,$$idlist{$$codetitles[2]}{$sort_a[$j]}{$sort_b[$k]};
             for (my $l=0; $l<@sort_c; $l++) {
                 my $idcourse_entry = $$idlist{$$codetitles[3]}{$sort_a[$j]}{$sort_b[$k]}{$sort_c[$l]};
                 $$script_tag .= qq| idcourses[$j][$k][$l] = new Array("$idcourse_entry")\n|;
+                if ($longtitles[3]) {
+                    my $idcourselong_entry = $$idlist_titles{$$codetitles[3]}{$sort_a[$j]}{$sort_b[$k]}{$sort_c[$l]};
+                    $$script_tag .= qq| idcourseslongs[$j][$k][$l] = new Array("$idcourselong_entry")\n|;
+                }
             }
         }
     }
     $$script_tag .= (<<END_OF_BLOCK);
- if (caller == "Year") {
-   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.logproblem.Semester.length = 0
-    document.logproblem.Semester.options[0] = new Option("<-Pick Year","-1",true,true)
-   }
-   else {
-    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.logproblem.Semester.options[i+1] = new Option(idsemlongs[idyr-1][i],idsems[idyr-1][i],false,false)
-    }
-   }
-   document.logproblem.Semester.selectedIndex = 0;
+ var display = new Array($numtitles)
+ if (caller == "" || caller == "$$codetitles[0]") {
+     if (caller == "") {
+         document.$formname.Year.length = 0
+         document.$formname.Year.options[0] = new Option("Select","-1",true,true)
+         display[0] = new Array(idyears.length)
+         for (var i=0; i<idyears.length; i++) {
+             display[0][i] = idyears[i]
+             if (longtitles[0] == 1) {
+                 if (idyearslongs[i] != "") {
+                     display[0][i] = idyearslongs[i]
+                 }
+             }
+             else {
+                 if (idyearslongs[i] != "") {
+                     display[0][i] = idyears[i]
+                 }
+             }
+             document.$formname.Year.options[i+1] = new Option(display[0][i],idyears[i],false,false)
+         }
+         document.$formname.Year.selectedIndex = 0;
+     }
+     document.$formname.Semester.length = 0
+     document.$formname.Department.length = 0;
+     document.$formname.Number.length = 0
+     document.$formname.Department.options[0] = new Option("<-Pick $$codetitles[1]","-1",true,true)
+     document.$formname.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)
+     if (idyr == 0 || caller == "") {
+         document.$formname.Semester.options[0] = new Option("<-Pick $$codetitles[0]","-1",true,true)
+     }
+     else {
+         document.$formname.Semester.options[0] = new Option("Select","-1",true,true)
+         display[1] = new Array(idsems[idyr-1].length)
+         for (var i=0; i<idsems[idyr-1].length; i++) {
+             display[1][i] = idsems[idyr-1][i]
+             if (longtitles[1] == 1) {
+                 if (idsemslongs[idyr-1][i] != "") {
+                     display[1][i] = idsemslongs[idyr-1][i]
+                 }
+             }
+             document.$formname.Semester.options[i+1] = new Option(display[1][i],idsems[idyr-1][i],false,false)
+         }
+     }
+     document.$formname.Semester.selectedIndex = 0;
  }
- if (caller == "Semester") {
-   document.logproblem.Department.length = 0
-   document.logproblem.Number.length = 0
-   document.logproblem.Number.options[0] = new Option("<-Pick Department.","-1",true,true)
+ if (caller == "$$codetitles[1]") {
+   document.$formname.Department.length = 0
+   document.$formname.Number.length = 0
+   document.$formname.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)
    if (idsem == 0) {
-     document.logproblem.Department.options[0] = new Option("<-Pick Semester.","-1",true,true)
-     document.logproblem.Department.options[0] = new Option("<-Pick Semester","-1",true,true)
+     document.$formname.Department.options[0] = new Option("<-Pick $$codetitles[1]","-1",true,true)
    }
    else {
-    document.logproblem.Department.options[0] = new Option("Select","-1",true,true)    
+    document.$formname.Department.options[0] = new Option("Select","-1",true,true)    
+    display[2] = new Array(idcodes[idyr-1][idsem-1].length)
     for (var i=0; i<idcodes[idyr-1][idsem-1].length; i++) {
-      document.logproblem.Department.options[i+1] = new Option(idcodes[idyr-1][idsem-1][i],idcodes[idyr-1][idsem-1][i],false,false)
+      display[2][i] = idcodes[idyr-1][idsem-1][i]
+      if (longtitles[2] == 1) {
+          if (idcodeslongs[idyr-1][idsem-1][i] != "") {
+              display[2][i] = idcodeslongs[idyr-1][idsem-1][i]
+          }
+      }
+      document.$formname.Department.options[i+1] = new Option(display[2][i],idcodes[idyr-1][idsem-1][i],false,false)
     }
    }
-   document.logproblem.Department.selectedIndex = 0
+   document.$formname.Department.selectedIndex = 0
  }
- if (caller == "Department") {
-   document.logproblem.Number.length = 0
+ if (caller == "$$codetitles[2]") {
+   document.$formname.Number.length = 0
    if (iddept == 0) {
-     document.logproblem.Number.options[0] = new Option("<-Pick Department.","-1",true,true)
+     document.$formname.Number.options[0] = new Option("<-Pick $$codetitles[2]","-1",true,true)
    }
    else {
-    document.logproblem.Number.options[0] = new Option("Select","-1",true,true)
+    document.$formname.Number.options[0] = new Option("Select","-1",true,true)
+    display[3] = new Array (idcourses[idyr-1][idsem-1][iddept-1].length)
     for (var i=0; i<idcourses[idyr-1][idsem-1][iddept-1].length; i++) {
-      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)
+      display[3][i] = idcourses[idyr-1][idsem-1][iddept-1][i]
+      if (longtitles[3] == 1) {
+        if (idcourseslongs[idyr-1][idsem-1][iddept-1][i] != "") {
+            display[3][i] = idcourseslongs[idyr-1][idsem-1][iddept-1][i]
+        }
+      }
+      document.$formname.Number.options[i+1] = new Option(display[3][i],idcourses[idyr-1][idsem-1][iddept-1][i],false,false)
     }
    }
-   document.logproblem.Number.selectedIndex = 0
+   document.$formname.Number.selectedIndex = 0
  }
 }
+
+function initialize_codes() {
+    courseSet();
+    return;
+}
 END_OF_BLOCK
 }