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

Diff for /loncom/interface/lonpickcourse.pm between versions 1.97 and 1.98

version 1.97, 2010/06/19 01:28:35 version 1.98, 2010/06/25 04:37:49
Line 183  sub handler { Line 183  sub handler {
 # ---------------------------------------------------------------- Get the data  # ---------------------------------------------------------------- Get the data
     if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) ||       if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) || 
          $onlyown) {           $onlyown) {
           my $domcloner;
           if ($env{'form.form'} eq 'ccrs') {
               if (($env{'request.role.domain'} eq $env{'form.domainfilter'}) &&
                   (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
                   $domcloner = 1;
               }
           }
         my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles,          my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles,
                                       $cloneruname,$clonerudom);                                        $cloneruname,$clonerudom,$domcloner);
         if ($nohost) {          if ($nohost) {
             $r->print ('<span class="LC_warning">'.              $r->print ('<span class="LC_warning">'.
                        &mt('User does not exist - username: [_1], domain: [_2].',                         &mt('User does not exist - username: [_1], domain: [_2].',
Line 405  sub display_matched_courses { Line 412  sub display_matched_courses {
                 $instcode = $courses{$course}{'inst_code'};                  $instcode = $courses{$course}{'inst_code'};
                 $ttype = $courses{$course}{'type'};                  $ttype = $courses{$course}{'type'};
                 if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {                  if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) {
                     if ($cc_cloneable{$courses{$course}{'cnum'}.':'.$courses{$course}{'domain'}}) {                      if ($env{'form.form'} eq 'ccrs') {
                         $canclone = 1;                          if (($env{'request.role.domain'} eq $cdom) &&
                               (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'}))) {
                               $canclone = 1;
                           }
                       }
                       unless ($canclone) { 
                           if ($cc_cloneable{$cnum.':'.$cdom}) {
                               $canclone = 1;
                           }
                     }                      }
                     unless ($canclone) {                      unless ($canclone) {
                         my $cloners = $courses{$course}{'cloners'};                          my $cloners = $courses{$course}{'cloners'};
Line 865  sub instcode_selectors { Line 880  sub instcode_selectors {
 }  }
   
 sub search_courses {  sub search_courses {
     my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom) = @_;      my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner) = @_;
     my (%courses,%showcourses,$cloner,$ccrole);      my (%courses,%showcourses,$cloner,$ccrole);
     if ($type eq 'Community') {      if ($type eq 'Community') {
         $ccrole = 'co';          $ccrole = 'co';
Line 924  sub search_courses { Line 939  sub search_courses {
                                           undef,undef,$type,$regexpok,undef,undef,                                            undef,undef,$type,$regexpok,undef,undef,
                                           undef,undef,$cloner,$env{'form.cc_clone'},                                            undef,undef,$cloner,$env{'form.cc_clone'},
                                           $filter->{'cloneableonly'},                                            $filter->{'cloneableonly'},
                                           $createdbefore,$createdafter);                                            $createdbefore,$createdafter,undef,
                                             $domcloner);
         if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) {          if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) {
             my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'},              my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'},
                                                          $filter->{'persondomfilter'},                                                           $filter->{'persondomfilter'},
Line 1204  Side Effects: None Line 1220  Side Effects: None
   
 =item *  =item *
 X<search_courses()>  X<search_courses()>
 B<search_courses($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom)>:  B<search_courses($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,
                    $domcloner)>:
   
   
 Input: 7 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories; optional username of new course owner, optional domain of new course owner). Last two needed when search is for courses to clone from course request form, or course creation form (DC).     Input: 8 -  request object, course type, search scope: only courses in which user has active role (1), or any course (0); anonymous hash of criteria and their values; for institutional codes - number of categories; optional username of new course owner, optional domain of new course owner). Last two needed when search is for courses to clone from course request form, or course creation form (DC). Optional "domcloner" flag (has value=1 if user has ccc priv in  
   domain being filtered by (used when DC is using course creation form).
   
 Output: 1 - %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.  Output: 1 - %courses - hash of courses satisfying search criteria, keys = course IDs, values are corresponding colon-separated escaped description, institutional code, owner and type.
   
Removed from v.1.97  
changed lines
  Added in v.1.98

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