--- loncom/interface/lonpickcourse.pm 2006/07/03 04:00:34 1.51 +++ loncom/interface/lonpickcourse.pm 2008/12/14 04:29:15 1.75.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network # Pick a course # -# $Id: lonpickcourse.pm,v 1.51 2006/07/03 04:00:34 albertel Exp $ +# $Id: lonpickcourse.pm,v 1.75.2.1 2008/12/14 04:29:15 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,7 +35,6 @@ use Apache::loncoursedata; use Apache::lonnet; use Apache::lonlocal; use Apache::longroup; -use lib '/home/httpd/lib/perl/'; use LONCAPA; sub handler { @@ -46,443 +45,523 @@ sub handler { # ------------------------------------------------------------ Print the screen -# Get parameters from query string + # Get parameters from query string &Apache::loncommon::get_unprocessed_cgi - ($ENV{'QUERY_STRING'},['domainfilter','descriptfilter', - 'sincefilter','form','cnumelement', + ($ENV{'QUERY_STRING'},['domainfilter','form','cnumelement', 'cdomelement','cnameelement','roleelement', - 'pickedcourse','instcodefilter', - 'ownerfilter','coursefilter','multiple', - 'type']); -# domain filter and selection - my $domainfilter=$env{'form.domainfilter'}; - $domainfilter=~s/\W//g; - unless ($domainfilter) { $domainfilter=''; } - my $domainselectform=&Apache::loncommon::select_dom_form($domainfilter, - 'domainfilter',1); -# description filter - my $descriptfilter=$env{'form.descriptfilter'}; - unless ($descriptfilter) { $descriptfilter=''; } - my $listdescript=&HTML::Entities::encode($descriptfilter,'<>&"'); -# institutional code filter - my $instcodefilter=$env{'form.instcodefilter'}; - unless ($instcodefilter) { $instcodefilter=''; } - my $listinstcode=&HTML::Entities::encode($instcodefilter,'<>&"'); -# course owner filter - my $ownerfilter=$env{'form.ownerfilter'}; - unless ($ownerfilter) { $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|: -
- |; - } -# last course activity filter and selection - my $sincefilter=$env{'form.sincefilter'}; - $sincefilter=~s/[^\d-]//g; - unless ($sincefilter) { $sincefilter=-1; } - my $sincefilterform=&Apache::loncommon::select_form($sincefilter, - 'sincefilter',('-1'=>'', - '86400' => 'today', - '604800' => 'last week', - '2592000' => 'last month', - '7776000' => 'last three months', - '15552000' => 'last six months', - '31104000' => 'last year', - 'select_form_order' => - ['-1','86400','604800','2592000','7776000', - '15552000','31104000'])); -# if called from loncreateuser, report sections, then close - my (%loaditem,$seclist,$groupslist,$roleslist,$rolesnameslist, - $accesslist,$accessnameslist); - my $sec_element = 'currsec'; - my $grplist_element = 'groups'; - my $num_sections = 0; - my $num_groups = 0; - my $num_roles = 0; - my $num_access = 0; - my ($cdom,$cnum); - if ($env{'form.pickedcourse'}) { - ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; - } - my $type = $env{'form.type'}; + 'multiple','type','setroles']); + + my ($type,$title,$jscript,$multelement,$multiple,$roleelement, + $lastaction,$autosubmit,$submitopener); + + # Get course type - Course or Non-standard Course. + $type = $env{'form.type'}; if (!defined($env{'form.type'})) { $type = 'Course'; } - if ($env{'form.form'} eq 'cu' && $env{'form.pickedcourse'}) { + $title = &mt('Selecting a [_1]',$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)); + } + + # if called when a DC is selecting a course + my $roledom = $env{'form.roleelement'}; + if ($roledom) { + $roleelement = ''; + $submitopener = &processpick(); + $autosubmit = 'process_pick("'.$roledom.'")'; + } + + my $onlyown = 0; + # if called to assign course-based portfolio access control + if ((($env{'form.form'} eq 'portform') && (!$env{'user.adv'}))) { + $onlyown = 1; + } + + my %loaditem; + if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && + ($env{'form.pickedcourse'})) { $loaditem{'onload'} ="setSections()"; - ($seclist,$num_sections,$groupslist,$num_groups) = - &build_selection_lists($cdom,$cnum,$type,undef,undef, - $env{'form.form'}); - } -# if called from portfolio, report roles, sections, groups and close - my ($roles_element,$groups_element,$status_element,$setitems_function); - if ($env{'form.form'} eq 'portform' && $env{'form.pickedcourse'}) { - my ($row_id) = ($env{'form.cnumelement'} =~ /^crsnum_(\d+)$/); - $roles_element = 'role_'.$row_id.'_1'; - $groups_element = 'group_'.$row_id.'_1'; - $sec_element = 'section_'.$row_id.'_1'; - $status_element = 'access_'.$row_id.'_1'; - $grplist_element = 'grplist_'.$row_id.'_1'; - $loaditem{'onload'} ="setItems()"; - ($seclist,$num_sections,$groupslist,$num_groups,$roleslist,$num_roles, - $rolesnameslist,$accesslist,$num_access,$accessnameslist) = - &build_selection_lists($cdom,$cnum,$type,1,1,$env{'form.form'}); - $setitems_function = qq| -function setItems() { - opener.document.$env{"form.form"}.activate.checked = true; - setRoles(); - setGroups(); - setStatus(); - setSections(); -} - -function setRoles() { - var numRoles = $num_roles - var rolesArray = new Array("$roleslist"); - var roleNamesArray = new Array("$rolesnameslist"); - opener.document.$env{"form.form"}.$roles_element.length = 0; - if (numRoles == 0) { - opener.document.$env{"form.form"}.$roles_element.multiple=false; - opener.document.$env{"form.form"}.$roles_element.size=1; - opener.document.$env{"form.form"}.$roles_element.options[0] = new Option('No existing roles','',false,false); + } + $r->print(&Apache::loncommon::start_page($title,undef, + {'add_entries' => \%loaditem, + 'no_nav_bar' => 1, })); + + if ($env{'form.form'} eq 'portform') { + $lastaction = 'document.courselist.submit()'; + } elsif ($env{'form.form'} eq 'cu' || ($env{'form.form'} eq 'studentform' && + !$multiple)) { + $lastaction = + 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". + 'document.courselist.submit();'; } else { - if (numRoles == 1) { - opener.document.$env{"form.form"}.$roles_element.multiple=false; - opener.document.$env{"form.form"}.$roles_element.size=1; - opener.document.$env{"form.form"}.$roles_element.options[0] = new Option('Select','',true,true); - opener.document.$env{"form.form"}.$roles_element.options[1] = new Option(roleNamesArray[0],rolesArray[0],false,false); - } else { - for (var i=0; iprint(&create_user_javascript($type)); + } + + # print javascript functions for choosing a course + if ($env{'form.gosearch'} || $onlyown) { + $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction)); + } + $r->print(''); + $r->print($submitopener); + +# ------------------------------------------ Display of filters to limit search + my $filter = {}; + my $action = '/adm/pickcourse'; + if (!$onlyown) { + my $filterlist = ['domainfilter','descriptfilter', + 'instcodefilter','ownerfilter', + 'ownerdomfilter']; + # course ID filter for DCs only + if ($env{'user.adv'} && $env{'form.domainfilter'} && + exists($env{'user.role.dc./'.$env{'form.domainfilter'}.'/'})) { + push(@{$filterlist},'coursefilter'); } + $r->print(&build_filters($filterlist,$type,$roleelement,$multelement, + $filter,$action)); } -} -function setStatus() { - var numStatus = $num_access; - var statusArray = new Array("$accesslist"); - var statusNamesArray = new Array("$accessnameslist"); - opener.document.$env{"form.form"}.$status_element.multiple=true; - opener.document.$env{"form.form"}.$status_element.size=3; - for (var i=0; iprint(&Apache::loncommon::end_page()); + return OK; } -function setGroups() { - var numGroups = $num_groups; - var groupsArray = new Array("$groupslist"); - opener.document.$env{"form.form"}.$groups_element.length = 0; - if (numGroups == 0) { - opener.document.$env{"form.form"}.$groups_element.multiple=false; - opener.document.$env{"form.form"}.$groups_element.size=1; - opener.document.$env{"form.form"}.$groups_element.options[0] = new Option('No existing groups','',false,false); - } else { - if (numGroups == 1) { - opener.document.$env{"form.form"}.$groups_element.multiple=false; - opener.document.$env{"form.form"}.$groups_element.size=1; - opener.document.$env{"form.form"}.$groups_element.options[0] = new Option('Select','',true,true); - opener.document.$env{"form.form"}.$groups_element.options[1] = new Option('No group','',false,false); - opener.document.$env{"form.form"}.$groups_element.options[2] = new Option(groupsArray[0],groupsArray[0],false,false); - } else { - for (var i=0; i +function process_pick(dom) { + var pickedCourse=opener.document.$openerform.$env{'form.cnumelement'}.value; + var pickedDomain=opener.document.$openerform.$env{'form.cdomelement'}.value; + var okDomain = 0; +ENDONE + if ($openerform eq 'rolechoice') { + $process_pick .= <<"ENDTWO"; + if (pickedDomain == dom) { + if (pickedCourse != '') { + var courseTarget = "cc./"+pickedDomain+"/"+pickedCourse + opener.document.title='Role selected. Please stand by.'; + opener.status='Role selected. Please stand by.'; + opener.document.rolechoice.newrole.value=courseTarget + opener.document.rolechoice.submit(); } + } + else { + alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain"); } +ENDTWO + } else { + $process_pick .= <<"ENDTHREE"; + if (pickedDomain != dom) { + alert("You may only use this screen to select courses in the current domain: "+dom+"\\nPlease return to the roles page window and click the 'Select Course' link for domain: "+pickedDomain+",\\n if you are a Domain Coordinator in that domain, and wish to become a Course Coordinator in a course in the domain"); + return; + } +ENDTHREE + } + $process_pick .= " +} + + +"; + return $process_pick; } +sub create_user_javascript { + my ($type) = @_; + my $output; + #javascript for reporting sections and groups then closing + if ($env{'form.pickedcourse'}) { + my ($cdom,$cnum) = split/_/,$env{'form.pickedcourse'}; + my $sec_element = 'currsec'; + my $grplist_element = 'groups'; + my ($sections,$groups) = + &Apache::loncommon::get_secgrprole_info($cdom,$cnum,'',$type); + my $num_sections = scalar(@{$sections}); + my $seclist = join(',',@{$sections}); + my $num_groups = scalar(@{$groups}); + my $groupslist = join(',',@{$groups}); + $output = qq| + |; +; } - my $jscript; - my $typeselectform = '"; - my $title = &mt('Selecting a [_1]',$type); -# Setup for multiple course selections, if flag for multiples set. - my $multiple = $env{'form.multiple'}; - my $multelement; - if ($multiple) { - $title = &mt('Selecting [_1](s)',lc($type)); - $jscript = &Apache::loncommon::check_uncheck_jscript(); - $multelement = ''; + 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; + foreach my $course (keys(%courses)) { + my $descr; + if (ref($courses{$course}) eq 'HASH') { + $descr = $courses{$course}{'description'}; + } elsif ($courses{$course} =~ m/^([^:]*):/i) { + $descr = &unescape($1); + } else { + $descr = &unescape($courses{$course}); + } + my $description = $descr; + push (@{$by_descrip{$description}}, $course); } - $r->print(&Apache::loncommon::start_page($title,undef, - {'add_entries' => \%loaditem, - 'no_nav_bar' => 1, })); - 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), - 'cog' => &mt('Course or Group') - ); - - my ($name_code,$name_input); - if (defined($env{'form.cnameelement'}) && $env{'form.cnameelement'} ne '') { - $name_code = "opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=cdesc;"; - $name_input =''; - } - my $submitopener = ''; - my $autosubmit = ''; - my $roleelement = ''; - my $lastaction = 'self.close()'; - if ($env{'form.form'} eq 'cu') { - $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". - 'document.courselist.submit();'; + + if ($numcourses > 1 && $multiple) { + $r->print(' +    +

'); + } + + if (%courses) { + $r->print(&Apache::loncommon::start_data_table()); + $r->print(&Apache::loncommon::start_data_table_header_row()); + $r->print(''.&mt('Select').'' + .''.&mt('Course Description').'' + .''.&mt('Domain').'' + .''.&mt('Course Code').'' + .''.&mt('Owner/Co-owner(s)').'' + .''.&mt('Type').'' + ); + $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,$ttype,@owners); + if (ref($courses{$course}) eq 'HASH') { + $descr = $courses{$course}{'description'}; + $instcode = $courses{$course}{'inst_code'}; + $ttype = $courses{$course}{'type'}; + 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).''); + $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(' '); + } + $r->print(''); + $r->print(''.$ownerstr.''); + $r->print(''); + if ($ttype ne '') { + $r->print(&mt(&unescape($ttype))); + } else { + $r->print(' '); + } + $r->print(''); + if ($multiple) { $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(''. + "\n".''."\n". + ''."\n"); + if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) { + $r->print(''."\n"); } if ($env{'form.form'} eq 'portform') { - $lastaction = 'document.courselist.pickedcourse.value = cdom+"_"+cname;'."\n". - 'document.courselist.submit();'; - } - my $roledom = $env{'form.roleelement'}; - if ($roledom) { - $roleelement = ''; - $submitopener = &Apache::lonroles::processpick(); - $autosubmit = 'process_pick("'.$roledom.'")'; - } - my $instcodeform; - if ($type eq 'Course') { - $instcodeform = $lt{'cin'}.':
'; + $r->print(''); + $r->print(''); + $r->print(''); + $r->print(''); + } elsif ($env{'form.form'} eq 'modifycourse') { + $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','pickedcourse','type','form'])); + } else { + $r->print(''."\n". + ''."\n"); } + $r->print("
\n"); + return; +} - my %elements = ( - Course => { - name => 'coursepick', - total => 'coursetotal', - list => 'courselist', - }, - Group => { - name => 'grouppick', - total => 'grouptotal', - list => 'grouplist', - }, - ); - $r->print(< -function gochoose(cname,cdom,cdesc,multiple,caller) { - var openerForm = "$env{'form.form'}"; - courseCount = 0; - var courses = ''; - if (multiple) { - if (typeof(document.courselist.course_id.length) == 'undefined') { - // only 1 course checkbox was created - if (document.courselist.course_id.checked) { - courses = courses + document.courselist.course_id.value + "&&"; - courseCount ++; - } - } else { - for (var j=0; j 0) { - courses = courses.substr(0,courses.length-2); - opener.document.$env{'form.form'}.$elements{$type}{'list'}.value = courses; - } - } else { - $name_code - opener.document.$env{'form.form'}.$env{'form.cnumelement'}.value=cname; - var slct=opener.document.$env{'form.form'}.$env{'form.cdomelement'}; - if (slct.options == undefined) { - opener.document.$env{'form.form'}.$env{'form.cdomelement'}.value=cdom; - } - else { - var i; - for (i=0;i{$item} = $env{'form.'.$item}; + if ($item ne 'descriptfilter' && $item ne 'instcodefilter') { + if ($item eq 'domainfilter' || $item eq 'ownerdomfilter') { + $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}); + } else { + $filter->{$item} =~ s/\W//g; + } + if (!$filter->{$item}) { + $filter->{$item} = ''; } - opener.document.$env{"form.form"}.$sec_element.multiple=true - if (numSections < 3) { - opener.document.$env{"form.form"}.$sec_element.size=numSections; - } else { - opener.document.$env{"form.form"}.$sec_element.size=3; + } + if ($item eq 'domainfilter') { + 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; } - opener.document.$env{"form.form"}.$sec_element.options[0].selected = false + $domainselectform = + &Apache::loncommon::select_dom_form($filter->{$item}, + 'domainfilter', + $allow_blank); + } elsif ($item eq 'ownerdomfilter') { + $ownerdomselectform = + &Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1); + } else { + $list->{$item} = &HTML::Entities::encode($filter->{$item},'<>&"'); } } - opener.document.$env{"form.form"}.$grplist_element.value='$groupslist'; - self.close() -} -$setitems_function + # last course activity filter and selection + $filter->{'sincefilter'} = $env{'form.sincefilter'}; + $filter->{'sincefilter'} =~ s/[^\d-]//g; + if (!$filter->{'sincefilter'}) { $filter->{'sincefilter'}=-1; } + $sincefilterform=&Apache::loncommon::select_form($filter->{'sincefilter'}, + 'sincefilter',('-1'=>'', + '86400' => 'today', + '604800' => 'last week', + '2592000' => 'last month', + '7776000' => 'last three months', + '15552000' => 'last six months', + '31104000' => 'last year', + 'select_form_order' => + ['-1','86400','604800','2592000','7776000', + '15552000','31104000'])); -$jscript - -$submitopener -
+ my %lt = ( + 'cac' => &mt("$type Activity"), + 'cde' => &mt("$type Description"), + 'cdo' => &mt("$type Domain"), + 'cin' => &mt('Course Institutional Code'), + 'cow' => &mt("$type Owner's Username"), + 'cod' => &mt("$type Owner's Domain"), + 'cog' => &mt('Course Type') + ); + + $typeselectform = ''; + } + foreach my $posstype ('Course','Non-standard Course') { + $typeselectform.='\n"; + } + $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'}: - -
-$courseidtag -$lt{'cde'}: - -

-
-
-ENDSCRIPT -# ---------------------------------------------------------------- Get the data - if ($env{'form.gosearch'}) { - $r->print(&mt('Searching').' ...
 
'); +|; + if ($formname eq 'portform') { + $output .= ''; + } + } + + $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($lt{'cin'}) + .$instcodeform + .&Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'ownerfilter'})) { + $output .= &Apache::lonhtmlcommon::row_title($lt{'cow'}) + .'' + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title($lt{'cod'}) + .$ownerdomselectform + .&Apache::lonhtmlcommon::row_closure(); + } + if (exists($filter->{'coursefilter'})) { + $output .= &Apache::lonhtmlcommon::row_title(&mt('LON-CAPA course ID')) + .'' + .&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(); + $output .= '

'."\n".''."\n".'
'."\n"; + return $output; +} + +sub search_courses { + my ($r,$type,$onlyown,$filter) = @_; + my %courses; + if (!$onlyown) { + $r->print(&mt('Searching ...').'
 
'); $r->rflush(); - unless ($descriptfilter) { $descriptfilter='.'; } - unless ($instcodefilter) { $instcodefilter='.'; } - unless ($ownerfilter) { $ownerfilter='.'; } - unless ($coursefilter) { $coursefilter='.'; } - unless ($type) { $type = '.'; } - my $timefilter=($sincefilter==-1?1:time-$sincefilter); - my %courses= - &Apache::lonnet::courseiddump - ($domainfilter,$descriptfilter,$timefilter,$instcodefilter,$ownerfilter,$coursefilter,undef,undef,$type); - $r->print('
'); - my %by_descrip; - my $numcourses = keys(%courses); - foreach my $course (keys(%courses)) { - my $descr; - if ($courses{$course} =~ m/^([^:]*):/i) { - $descr = &unescape($1); - } else { - $descr = &unescape($courses{$course}); - } - my $description = $descr; - push (@{$by_descrip{$description}}, $course); - } - if ($numcourses > 1 && $multiple) { - $r->print('    -

'); - } - foreach my $description (sort - { lc($a) cmp lc($b) } (keys(%by_descrip))) { - foreach my $course (@{$by_descrip{$description}}) { - 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)); - } - unless ($owner eq '') { - $r->print(", owner - ".&unescape($owner)); - } - unless ($ttype eq '') { - $r->print('('.&Apache::lonnet::unescape($ttype).')'); - } - if ($multiple) { $r->print("\n"); } - $r->print("
\n"); + if (($filter->{'ownerfilter'} ne '') || + ($filter->{'ownerdomfilter'} ne '')) { + $filter->{'combownerfilter'} = $filter->{'ownerfilter'}.':'. + $filter->{'ownerdomfilter'}; + } + foreach my $item ('descriptfilter','instcodefilter','coursefilter', + 'combownerfilter') { + if (!$filter->{$item}) { + $filter->{$item}='.'; } - } - if (!%courses) { - $r->print(&mt('None found')); - } elsif ($multiple) { - $r->print(''); - } - $r->print(''."\n". - ''."\n". - ''."\n". - ''."\n". - ''."\n"); - if ((exists($env{'form.roleelement'})) && ($env{'form.form'} eq 'rolechoice')) { - $r->print(''."\n"); } - $r->print("
\n"); + if ($type eq '') { $type = '.'; } + my $timefilter = + ($filter->{'sincefilter'}==-1?1:time-$filter->{'sincefilter'}); + %courses = + &Apache::lonnet::courseiddump($filter->{'domainfilter'}, + $filter->{'descriptfilter'}, + $timefilter, + $filter->{'instcodefilter'}, + $filter->{'combownerfilter'}, + $filter->{'coursefilter'}, + undef,undef,$type); + } else { + $r->print('
'); + my %coursehash = &Apache::loncommon::findallcourses(); + foreach my $cid (sort(keys(%coursehash))) { + $courses{$cid}{'description'} = $env{'course.'.$cid.'.description'}; + } } - $r->print(&Apache::loncommon::end_page()); - return OK; + return %courses; } sub course_chooser { @@ -491,57 +570,298 @@ sub course_chooser { if ($multiple) { $output = '