--- loncom/interface/lonpickcourse.pm 2006/12/11 21:41:40 1.60.2.1
+++ loncom/interface/lonpickcourse.pm 2006/12/11 22:20:20 1.61
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a course
#
-# $Id: lonpickcourse.pm,v 1.60.2.1 2006/12/11 21:41:40 albertel Exp $
+# $Id: lonpickcourse.pm,v 1.61 2006/12/11 22:20:20 albertel 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 {
@@ -266,7 +265,15 @@ sub build_filters {
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' || $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} = '';
}
@@ -349,9 +356,9 @@ $multelement
if ($domainselectform) {
$output .= $lt{'cdo'}.': '.$domainselectform.'
'."\n";
}
-# if ($typeselectform) {
-# $output .= $lt{'cog'}.': '.$typeselectform.'
'."\n";
-# }
+ if ($typeselectform) {
+ $output .= $lt{'cog'}.': '.$typeselectform.'
'."\n";
+ }
if ($instcodeform) {
$output .= $lt{'cin'}.': '.$instcodeform.'
'."\n";
}