[BACK]Return to lonpickcourse.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonpickcourse.pm between versions 1.50.2.1 and 1.50.2.2

version 1.50.2.1, 2006/06/29 17:44:03 version 1.50.2.2, 2006/08/11 22:14:10
Line 53  sub handler { Line 53  sub handler {
        'cdomelement','cnameelement','roleelement',         'cdomelement','cnameelement','roleelement',
                                'pickedcourse','instcodefilter',                                 'pickedcourse','instcodefilter',
                                'ownerfilter','coursefilter','multiple',                                 'ownerfilter','coursefilter','multiple',
                                'type']);                                 'type','ownerdomfilter']);
 # 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 70  sub handler { Line 70  sub handler {
     my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"');      my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"');
 # course owner filter  # course owner filter
     my $ownerfilter=$env{'form.ownerfilter'};      my $ownerfilter=$env{'form.ownerfilter'};
     unless ($ownerfilter) { $ownerfilter=''; }      $ownerfilter=~s/\W//g;
     my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');      my $listowner=&HTML::Entities::encode($ownerfilter,'<>&"');
   # course ownerdomain filter
       my $ownerdomfilter=$env{'form.ownerdomfilter'};
       $ownerdomfilter=~s/\W//g;
       my $ownerdomselectform=
          &Apache::loncommon::select_dom_form($ownerdomfilter,'ownerdomfilter',1);
 # course ID filter for DCs only  # course ID filter for DCs only
     my ($courseidtag,$coursefilter);      my ($courseidtag,$coursefilter);
     if ($env{'user.adv'} && $domainfilter && exists($env{'user.role.dc./'.      if ($env{'user.adv'} && $domainfilter && exists($env{'user.role.dc./'.
Line 243  function setGroups() { Line 248  function setGroups() {
       'cdo' => &mt('[_1] Domain',$type),        'cdo' => &mt('[_1] Domain',$type),
               'cin' => &mt('Course Institutional Code'),                'cin' => &mt('Course Institutional Code'),
               'cow' => &mt("[_1] Owner's Username",$type),                'cow' => &mt("[_1] Owner's Username",$type),
                 'cod' => &mt("[_1] Owner's Domain", $type),
               'cog' => &mt('Course or Group')                'cog' => &mt('Course or Group')
              );               );
         
Line 272  function setGroups() { Line 278  function setGroups() {
     }      }
     my $instcodeform;      my $instcodeform;
     if ($type eq 'Course') {      if ($type eq 'Course') {
         $instcodeform = $lt{'cin'}.':<input type="text" name="instcodefilter"           $instcodeform = $lt{'cin'}.': <input type="text" name="instcodefilter" 
  size="10" value="'.$listinstcode.'" /><br />';   size="10" value="'.$listinstcode.'" /><br />';
     }      }
   
     my %elements = (      my %elements = (
                      Course => {                       Course => {
                                  name  => 'coursepick',                                   name  => 'coursepick',
Line 403  $instcodeform Line 408  $instcodeform
 $lt{'cow'}:  $lt{'cow'}:
 <input type="text" name="ownerfilter" size="10" value="$listowner" />  <input type="text" name="ownerfilter" size="10" value="$listowner" />
 <br />  <br />
   $lt{'cod'}: $ownerdomselectform
   <br />
 $courseidtag  $courseidtag
 $lt{'cde'}:  $lt{'cde'}:
 <input type="text" name="descriptfilter" size="40" value="$listdescript" />  <input type="text" name="descriptfilter" size="40" value="$listdescript" />
Line 416  ENDSCRIPT Line 423  ENDSCRIPT
         $r->rflush();          $r->rflush();
  unless ($descriptfilter) { $descriptfilter='.'; }   unless ($descriptfilter) { $descriptfilter='.'; }
         unless ($instcodefilter) { $instcodefilter='.'; }          unless ($instcodefilter) { $instcodefilter='.'; }
         unless ($ownerfilter) { $ownerfilter='.'; }          my $combownerfilter;
         unless ($coursefilter) { $coursefilter='.'; }          if (($ownerfilter ne '') || ($ownerdomfilter ne '')) {
         unless ($type) { $type = '.'; }              $combownerfilter = $ownerfilter.':'.$ownerdomfilter;
           }
           if ($combownerfilter eq '') { $combownerfilter='.'; }
           if ($coursefilter eq '') { $coursefilter='.'; }
           if ($type eq '') { $type = '.'; }
         my $timefilter=($sincefilter==-1?1:time-$sincefilter);          my $timefilter=($sincefilter==-1?1:time-$sincefilter);
  my %courses=   my %courses = &Apache::lonnet::courseiddump($domainfilter,$descriptfilter,
     &Apache::lonnet::courseiddump                                       $timefilter,$instcodefilter,$combownerfilter,
     ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter,undef,undef,$type);                                       $coursefilter,undef,undef,$type);
  $r->print('<form name="courselist" method="post" action="/adm/pickcourse">');   $r->print('<form name="courselist" method="post" action="/adm/pickcourse">');
  my %by_descrip;   my %by_descrip;
         my $numcourses = keys(%courses);          my $numcourses = keys(%courses);
Removed from v.1.50.2.1  
changed lines
  Added in v.1.50.2.2

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