Diff for /loncom/interface/lonpickcourse.pm between versions 1.27 and 1.28

version 1.27, 2005/04/07 06:56:23 version 1.28, 2005/04/12 00:20:01
Line 54  ENDDOCUMENT Line 54  ENDDOCUMENT
         ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',          ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter',
        'sincefilter','form','cnumelement',         'sincefilter','form','cnumelement',
        'cdomelement','cnameelement','roleelement',         'cdomelement','cnameelement','roleelement',
                                'pickedcourse','instcodefilter','ownerfilter']);                                 'pickedcourse','instcodefilter',
                                  'ownerfilter','coursefilter']);
 # domain filter and selection  # domain filter and selection
     my $domainfilter=$env{'form.domainfilter'};      my $domainfilter=$env{'form.domainfilter'};
     $domainfilter=~s/\W//g;      $domainfilter=~s/\W//g;
Line 73  ENDDOCUMENT Line 74  ENDDOCUMENT
     my $ownerfilter=$env{'form.ownerfilter'};      my $ownerfilter=$env{'form.ownerfilter'};
     unless ($ownerfilter) { $ownerfilter=''; }      unless ($ownerfilter) { $ownerfilter=''; }
     my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');      my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');
   # course ID filter for DCs only
       my ($courseidtag,$coursefilter);
       if ($env{'user.adv'} && $domainfilter && exists($env{'user.role.dc./'.
                           $domainfilter.'/'})) {
           $coursefilter=$env{'form.coursefilter'};
           unless ($coursefilter) { $coursefilter=''; }
           my $listcourseid=&HTML::Entities::encode($coursefilter,'<>&"');
           $courseidtag = &mt('LON-CAPA course ID');
           $courseidtag .= qq|<input type="text" name="coursefilter" size="25" value="$listcourseid" />
           <br />
           |;
       }
 # 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 200  $lt{'cin'}: Line 213  $lt{'cin'}:
 $lt{'cow'}:  $lt{'cow'}:
 <input type="text" name="ownerfilter" size="10" value="$listowner" />  <input type="text" name="ownerfilter" size="10" value="$listowner" />
 <br />  <br />
   $courseidtag
 $lt{'cde'}:  $lt{'cde'}:
 <input type="text" name="descriptfilter" size="40" value="$listdescript" />  <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>
Line 213  ENDSCRIPT Line 227  ENDSCRIPT
  unless ($descriptfilter) { $descriptfilter='.'; }   unless ($descriptfilter) { $descriptfilter='.'; }
         unless ($instcodefilter) { $instcodefilter='.'; }          unless ($instcodefilter) { $instcodefilter='.'; }
         unless ($ownerfilter) { $ownerfilter='.'; }          unless ($ownerfilter) { $ownerfilter='.'; }
           unless ($coursefilter) { $coursefilter='.'; }
         my $timefilter=($sincefilter==-1?1:time-$sincefilter);          my $timefilter=($sincefilter==-1?1:time-$sincefilter);
  my %courses=   my %courses=
     &Apache::lonnet::courseiddump      &Apache::lonnet::courseiddump
     ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter);      ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter);
  $r->print('<form name="courselist">');   $r->print('<form name="courselist">');
  my %by_descrip;   my %by_descrip;
  foreach my $course (keys %courses) {   foreach my $course (keys %courses) {

Removed from v.1.27  
changed lines
  Added in v.1.28


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