--- loncom/interface/lonpickcourse.pm 2006/11/29 07:46:39 1.60
+++ loncom/interface/lonpickcourse.pm 2007/06/01 18:07:47 1.63.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Pick a course
#
-# $Id: lonpickcourse.pm,v 1.60 2006/11/29 07:46:39 raeburn Exp $
+# $Id: lonpickcourse.pm,v 1.63.2.1 2007/06/01 18:07:47 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 {
@@ -199,8 +198,8 @@ sub display_matched_courses {
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).")");
+ (&Apache::lonnet::domain($cdom,'description')?
+ &Apache::lonnet::domain($cdom,'description'):$cdom).")");
unless ($instcode eq '') {
$r->print(" - ".&unescape($instcode));
}
@@ -266,14 +265,29 @@ 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} = '';
}
}
if ($item eq 'domainfilter') {
+ my $allow_blank = 1;
+ if ($formname eq 'portform') {
+ $filter->{$item} ||= $env{'user.domain'};
+ $allow_blank=0;
+ }
$domainselectform =
- &Apache::loncommon::select_dom_form($filter->{$item},'domainfilter',1);
+ &Apache::loncommon::select_dom_form($filter->{$item},
+ 'domainfilter',
+ $allow_blank);
} elsif ($item eq 'ownerdomfilter') {
$ownerdomselectform =
&Apache::loncommon::select_dom_form($filter->{$item},'ownerdomfilter',1);
@@ -349,9 +363,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";
}