--- loncom/interface/lonpickcourse.pm	2003/10/13 22:45:09	1.10
+++ loncom/interface/lonpickcourse.pm	2004/06/29 14:56:32	1.17
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.10 2003/10/13 22:45:09 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.17 2004/06/29 14:56:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -51,7 +51,8 @@ ENDDOCUMENT
 # Get parameters from query string
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
-                 'sincefilter','form','cnumelement','cdomelement']);
+			       'sincefilter','form','cnumelement',
+			       'cdomelement','cnameelement']);
 # domain filter and selection
     my $domainfilter=$ENV{'form.domainfilter'};
     $domainfilter=~s/\W//g;
@@ -60,9 +61,8 @@ ENDDOCUMENT
                                                           'domainfilter',1);
 # description filter
     my $descriptfilter=$ENV{'form.descriptfilter'};
-    $descriptfilter=~s/[^\w\s]//g;
     unless ($descriptfilter) { $descriptfilter=''; }
-
+    my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
 # last course activity filter and selection
     my $sincefilter=$ENV{'form.sincefilter'};
     $sincefilter=~s/[^\d-]//g;
@@ -84,10 +84,17 @@ ENDDOCUMENT
 				       'cac' => 'Course Activity',
 				       'cde' => 'Course Description',
 				       'cdo' => 'Course Domain');
+    my ($name_code,$name_input);
+    if (defined($ENV{'form.cnameelement'}) && $ENV{'form.cnameelement'} ne '') {
+	$name_code = "opener.document.$ENV{'form.form'}.$ENV{'form.cnameelement'}.value=cdesc;";
+	$name_input ='<input type="hidden" name="cnameelement" value="'.
+	    $ENV{'form.cnameelement'}.'" />';
+    }
     $r->print(<<ENDSCRIPT);
 <script>
-function gochoose(cname,cdom) {
-    opener.document.$ENV{'form.form'}.$ENV{'form.cnumelement'}.value=cname;
+function gochoose(cname,cdom,cdesc) {
+    $name_code
+    opener.document.$ENV{"form.form"}.$ENV{'form.cnumelement'}.value=cname;
     var slct=opener.document.$ENV{'form.form'}.$ENV{'form.cdomelement'};
     var i;
     for (i=0;i<slct.length;i++) {
@@ -99,6 +106,7 @@ function gochoose(cname,cdom) {
 <form method="post">
 <input type="hidden" name="cnumelement" value="$ENV{'form.cnumelement'}" />
 <input type="hidden" name="cdomelement" value="$ENV{'form.cdomelement'}" />
+$name_input
 <input type="hidden" name="form" value="$ENV{'form.form'}" />
 
 $lt{'cac'}: $sincefilterform
@@ -106,7 +114,7 @@ $lt{'cac'}: $sincefilterform
 $lt{'cdo'}: $domainselectform
 <br />
 $lt{'cde'}:
-<input type="text" name="descriptfilter" size="40" value="$descriptfilter" />
+<input type="text" name="descriptfilter" size="40" value="$listdescript" />
 <p><input type="submit" name="gosearch" value="Search" /></p>
 </form>
 <hr />
@@ -123,17 +131,26 @@ ENDSCRIPT
 	$r->print('<form>');
 	my %by_descrip;
 	foreach my $course (keys %courses) {
-	    $by_descrip{lc($courses{$course})}=$course;
+            my $descr;
+            if ($courses{$course} =~ m/^([^:]*):/) {
+                $descr = &Apache::lonnet::unescape($1);
+            } else {
+                $descr = &Apache::lonnet::unescape($courses{$course});
+            }
+            $by_descrip{lc($descr)}=$course;
 	}
 	foreach my $description (sort(keys(%by_descrip))) {
 	    my $course=$by_descrip{$description};
+	    my $cleandesc=&HTML::Entities::encode($description,'<>&"');
+	    $cleandesc=~s/'/\\'/g;
 	    my ($cdom,$cnum)=split(/\_/,$course);
 	    $r->print('<input type="button" value="Select" onClick="gochoose('.
-		  "'".$cnum."','".$cdom."')".'" /> '.$courses{$course}.' ('.
+		  "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$description.' ('.
 		  ($Apache::lonnet::domaindescription{$cdom}?
                    $Apache::lonnet::domaindescription{$cdom}:$cdom).
                  ")<br />\n");
 	}
+	if (!%courses) { $r->print(&mt('None found')); }
         $r->print('</form>');
     }
     $r->print('</body></html>');