Diff for /loncom/interface/lonpickcourse.pm between versions 1.13 and 1.17

version 1.13, 2004/03/19 03:47:09 version 1.17, 2004/06/29 14:56:32
Line 61  ENDDOCUMENT Line 61  ENDDOCUMENT
                                                           'domainfilter',1);                                                            'domainfilter',1);
 # description filter  # description filter
     my $descriptfilter=$ENV{'form.descriptfilter'};      my $descriptfilter=$ENV{'form.descriptfilter'};
     $descriptfilter=~s/[^\w\s]//g;  
     unless ($descriptfilter) { $descriptfilter=''; }      unless ($descriptfilter) { $descriptfilter=''; }
       my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"');
 # last course activity filter and selection  # last course activity filter and selection
     my $sincefilter=$ENV{'form.sincefilter'};      my $sincefilter=$ENV{'form.sincefilter'};
     $sincefilter=~s/[^\d-]//g;      $sincefilter=~s/[^\d-]//g;
Line 115  $lt{'cac'}: $sincefilterform Line 114  $lt{'cac'}: $sincefilterform
 $lt{'cdo'}: $domainselectform  $lt{'cdo'}: $domainselectform
 <br />  <br />
 $lt{'cde'}:  $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>  <p><input type="submit" name="gosearch" value="Search" /></p>
 </form>  </form>
 <hr />  <hr />
Line 132  ENDSCRIPT Line 131  ENDSCRIPT
  $r->print('<form>');   $r->print('<form>');
  my %by_descrip;   my %by_descrip;
  foreach my $course (keys %courses) {   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))) {   foreach my $description (sort(keys(%by_descrip))) {
     my $course=$by_descrip{$description};      my $course=$by_descrip{$description};
     my $cleandesc=&HTML::Entities::encode($courses{$course});      my $cleandesc=&HTML::Entities::encode($description,'<>&"');
     $cleandesc=~s/'/\\'/g;      $cleandesc=~s/'/\\'/g;
     my ($cdom,$cnum)=split(/\_/,$course);      my ($cdom,$cnum)=split(/\_/,$course);
     $r->print('<input type="button" value="Select" onClick="gochoose('.      $r->print('<input type="button" value="Select" onClick="gochoose('.
   "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$courses{$course}.' ('.    "'".$cnum."','".$cdom."','".$cleandesc."')".'" /> '.$description.' ('.
   ($Apache::lonnet::domaindescription{$cdom}?    ($Apache::lonnet::domaindescription{$cdom}?
                    $Apache::lonnet::domaindescription{$cdom}:$cdom).                     $Apache::lonnet::domaindescription{$cdom}:$cdom).
                  ")<br />\n");                   ")<br />\n");

Removed from v.1.13  
changed lines
  Added in v.1.17


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>