--- loncom/interface/lonpickcourse.pm 2006/11/13 20:50:57 1.56 +++ loncom/interface/lonpickcourse.pm 2009/08/19 19:51:22 1.86 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.56 2006/11/13 20:50:57 albertel Exp $ +# $Id: lonpickcourse.pm,v 1.86 2009/08/19 19:51:22 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,8 +35,8 @@ use Apache::loncoursedata; use Apache::lonnet; use Apache::lonlocal; use Apache::longroup; -use lib '/home/httpd/lib/perl/'; -use LONCAPA; +use Apache::courseclassifier; +use LONCAPA qw(:DEFAULT :match); sub handler { my $r = shift; @@ -50,50 +50,69 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement', 'cdomelement','cnameelement','roleelement', - 'multiple','type','setroles']); - + 'multiple','type','setroles','fixeddom','cloner']); my ($type,$title,$jscript,$multelement,$multiple,$roleelement, - $lastaction,$autosubmit,$submitopener); + $lastaction,$autosubmit,$submitopener,$cloneruname,$clonerudom); - # Get course type - Course or Non-standard course. + # Get course type - Course or Community. $type = $env{'form.type'}; if (!defined($env{'form.type'})) { $type = 'Course'; } - $title = &mt('Selecting a [_1]',$type); + $title = 'Selecting a '.$type; # Setup for multiple course selections, if flag for multiples set. $multiple = $env{'form.multiple'}; if ($multiple) { ($jscript,$multelement) = &multiples_tag(); - $title = &mt('Selecting [_1](s)',lc($type)); + $title = 'Selecting '.$type.'(s)'; } # if called when a DC is selecting a course my $roledom = $env{'form.roleelement'}; if ($roledom) { $roleelement = ''; - $submitopener = &Apache::lonroles::processpick(); + $submitopener = &processpick(); $autosubmit = 'process_pick("'.$roledom.'")'; } + # if called when a DC is creating a course + if ($env{'form.form'} eq 'ccrs') { + ($cloneruname,$clonerudom) = ($env{'form.cloner'} =~ /^($match_username):($match_domain)$/); + } + + # if called when requesting a course + if ($env{'form.form'} eq 'requestcrs') { + $cloneruname = $env{'user.name'}; + $clonerudom = $env{'user.domain'}; + } + my $onlyown = 0; # if called to assign course-based portfolio access control - if ((($env{'form.form'} eq 'portform') && ($env{'user.adv'}))) { + if ((($env{'form.form'} eq 'portform') && (!$env{'user.adv'}))) { $onlyown = 1; } my %loaditem; - if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) { - $loaditem{'onload'} ="setSections()"; + if (($env{'form.type'} eq 'Course') && ($env{'form.numtitles'})) { + if (($env{'form.official'} eq 'on') && ($env{'form.state'} eq 'listing')) { + $loaditem{'onload'} = 'setElements(document.filterpicker); '; + } + } + + if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && + ($env{'form.pickedcourse'})) { + $loaditem{'onload'} .= 'setSections()'; } - $r->print(&Apache::loncommon::start_page($title,undef, + my $js = &js_changer(); + $r->print(&Apache::loncommon::start_page($title,$js, {'add_entries' => \%loaditem, 'no_nav_bar' => 1, })); if ($env{'form.form'} eq 'portform') { $lastaction = 'document.courselist.submit()'; - } elsif ($env{'form.form'} eq 'cu') { + } elsif ($env{'form.form'} eq 'cu' || ($env{'form.form'} eq 'studentform' && + !$multiple)) { $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". 'document.courselist.submit();'; @@ -102,41 +121,132 @@ sub handler { } # if called to assign a role in a course to a user via CUSR - if ($env{'form.form'} eq 'cu') { - $r->print(&create_user_javascript($type)); + if ($env{'form.form'} eq 'cu' || $env{'form.form'} eq 'studentform') { + $r->print(&create_user_javascript($type)); } # print javascript functions for choosing a course - if ($env{'form.gosearch'} || $onlyown) { - $r->print(&gochoose_javascript($type,$autosubmit,$lastaction)); + if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) || + $onlyown) { + $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction)); } - $r->print(''); + $r->print(''); $r->print($submitopener); # ------------------------------------------ Display of filters to limit search - my (%filter,%list); + my $filter = {}; + my $action = '/adm/pickcourse'; + my ($numtitles,$showroles,$nohost); if (!$onlyown) { my $filterlist = ['domainfilter','descriptfilter', - 'instcodefilter','ownerfilter', - 'ownerdomfilter']; + 'instcodefilter']; + if ($env{'form.form'} eq 'rules') { + push(@{$filterlist},'personfilter'); + if (($env{'form.personfilter'} ne '') && ($env{'form.persondomfilter'} ne '')) { + if (&Apache::lonnet::homeserver($env{'form.personfilter'}, + $env{'form.persondomfilter'}) eq 'no_host') { + $nohost = 1; + } else { + $showroles = 1; + } + } + } else { + push(@{$filterlist},'ownerfilter'); + } # course ID filter for DCs only if ($env{'user.adv'} && $env{'form.domainfilter'} && exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})) { push(@{$filterlist},'coursefilter'); } + if ($cloneruname ne '' && $clonerudom ne '') { + push(@{$filterlist},'cloneableonly'); + } + $r->print(&build_filters($filterlist,$type,$roleelement,$multelement, - \%filter,\%list)); + $filter,$action,\$numtitles,undef,$cloneruname, + $clonerudom)); } # ---------------------------------------------------------------- Get the data - if ($env{'form.gosearch'} || $onlyown) { - my %courses = &search_courses($r,$type,$onlyown,\%filter); - &display_matched_courses($r,$type,$multiple,%courses); + if ((($env{'form.gosearch'}) && ($env{'form.updater'} eq '')) || + $onlyown) { + my %courses = &search_courses($r,$type,$onlyown,$filter,$numtitles, + $cloneruname,$clonerudom); + if ($nohost) { + $r->print (''. + &mt('User does not exist - username: [_1], domain: [_2].', + ''.$filter->{'personfilter'}.'', + ''.$filter->{'persondomfilter'}.'').''); + } else { + &display_matched_courses($r,$type,$multiple,$action,$showroles,$cloneruname, + $clonerudom,%courses); + } } $r->print(&Apache::loncommon::end_page()); return OK; } +sub js_changer { + return <<"ENDJS"; + + +ENDJS + +} + +sub processpick { + my $openerform = 'rolechoice'; + if ($env{'form.form'} eq 'studentform') { + $openerform = $env{'form.form'}; + } + my $process_pick = <<"ENDONE"; + +"; + return $process_pick; +} + sub create_user_javascript { my ($type) = @_; my $output; @@ -166,17 +276,44 @@ function setSections() { } sub display_matched_courses { - my ($r,$type,$multiple,%courses) = @_; - my $action = '/adm/pickcourse'; + my ($r,$type,$multiple,$action,$showroles,$cloneruname,$clonerudom,%courses) = @_; if ($env{'form.form'} eq 'portform') { $action = '/adm/portfolio'; } + my $numcourses = keys(%courses); $r->print('
'); + if ($env{'form.form'} eq 'modifycourse') { + if ($numcourses > 0) { + my $cctitle = &Apache::lonnet::plaintext('cc',$type); + my $dctitle = &Apache::lonnet::plaintext('dc'); + my $ccrolechk = ' checked="checked" '; + my $menuchk = ' '; + if ($env{'form.prevphase'} ne '') { + $ccrolechk = ' '; + $menuchk = ' checked="checked" '; + } + $r->print( + '
' + .''.&mt('Action').'' + .'
' + .'
' + .'
' + .'
' + ); + } + } my %by_descrip; - my $numcourses = keys(%courses); foreach my $course (keys(%courses)) { my $descr; - if ($courses{$course} =~ m/^([^:]*):/i) { + if (ref($courses{$course}) eq 'HASH') { + $descr = $courses{$course}{'description'}; + } elsif ($courses{$course} =~ m/^([^:]*):/i) { $descr = &unescape($1); } else { $descr = &unescape($courses{$course}); @@ -184,6 +321,7 @@ sub display_matched_courses { my $description = $descr; push (@{$by_descrip{$description}}, $course); } + if ($numcourses > 1 && $multiple) { $r->print(' @@ -191,38 +329,116 @@ sub display_matched_courses { onclick="javascript:uncheckAll(document.courselist.course_id)" />

'); } + + if (%courses) { + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print(''.&mt('Select').'' + .''.&mt('Course Title').'' + .''.&mt('Domain').'' + .''.&mt('Course Code').'' + .''.&mt('Owner/Co-owner(s)').'' + .''.&mt('Type').'' + ); + if ($showroles) { + $r->print(''.&mt("Role(s) for [_1]", + &Apache::loncommon::plainname($env{'form.personfilter'}, + $env{'form.persondomfilter'},'firstname')).''); + } + $r->print(&Apache::loncommon::end_data_table_header_row()); + } foreach my $description (sort { lc($a) cmp lc($b) } (keys(%by_descrip))) { foreach my $course (@{$by_descrip{$description}}) { + $r->print(&Apache::loncommon::start_data_table_row()); my $cleandesc=&HTML::Entities::encode($description,'<>&"'); $cleandesc=~s/'/\\'/g; my ($cdom,$cnum)=split(/\_/,$course); - my ($descr,$instcode,$owner,$ttype) = split/:/,$courses{$course}; - $r->print(&course_chooser($multiple,$cdom,$cnum,$cleandesc)); - $r->print($description.'('. - ($Apache::lonnet::domaindescription{$cdom}? - $Apache::lonnet::domaindescription{$cdom}:$cdom).")"); - unless ($instcode eq '') { - $r->print(" - ".&unescape($instcode)); + my ($descr,$instcode,$ttype,$canclone,@owners); + if (ref($courses{$course}) eq 'HASH') { + $descr = $courses{$course}{'description'}; + $instcode = $courses{$course}{'inst_code'}; + $ttype = $courses{$course}{'type'}; + if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) { + my $cloners = $courses{$course}{'cloners'}; + if ($cloners ne '') { + my @cloneable = split(',',$cloners); + if (grep(/^\*$/,@cloneable)) { + $canclone = 1; + } + if (grep(/^\*:\Q$env{'form.clonerudom'}\E$/,@cloneable)) { + $canclone = 1; + } + if (grep(/^\Q$cloneruname\E:\Q$clonerudom\E$/,@cloneable)) { + $canclone = 1; + } + } + } + push(@owners,&unescape($courses{$course}{'owner'})); + if (ref($courses{$course}{'co-owners'}) eq 'ARRAY') { + foreach my $item (@{$courses{$course}{'co-owners'}}) { + push(@owners,&unescape($item)); + } + } + } else { + my $singleowner; + ($descr,$instcode,$singleowner,$ttype)=split(/:/,$courses{$course}); + push(@owners,&unescape($singleowner)); + } + my $ownerstr = join(', ',@owners); + $r->print(''.&course_chooser($multiple,$cdom,$cnum,$cleandesc,$canclone).''); + $r->print(''.$description.''); + $r->print(''); + $r->print(&Apache::lonnet::domain($cdom,'description')? + $cdom.' ('.&Apache::lonnet::domain($cdom,'description').')':$cdom); + $r->print(''); + $r->print(''); + if ($instcode ne '') { + $r->print(&unescape($instcode)); + } else { + $r->print(' '); } - unless ($owner eq '') { - $r->print(", owner - ".&unescape($owner)); + $r->print(''); + $r->print(''.$ownerstr.''); + $r->print(''); + if ($ttype ne '') { + $r->print(&mt(&unescape($ttype))); + } else { + $r->print(' '); } - unless ($ttype eq '') { - $r->print('('.&unescape($ttype).')'); + $r->print(''); + if ($showroles) { + $r->print(''); + my $rolestr; + if (ref($courses{$course}{'roles'}) eq 'ARRAY') { + my @roles = sort(@{$courses{$course}{'roles'}}); + foreach my $role (@roles) { + if ($role =~ /^cr/) { + my (undef,$crdom,$crname,$crtitle) = split('/',$role); + $rolestr .= $crtitle.', '; + } else { + $rolestr .= &Apache::lonnet::plaintext($role,$ttype).', '; + } + } + $rolestr =~ s/\, $//; + } + $r->print($rolestr.''); } if ($multiple) { $r->print("\n"); } - $r->print("
\n"); + $r->print(&Apache::loncommon::end_data_table_row()); + # $r->print("
\n"); } } + if (%courses) { + $r->print(&Apache::loncommon::end_data_table()); + } + if (!%courses) { $r->print(&mt('None found')); } elsif ($multiple) { - $r->print(''); + $r->print(''); } $r->print(''. "\n".''."\n". - ''."\n". - ''."\n". ''."\n"); if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) { $r->print(''); $r->print(''); $r->print(''); + } elsif ($env{'form.form'} eq 'modifycourse') { + $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form','numtitles','state'])); + } else { + $r->print(''."\n". + ''."\n"); + } + if ((exists($env{'form.fixeddom'})) && ($env{'form.form'} eq 'rules')) { + $r->print(''); + } + if ($env{'form.numtitles'}) { + $r->print(''); } $r->print("
\n"); return; } - sub multiples_tag { my $jscript = &Apache::loncommon::check_uncheck_jscript(); my $multelement = ''; @@ -246,24 +476,77 @@ sub multiples_tag { } sub build_filters { - my ($filterlist,$type,$roleelement,$multelement,$filter) = @_; - my $list; - my ($domainselectform,$sincefilterform,$ownerdomselectform, - $instcodeform,$typeselectform); + my ($filterlist,$type,$roleelement,$multelement,$filter,$action, + $numtitlesref,$caller,$cloneruname,$clonerudom) = @_; + my ($list,$formname,$fixeddom,$codedom,$jscript); + $codedom = $env{'request.role.domain'}; + if (defined($env{'form.form'})) { + $formname = $env{'form.form'}; + } else { + $formname = $caller; + } + my $onchange; + unless ($env{'form.interface'} eq 'textual') { + $onchange = 'javascript:updateFilters(this)'; + } + my ($domainselectform,$sincefilterform,$ownerdomselectform,$persondomselectform, + $instcodeform,$typeselectform,$instcodetitle); foreach my $item (@{$filterlist}) { $filter->{$item} = $env{'form.'.$item}; if ($item ne 'descriptfilter' && $item ne 'instcodefilter') { - $filter->{$item} =~ s/\W//g; + if ($item eq 'domainfilter') { + $filter->{$item} = &LONCAPA::clean_domain($filter->{$item}); + } elsif ($item eq 'coursefilter') { + $filter->{$item} = &LONCAPA::clean_courseid($filter->{$item}); + } elsif ($item eq 'ownerfilter') { + $filter->{$item} = &LONCAPA::clean_username($filter->{$item}); + $filter->{'ownerdomfilter'} = + &LONCAPA::clean_domain($env{'form.ownerdomfilter'}); + $ownerdomselectform = + &Apache::loncommon::select_dom_form($filter->{'ownerdomfilter'}, + 'ownerdomfilter',1); + } elsif ($item eq 'personfilter') { + $filter->{$item} = &LONCAPA::clean_username($filter->{$item}); + if ($env{'form.persondomfilter'} eq '') { + unless ($env{'form.gosearch'}) { + $filter->{'persondomfilter'} = $env{'request.role.domain'}; + } + } else { + $filter->{'persondomfilter'} = + &LONCAPA::clean_domain($env{'form.persondomfilter'}); + } + $persondomselectform = + &Apache::loncommon::select_dom_form($filter->{'persondomfilter'}, + 'persondomfilter',1); + } else { + $filter->{$item} =~ s/\W//g; + } if (!$filter->{$item}) { $filter->{$item} = ''; } } if ($item eq 'domainfilter') { - $domainselectform = - &Apache::loncommon::select_dom_form($filter->{$item},'domainfilter',1); - } elsif ($item eq 'ownerdomfilter') { - $ownerdomselectform = - &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1); + my $allow_blank = 1; + if ($formname eq 'portform') { + $filter->{$item} ||= $env{'user.domain'}; + $allow_blank=0; + } elsif ($formname eq 'studentform') { + $filter->{$item} ||= $env{'request.role.domain'}; + $allow_blank=0; + } + if ($env{'form.fixeddom'}) { + $domainselectform = ''. + &Apache::lonnet::domain($env{'request.role.domain'}, + 'description'); + $codedom = $env{'request.role.domain'}; + } else { + $domainselectform = + &Apache::loncommon::select_dom_form($filter->{$item}, + 'domainfilter', + $allow_blank,'',$onchange); + $codedom = $filter->{'domainfilter'}; + } } else { $list->{$item} = &HTML::Entities::encode($filter->{$item},'<>&"'); } @@ -286,177 +569,376 @@ sub build_filters { '15552000','31104000'])); my %lt = ( - 'cac' => &mt('[_1] Activity',$type), - 'cde' => &mt('[_1] Description',$type), - 'cdo' => &mt('[_1] Domain',$type), - 'cin' => &mt('Course Institutional Code'), - 'cow' => &mt("[_1] Owner's Username",$type), - 'cod' => &mt("[_1] Owner's Domain", $type), - 'cog' => &mt('Course Type') + 'cac' => &mt("$type Activity"), + 'cde' => &mt("$type Title"), + 'cdo' => &mt("$type Domain"), + 'ins' => &mt('Institutional Code'), + 'inc' => &mt('Institutional Categorization'), + 'cow' => &mt("$type Owner/Co-owner"), + 'cop' => &mt("$type Personnel Includes"), + 'cog' => &mt('Type') ); $typeselectform = ' '.&mt('Required').''.(' 'x3).''; + if ($env{'form.form'} eq 'ccrs') { + $cloneabletitle = &mt('Cloneable for').' '.$cloneruname.':'.$clonerudom; + } else { + $cloneabletitle = &mt('Cloneable by you'); + } } - $typeselectform.=""; - my $name_input; - if ($env{'form.cnameelement'} ne '') { - $name_input =''; + my $officialjs; + if ($type eq 'Course') { + if (exists($filter->{'instcodefilter'})) { + if (($env{'form.fixeddom'}) || ($formname eq 'requestcrs') + || ($formname eq 'modifycourse')) { + $officialjs = 1; + ($instcodeform,$jscript,$$numtitlesref) = + &instcode_selectors($codedom,'filterpicker',$officialjs); + if ($jscript) { + $jscript = ''."\n"; + } + } + if ($instcodeform eq '') { + $instcodeform = + ''; + $instcodetitle = $lt{'ins'}; + } else { + $instcodetitle = $lt{'inc'}; + } + if ($env{'form.fixeddom'}) { + $instcodetitle .= '
('.$codedom.')'; + } + } } - my $courseidtag; - if (exists($filter->{'coursefilter'})) { - $courseidtag=&mt('LON-CAPA course ID'). - ':
'; + + foreach my $posstype ('Course','Community') { + $typeselectform.='\n"; } - my $output = <<"END"; -
+ $typeselectform.=""; + my $output = qq| + + +|; + if ($formname eq 'modifycourse') { + $output .= ''."\n". + ''."\n"; + } else { + my $name_input; + if ($env{'form.cnameelement'} ne '') { + $name_input = ''; + } + $output .= qq| $name_input - $roleelement $multelement -$lt{'cac'}: $sincefilterform -
-$lt{'cdo'}: $domainselectform -
-$lt{'cog'}: $typeselectform -
-$instcodeform -$lt{'cow'}: - -
-$lt{'cod'}: $ownerdomselectform -
-$courseidtag -$lt{'cde'}: - -

-
-
-END - return $output; +|; + if ($formname eq 'portform') { + $output .= ''."\n"; + } + } + if ($env{'form.fixeddom'}) { + $output .= ''."\n"; + } + $output .= "
\n".&Apache::lonhtmlcommon::start_pick_box(); + if ($sincefilterform) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cac'}) + .$sincefilterform + .&Apache::lonhtmlcommon::row_closure(); + } + if ($domainselectform) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cdo'}) + .$domainselectform + .&Apache::lonhtmlcommon::row_closure(); + } + if ($typeselectform) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cog'}) + .$typeselectform + .&Apache::lonhtmlcommon::row_closure(); + } + if ($instcodeform) { + $output .= &Apache::lonhtmlcommon::row_title($instcodetitle) + .$instcodeform + .&Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'ownerfilter'})) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cow'}). + '
'.&mt('Username').'
'. + '		'.&mt('Domain').'
'. + $ownerdomselectform.'
'. + &Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'personfilter'})) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cop'}). + '
'.&mt('Username').'
'. + '		'.&mt('Domain').'
'. + $persondomselectform.'
'. + &Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'coursefilter'})) { + $output .= &Apache::lonhtmlcommon::row_title(&mt('LON-CAPA course ID')) + .'' + .&Apache::lonhtmlcommon::row_closure(); + } + if ($cloneableonlyform) { + $output .= &Apache::lonhtmlcommon::row_title($cloneabletitle). + $cloneableonlyform.&Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'descriptfilter'})) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cde'}) + .'' + .&Apache::lonhtmlcommon::row_closure(1); + } + $output .= &Apache::lonhtmlcommon::end_pick_box().'

'; + my $warning; + if (($env{'form.form'} eq 'ccrs') || ($env{'form.form'} eq 'requestcrs')) { + my $cloneruhome=&Apache::lonnet::homeserver($cloneruname,$clonerudom); + my $cc_clone; + if ($cloneruhome eq 'no_host') { + $warning = '

'.&mt('Intended course owner does not exist'). + '
'; + } else { + if ($env{'form.form'} eq 'ccrs') { + $output .= ''."\n"; + } + my %ccroles = &Apache::lonnet::get_my_roles($cloneruname,$clonerudom, + 'userroles',['active'], ['cc']); + foreach my $key (sort(keys(%ccroles))) { + my ($cnum,$cdom,$role) = split(':',$key); + $cc_clone .= $cdom.':'.$cnum.'&'; + } + $cc_clone =~ s/\&$//; + } + if ($cc_clone ne '') { + $output .= ''; + } + } + $output .= ''."\n". + '

'."\n".''."\n".'
'."\n"; + return $jscript.$warning.$output; +} + +sub instcode_selectors { + my ($codedom,$formname,$officialjs) = @_; + my ($output,@codetitles,%cat_titles,%cat_order,%cat_items); + my ($jscript,$totcodes,$numtitles,$lasttitle) = + &Apache::courseclassifier::instcode_selectors_data($codedom,$formname, + \%cat_items,\@codetitles,\%cat_titles,\%cat_order,$officialjs); + if ($numtitles > 0) { + my $official = ' checked="checked" '; + my $unofficial = ''; + if ($env{'form.official'} eq 'off') { + $unofficial = $official; + $official = ''; + } + $output .= ''.&mt('Official course:').' '.(' 'x3).'
'. + &Apache::courseclassifier::build_instcode_selectors($numtitles, + $lasttitle,\%cat_items,\@codetitles,\%cat_titles,\%cat_order)."\n". + ''."\n". + ''."\n"; + + } + return ($output,$jscript,$numtitles); } sub search_courses { - my ($r,$type,$onlyown,$filter) = @_; - my %courses; + my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom) = @_; + my (%courses,%showcourses,$cloner); if (!$onlyown) { - $r->print(&mt('Searching').' ...
 
'); + $r->print(&mt('Searching ...').'
 
'); $r->rflush(); if (($filter->{'ownerfilter'} ne '') || ($filter->{'ownerdomfilter'} ne '')) { $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'. $filter->{'ownerdomfilter'}; } - foreach my $item ('descriptfilter','instcodefilter','coursefilter', - 'combownerfilter') { + foreach my $item ('descriptfilter','coursefilter','combownerfilter') { if (!$filter->{$item}) { $filter->{$item}='.'; } } - if ($type eq '') { $type = '.'; } my $timefilter = ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'}); + my ($instcodefilter,$regexpok); + if ($numtitles) { + if ($env{'form.official'} eq 'on') { + $instcodefilter = + &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles); + $regexpok = 1; + } elsif ($env{'form.official'} eq 'off') { + $instcodefilter = &Apache::courseclassifier::instcode_search_str($filter->{'domainfilter'},$numtitles); + unless ($instcodefilter eq '') { + $regexpok = -1; + } + } + } else { + $instcodefilter = $filter->{'instcodefilter'}; + } + if ($instcodefilter eq '') { $instcodefilter = '.'; } + if ($type eq '') { $type = '.'; } + + if (($clonerudom ne '') && ($cloneruname ne '')) { + $cloner = $cloneruname.':'.$clonerudom; + } %courses = &Apache::lonnet::courseiddump($filter->{'domainfilter'}, $filter->{'descriptfilter'}, $timefilter, - $filter->{'instcodefilter'}, + $instcodefilter, $filter->{'combownerfilter'}, $filter->{'coursefilter'}, - undef,undef,$type); + undef,undef,$type,$regexpok,undef,undef, + undef,undef,$cloner,$env{'form.cc_clone'}, + $filter->{'cloneableonly'}); + if (($filter->{'personfilter'} ne '') && ($filter->{'persondomfilter'} ne '')) { + my %rolehash = &Apache::lonnet::get_my_roles($filter->{'personfilter'}, + $filter->{'persondomfilter'}, + 'userroles',undef, + ['cc','in','ad','ep','ta','cr'], + $filter->{'domainfilter'}); + foreach my $role (keys(%rolehash)) { + my ($cnum,$cdom,$courserole) = split(':',$role); + my $cid = $cdom.'_'.$cnum; + if (exists($courses{$cid})) { + if (ref($courses{$cid}) eq 'HASH') { + if (ref($courses{$cid}{roles}) eq 'ARRAY') { + if (!grep(/^\Q$courserole\E$/,@{$courses{$cid}{roles}})) { + push (@{$courses{$cid}{roles}},$courserole); + } + } else { + $courses{$cid}{roles} = [$courserole]; + } + $showcourses{$cid} = $courses{$cid}; + } + } + } + %courses = %showcourses; + } } else { $r->print('
'); - foreach my $cid (sort(&Apache::loncommon::findallcourses())) { - $courses{$cid} = $env{'course.'.$cid.'.description'}; + my %coursehash = &Apache::loncommon::findallcourses(); + foreach my $cid (sort(keys(%coursehash))) { + $courses{$cid}{'description'} = $env{'course.'.$cid.'.description'}; } } return %courses; } sub course_chooser { - my ($multiple,$cdom,$cnum,$cleandesc) = @_; + my ($multiple,$cdom,$cnum,$cleandesc,$canclone) = @_; my $output; if ($multiple) { $output = '